Skip to content

Commit

Permalink
Merge pull request #31 from CIROH-UA/add_empirical_model
Browse files Browse the repository at this point in the history
Add empirical model
  • Loading branch information
arpita0911patel authored Dec 20, 2024
2 parents f62b6d7 + 2548f00 commit a5d6138
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
10 changes: 8 additions & 2 deletions singularity/singularity_ngen.def
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ From: rockylinux:9.1
export TROUTE_REPO="CIROH-UA/t-route"
export TROUTE_BRANCH="datastream"
export NGEN_REPO="CIROH-UA/ngen"
export NGEN_BRANCH="main"
export NGEN_BRANCH="ngiab"
export PATH="/usr/lib64/mpich/bin:$PATH"
export PATH="/root/.cargo/bin:$PATH"
export PATH="/ngen/.venv/bin:$PATH"
Expand All @@ -15,7 +15,7 @@ From: rockylinux:9.1
TROUTE_REPO="CIROH-UA/t-route"
TROUTE_BRANCH="datastream"
NGEN_REPO="CIROH-UA/ngen"
NGEN_BRANCH="main"
NGEN_BRANCH="ngiab"

# Install system dependencies
echo "max_parallel_downloads=10" >> /etc/dnf/dnf.conf
Expand Down Expand Up @@ -140,6 +140,12 @@ From: rockylinux:9.1
uv pip install --no-cache-dir netCDF4==1.6.3
uv pip install numpy==$(/dmod/bin/ngen --info | grep -e 'NumPy Version: ' | cut -d ':' -f 2 | uniq | xargs)

# Install lstm
ls -l /ngen/ngen/extern
ls -l /ngen/ngen/extern/lstm
cp -r /ngen/ngen/extern/lstm/lstm/* /ngen/ngen/extern/lstm/
uv pip install --no-cache-dir /ngen/ngen/extern/lstm --extra-index-url https://download.pytorch.org/whl/cpu

# Make everything in /ngen accessible
chmod -R 755 /ngen

Expand Down
6 changes: 3 additions & 3 deletions singularity/templates/guide/HelloNGEN.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ select option in "${options[@]}"; do
case $option in
"Run NextGen model framework in serial mode"|"Run NextGen model framework in parallel mode")
echo -e "\n"
n1=${selected_catchment:-$(read -p "Enter the hydrofabric catchment file path: " n1; echo "$n1")}
n2=${selected_nexus:-$(read -p "Enter the hydrofabric nexus file path: " n2; echo "$n2")}
n3=${selected_realization:-$(read -p "Enter the Realization file path: " n3; echo "$n3")}
n1=${selected_catchment:-$(read -erp "Enter the hydrofabric catchment file path: " n1; echo "$n1")}
n2=${selected_nexus:-$(read -erp "Enter the hydrofabric nexus file path: " n2; echo "$n2")}
n3=${selected_realization:-$(read -erp "Enter the Realization file path: " n3; echo "$n3")}

echo -e "${GREEN}Selected files:\nCatchment: $n1\nNexus: $n2\nRealization: $n3${RESET}\n"

Expand Down

0 comments on commit a5d6138

Please sign in to comment.