Merge branch 'NOAA-EMC:develop' into ci_unit-tests

NOAA-EMC · May 10, 2024 · d540011 · d540011
2 parents 100c893 + 2346c61
commit d540011
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua
@@ -39,6 +39,9 @@ load(pathJoin("met", (os.getenv("met_ver") or "None")))
 load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
 load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))
 
+-- Adding perl as a module; With Rocky8, perl packages will not be from the OS
+load(pathJoin("perl", (os.getenv("perl_ver") or "None")))
+
 setenv("WGRIB2","wgrib2")
 setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))
 

diff --git a/modulefiles/module_gwsetup.jet.lua b/modulefiles/module_gwsetup.jet.lua
@@ -4,7 +4,7 @@ Load environment to run GFS workflow setup scripts on Jet
 
 load(pathJoin("rocoto"))
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")
 
 local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 local python_ver=os.getenv("python_ver") or "3.11.6"

diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -699,7 +699,7 @@ case ${step} in
 
     case "${CASE}" in
       "C48" | "C96" | "C192")
-        declare -x "wtime_${step}"="00:15:00"
+        declare -x "wtime_${step}"="00:20:00"
         declare -x "wtime_${step}_gfs"="03:00:00"
         ;;
       "C384")
@@ -747,6 +747,7 @@ case ${step} in
         exit 4
       ;;
     esac
+    if [[ ${machine} == "JET" ]]; then unset memory_upp ; fi
     export npe_node_upp=${npe_upp}
 
     export nth_upp=1
@@ -1032,7 +1033,7 @@ case ${step} in
     export npe_node_esfc=$(( npe_node_max / nth_esfc ))
     export nth_cycle=${nth_esfc}
     export npe_node_cycle=$(( npe_node_max / nth_cycle ))
-    export memory_esfc="80GB"
+    if [[ ${machine} != "JET" ]]; then export memory_esfc="80G" ; fi
     ;;
 
   "epos")

diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd
diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd
diff --git a/sorc/upp.fd b/sorc/upp.fd
diff --git a/versions/run.jet.ver b/versions/run.jet.ver
@@ -1,11 +1,14 @@
 export stack_intel_ver=2021.5.0
 export stack_impi_ver=2021.5.1
-export spack_env=gsi-addon-dev
+export spack_env=gsi-addon-dev-rocky8
 
 export hpss_ver=
 export ncl_ver=6.6.2
 export R_ver=4.0.2
 export gempak_ver=7.4.2
 
+# Adding perl as a module; With Rocky8, perl packages will not be from the OS
+export perl_ver=5.38.0
+
 source "${HOMEgfs:-}/versions/run.spack.ver"
 export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
diff --git a/versions/run.spack.ver b/versions/run.spack.ver
@@ -32,4 +32,4 @@ export obsproc_run_ver=1.1.2
 export prepobs_run_ver=1.0.1
 
 export ens_tracker_ver=feature-GFSv17_com_reorg
-export fit2obs_ver=1.0.0
+export fit2obs_ver=1.1.1