Merge pull request #2 from natalie-perlin/update_stack150

Update SRW for spack-stack 1.5.0 for the cloud platforms
ufs-community · Nov 16, 2023 · 5f16739 · 5f16739
2 parents a257d5f + e55292f
commit 5f16739
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/modulefiles/build_noaacloud_intel.lua b/modulefiles/build_noaacloud_intel.lua
@@ -5,7 +5,7 @@ the NOAA cloud using Intel-oneapi
 
 whatis([===[Loads libraries needed for building the UFS SRW App on NOAA cloud ]===])
 
-prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.4.1/envs/unified-dev/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
 prepend_path("MODULEPATH", "/apps/modules/modulefiles")
 prepend_path("PATH", "/contrib/EPIC/bin")
 load("stack-intel")

diff --git a/modulefiles/tasks/noaacloud/plot_allvars.local.lua b/modulefiles/tasks/noaacloud/plot_allvars.local.lua
@@ -1 +1,5 @@
-prepend_path("PATH", "/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin")
+unload("python")
+append_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
+
+setenv("SRW_ENV", "regional_workflow")
diff --git a/modulefiles/tasks/noaacloud/python_srw.lua b/modulefiles/tasks/noaacloud/python_srw.lua
@@ -1,4 +1,5 @@
-prepend_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles")
+unload("python")
+append_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles")
 load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 
 setenv("SRW_ENV", "workflow_tools")
diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua
@@ -1,8 +1,8 @@
 --[[
 Compiler-specific modules are used for met and metplus libraries
 --]]
-local met_ver = (os.getenv("met_ver") or "10.1.1")
-local metplus_ver = (os.getenv("metplus_ver") or "4.1.1")
+local met_ver = (os.getenv("met_ver") or "11.1.0")
+local metplus_ver = (os.getenv("metplus_ver") or "5.1.0")
 if (mode() == "load") then
   load(pathJoin("met", met_ver))
   load(pathJoin("metplus",metplus_ver))
@@ -22,4 +22,4 @@ if (mode() == "unload") then
   unload(pathJoin("met", met_ver))
   unload(pathJoin("metplus",metplus_ver))
 end
-load("python_srw")
+load("ufs-pyenv")
diff --git a/ush/machine/noaacloud.yaml b/ush/machine/noaacloud.yaml
@@ -5,6 +5,7 @@ platform:
   TEST_CCPA_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/ccpa/proc
   TEST_MRMS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/mrms/proc
   TEST_NDAS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/ndas/proc
+  DOMAIN_PREGEN_BASEDIR: /contrib/EPIC/UFS_SRW_data/develop/FV3LAM_pregen
   REMOVE_MEMORY: True
   RUN_CMD_FCST: mpiexec -np ${PE_MEMBER01}
   RUN_CMD_POST: mpiexec -np $nprocs