diff --git a/modulefiles/GDAS/hera.intel.lua b/modulefiles/GDAS/hera.intel.lua index 07be6a18a..1a1f0d3e5 100644 --- a/modulefiles/GDAS/hera.intel.lua +++ b/modulefiles/GDAS/hera.intel.lua @@ -89,7 +89,6 @@ setenv('MPIEXEC_NPROC', mpinproc) setenv("CRTM_FIX","/scratch1/NCEPDEV/da/role.jedipara/GDASApp/fix/crtm/2.4.0") setenv("GDASAPP_TESTDATA","/scratch1/NCEPDEV/da/role.jedipara/GDASApp/testdata") setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/scratch1/NCEPDEV/da/role.jedipara/GDASApp/unittestdata") ---prepend_path("PATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-18.0.5.274/prod_util/1.2.2/bin") whatis("Name: ".. pkgName) whatis("Version: ".. pkgVersion) diff --git a/modulefiles/GDAS/hercules.intel.lua b/modulefiles/GDAS/hercules.intel.lua index 83feccb2c..1870587c0 100644 --- a/modulefiles/GDAS/hercules.intel.lua +++ b/modulefiles/GDAS/hercules.intel.lua @@ -64,6 +64,7 @@ load("py-pybind11/2.11.0") load("contrib/0.1") load("noaatools/3.1") load("rocoto/1.3.7") +load("prod_util/2.1.1") load("hpc/1.2.0") unload("python/3.10.13") @@ -84,7 +85,6 @@ setenv('MPIEXEC_NPROC', mpinproc) setenv("CRTM_FIX","/work2/noaa/da/role-da/GDASApp/fix/crtm/2.4.0") setenv("GDASAPP_TESTDATA","/work2/noaa/da/role-da/GDASApp/testdata") setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/role-da/GDASApp/unittestdata") -prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin") execute{cmd="ulimit -s unlimited",modeA={"load"}} diff --git a/modulefiles/GDAS/orion.intel.lua b/modulefiles/GDAS/orion.intel.lua index 509c7b053..2d38f94a6 100644 --- a/modulefiles/GDAS/orion.intel.lua +++ b/modulefiles/GDAS/orion.intel.lua @@ -63,6 +63,7 @@ load("py-pybind11/2.11.0") load("contrib/0.1") load("noaatools/3.1") load("rocoto/1.3.7") +load("prod_util/2.1.1") load("hpc/1.2.0") unload("python/3.10.13") @@ -84,7 +85,6 @@ setenv('MPIEXEC_NPROC', mpinproc) setenv("CRTM_FIX","/work2/noaa/da/role-da/GDASApp/fix/crtm/2.4.0") setenv("GDASAPP_TESTDATA","/work2/noaa/da/role-da/GDASApp/testdata") setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/role-da/GDASApp/unittestdata") -prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin") execute{cmd="ulimit -s unlimited",modeA={"load"}} diff --git a/sorc/fv3-jedi b/sorc/fv3-jedi index 7e8337ddb..d362a1f22 160000 --- a/sorc/fv3-jedi +++ b/sorc/fv3-jedi @@ -1 +1 @@ -Subproject commit 7e8337ddb7ebcbfcce3a62d5fb282ca092586e7d +Subproject commit d362a1f226c401f1ec6782640632195e71db1b96 diff --git a/sorc/ioda b/sorc/ioda index 28269a0c6..9328bdf4f 160000 --- a/sorc/ioda +++ b/sorc/ioda @@ -1 +1 @@ -Subproject commit 28269a0c6ec8520359a49c6b2be0def4a03ecc09 +Subproject commit 9328bdf4fd5b8089cc288ad90fb861d8e5964216 diff --git a/sorc/oops b/sorc/oops index 14bbfdf8f..88c090ca3 160000 --- a/sorc/oops +++ b/sorc/oops @@ -1 +1 @@ -Subproject commit 14bbfdf8fc57c28af3808f01f8eb9349f72b515d +Subproject commit 88c090ca3a09cbb95ad394b5970244f8cb0fbc36 diff --git a/sorc/saber b/sorc/saber index dce89bab2..812d0ee1b 160000 --- a/sorc/saber +++ b/sorc/saber @@ -1 +1 @@ -Subproject commit dce89bab2223ffd00f98e25c28a5ee11bd67c542 +Subproject commit 812d0ee1bc91f82716d121750674da0527cafec0 diff --git a/sorc/soca b/sorc/soca index 46440d58c..738a2c7b9 160000 --- a/sorc/soca +++ b/sorc/soca @@ -1 +1 @@ -Subproject commit 46440d58c90bddbed4ad8050ecb4ebe77bce752d +Subproject commit 738a2c7b9979182dcb3a78284b7a5434bb609204 diff --git a/sorc/ufo b/sorc/ufo index 0db0ce866..2b039e652 160000 --- a/sorc/ufo +++ b/sorc/ufo @@ -1 +1 @@ -Subproject commit 0db0ce86625b225a7f789f30674d8d00519bde56 +Subproject commit 2b039e6520dfcd03c8e282b515519b91ec667e65 diff --git a/sorc/vader b/sorc/vader index a8fe8d961..0a1ca4230 160000 --- a/sorc/vader +++ b/sorc/vader @@ -1 +1 @@ -Subproject commit a8fe8d961b36b668ca0a1a75d8b1d1b0a29cc13a +Subproject commit 0a1ca423078744a9af86bd3910194e5e5b05bacb diff --git a/test/atm/global-workflow/config.yaml b/test/atm/global-workflow/config.yaml index d6d4b0343..8939a839a 100644 --- a/test/atm/global-workflow/config.yaml +++ b/test/atm/global-workflow/config.yaml @@ -9,6 +9,8 @@ base: STMP: "@bindir@/test/atm/global-workflow/testrun" PTMP: "@bindir@/test/atm/global-workflow/testrun" DO_TEST_MODE: "YES" + FHMAX_GFS: 24 + FHMAX_HF_GFS: 0 atmanl: JCB_ALGO_YAML_VAR: "@srcdir@/test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2" diff --git a/test/atm/global-workflow/jjob_ens_init.sh b/test/atm/global-workflow/jjob_ens_init.sh index 6789e5a29..0b1a9e146 100755 --- a/test/atm/global-workflow/jjob_ens_init.sh +++ b/test/atm/global-workflow/jjob_ens_init.sh @@ -27,6 +27,7 @@ export ACCOUNT=da-cpu export COM_TOP=$ROTDIR # Set GFS COM paths +export STRICT="NO" source "${HOMEgfs}/ush/preamble.sh" source "${HOMEgfs}/parm/config/gfs/config.com" diff --git a/test/atm/global-workflow/jjob_ens_init_split.sh b/test/atm/global-workflow/jjob_ens_init_split.sh index 07aaaece4..a5b87ad5e 100755 --- a/test/atm/global-workflow/jjob_ens_init_split.sh +++ b/test/atm/global-workflow/jjob_ens_init_split.sh @@ -27,6 +27,7 @@ export ACCOUNT=da-cpu export COM_TOP=$ROTDIR # Set GFS COM paths +export STRICT="NO" source "${HOMEgfs}/ush/preamble.sh" source "${HOMEgfs}/parm/config/gfs/config.com" diff --git a/test/atm/global-workflow/jjob_ens_obs.sh b/test/atm/global-workflow/jjob_ens_obs.sh index 5118e52e8..126b68d7e 100755 --- a/test/atm/global-workflow/jjob_ens_obs.sh +++ b/test/atm/global-workflow/jjob_ens_obs.sh @@ -53,7 +53,7 @@ cp $EXPDIR/config.base_lobsdiag_forenkf_true $EXPDIR/config.base # Execute j-job if [[ $machine = 'HERA' || $machine = 'ORION' || $machine = 'HERCULES' ]]; then - sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=debug --time=00:30:00 --export=ALL --wait --output=atmensanlobs-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS + sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=batch --time=00:30:00 --export=ALL --wait --output=atmensanlobs-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS else ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_OBS fi diff --git a/test/atm/global-workflow/jjob_ens_sol.sh b/test/atm/global-workflow/jjob_ens_sol.sh index cd1c40094..331bc72f8 100755 --- a/test/atm/global-workflow/jjob_ens_sol.sh +++ b/test/atm/global-workflow/jjob_ens_sol.sh @@ -53,7 +53,7 @@ cp $EXPDIR/config.base_lobsdiag_forenkf_true $EXPDIR/config.base # Execute j-job if [[ $machine = 'HERA' || $machine = 'ORION' || $machine = 'HERCULES' ]]; then - sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=debug --time=00:30:00 --export=ALL --wait --output=atmensanlsol-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL + sbatch --nodes=1 --ntasks=36 --account=$ACCOUNT --qos=batch --time=00:30:00 --export=ALL --wait --output=atmensanlsol-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL else ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_SOL fi diff --git a/test/atm/global-workflow/jjob_var_init.sh b/test/atm/global-workflow/jjob_var_init.sh index 0e9c82871..841499821 100755 --- a/test/atm/global-workflow/jjob_var_init.sh +++ b/test/atm/global-workflow/jjob_var_init.sh @@ -27,6 +27,7 @@ export ACCOUNT=da-cpu export COM_TOP=$ROTDIR # Set GFS COM paths +export STRICT="NO" source "${HOMEgfs}/ush/preamble.sh" source "${HOMEgfs}/parm/config/gfs/config.com"