Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add empirical model #31

Merged
merged 7 commits into from
Dec 20, 2024
Merged

Add empirical model #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a70149c
add empirical model to ngiab
benlee0423 Dec 17, 2024
678bbf8
add empirical model to ngiab
benlee0423 Dec 17, 2024
8b90cb3
copy lstm before install
benlee0423 Dec 17, 2024
933bfd8
add debug
benlee0423 Dec 18, 2024
b3136e7
ngen branch to ngiab
benlee0423 Dec 18, 2024
94db557
copy with recursive
benlee0423 Dec 18, 2024
2548f00
fix copy
benlee0423 Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions singularity/singularity_ngen.def
View file
Open in desktop
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
View file
Open in desktop
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
Loading