From d8bab871b42e1b13b64b323a0c589efa6a955626 Mon Sep 17 00:00:00 2001 From: Chan-Hoo Jeon Date: Thu, 14 Oct 2021 11:35:25 -0500 Subject: [PATCH 1/4] Modify workflow environment for orion --- env/wflow_orion.env | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/env/wflow_orion.env b/env/wflow_orion.env index dca666ef12..7bd5be82f6 100644 --- a/env/wflow_orion.env +++ b/env/wflow_orion.env @@ -1,7 +1,10 @@ # Python environment for workflow on Orion -module load rocoto +module purge + +module load contrib/0.1 +module load rocoto/1.3.3 module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles -module load miniconda3 +module load miniconda3/3.8 conda activate regional_workflow From 649f5a51b3c235d5582d08316e59dc6be13eb813 Mon Sep 17 00:00:00 2001 From: Chan-Hoo Jeon Date: Thu, 14 Oct 2021 12:56:23 -0500 Subject: [PATCH 2/4] update build env for orion --- env/build_orion_intel.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/env/build_orion_intel.env b/env/build_orion_intel.env index c230ee4ebc..8e44ee537f 100644 --- a/env/build_orion_intel.env +++ b/env/build_orion_intel.env @@ -21,8 +21,8 @@ module load esmf/8_1_1 module load fms/2020.04.03 module load bacio/2.4.1 module load crtm/2.3.0 -module load g2/3.4.1 -module load g2tmpl/1.9.1 +module load g2/3.4.3 +module load g2tmpl/1.10.0 module load ip/3.3.3 module load nemsio/2.5.2 module load sp/2.3.3 From 52d7c255d7adaab49099c93b9256fec25ee29132 Mon Sep 17 00:00:00 2001 From: Chan-Hoo Jeon Date: Fri, 22 Oct 2021 06:24:25 -0500 Subject: [PATCH 3/4] Update env scripts --- env/build_orion_intel.env | 25 +++++++++++++------------ env/wflow_orion.env | 5 +---- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/env/build_orion_intel.env b/env/build_orion_intel.env index 8e44ee537f..085d469be5 100644 --- a/env/build_orion_intel.env +++ b/env/build_orion_intel.env @@ -3,7 +3,7 @@ module load contrib noaatools module load cmake/3.18.1 -module load python/3.7.5 +module load python/3.9.2 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack @@ -11,7 +11,17 @@ module load hpc/1.1.0 module load hpc-intel/2018.4 module load hpc-impi/2018.4 -module load jasper/2.0.22 +module load bacio/2.4.1 +module load g2/3.4.3 +module load g2tmpl/1.10.0 +module load ip/3.3.3 +module load sp/2.3.3 +module load w3nco/2.4.1 +module load w3emc/2.9.1 +module load crtm/2.3.0 +module load upp/10.0.10 + +module load jasper/2.0.25 module load zlib/1.2.11 module load png/1.6.35 module load hdf5/1.10.6 @@ -19,19 +29,10 @@ module load netcdf/4.7.4 module load pio/2.5.2 module load esmf/8_1_1 module load fms/2020.04.03 -module load bacio/2.4.1 -module load crtm/2.3.0 -module load g2/3.4.3 -module load g2tmpl/1.10.0 -module load ip/3.3.3 module load nemsio/2.5.2 -module load sp/2.3.3 -module load w3emc/2.7.3 -module load w3nco/2.4.1 -module load upp/10.0.6 - module load gfsio/1.4.1 module load sfcio/1.4.1 +module load sigio/2.3.2 module load landsfcutil/2.4.1 module load nemsiogfs/2.5.3 module load wgrib2/2.0.8 diff --git a/env/wflow_orion.env b/env/wflow_orion.env index 7bd5be82f6..64d7e598b3 100644 --- a/env/wflow_orion.env +++ b/env/wflow_orion.env @@ -1,9 +1,6 @@ # Python environment for workflow on Orion -module purge - -module load contrib/0.1 -module load rocoto/1.3.3 +module load contrib rocoto module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles module load miniconda3/3.8 From 0541c034506e85f9fc30be167449875a41568f36 Mon Sep 17 00:00:00 2001 From: Chan-Hoo Jeon Date: Fri, 22 Oct 2021 06:58:09 -0500 Subject: [PATCH 4/4] Update hash of regional workflow --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 4d5cc9597d..cce601d5e2 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -3,7 +3,7 @@ protocol = git repo_url = https://github.com/NOAA-EMC/regional_workflow # Specify either a branch name or a hash but not both. #branch = develop -hash = 9bac8563 +hash = 7da0c46 local_path = regional_workflow required = True