Merge branch 'develop' into wavegrid_compath

AntonMFernando-NOAA · Jan 14, 2025 · 550e544 · 550e544
2 parents 580a81b + 53ed76e
commit 550e544
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/env/WCOSS2.env b/env/WCOSS2.env
@@ -13,6 +13,11 @@ step=$1
 export launcher="mpiexec -l"
 export mpmd_opt="--cpu-bind verbose,core cfp"
 
+# TODO: Add path to GDASApp libraries and cray-mpich as temporary patches
+# TODO: Remove LD_LIBRARY_PATH lines as soon as permanent solutions are available
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${HOMEgfs}/sorc/gdas.cd/build/lib"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/cray/pe/mpich/8.1.19/ofi/intel/19.0/lib"
+
 # Calculate common resource variables
 # Check first if the dependent variables are set
 if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-}" ]]; then

diff --git a/parm/config/gefs/config.stage_ic b/parm/config/gefs/config.stage_ic
@@ -14,6 +14,10 @@ export STAGE_IC_YAML_TMPL="${PARMgfs}/stage/master_gefs.yaml.j2"
 
 source "${HOMEgfs}/versions/ic.ver"
 
+if [[ ${EXP_WARM_START} = ".false." ]] ; then
+  export DOIAU="NO"        # Turn off for staging
+fi
+
 # Set ICSDIR (if not defined)
 if [[ -z "${ICSDIR}" ]] ; then
 

diff --git a/parm/config/gfs/config.stage_ic b/parm/config/gfs/config.stage_ic
@@ -14,6 +14,10 @@ export STAGE_IC_YAML_TMPL="${PARMgfs}/stage/master_gfs.yaml.j2"
 
 source "${HOMEgfs}/versions/ic.ver"
 
+if [[ ${EXP_WARM_START} = ".false." ]] ; then
+  export DOIAU="NO"        # Turn off for staging
+fi
+
 # Set ICSDIR (if not defined)
 if [[ -z "${ICSDIR}" ]] ; then
 

diff --git a/sorc/gdas.cd b/sorc/gdas.cd
diff --git a/ush/module-setup.sh b/ush/module-setup.sh
@@ -51,6 +51,8 @@ elif [[ ${MACHINE_ID} = s4* ]] ; then
 
 elif [[ ${MACHINE_ID} = wcoss2 ]]; then
     # We are on WCOSS2
+    # Ignore default modules of the same version lower in the search path (req'd by spack-stack)
+    export LMOD_TMOD_FIND_FIRST=yes
     module reset
 
 elif [[ ${MACHINE_ID} = cheyenne* ]] ; then
+24 −0		.github/pull_request_template.md
+6 −0		ci/ci_tests.sh
+123 −47		ci/driver.sh
+0 −169		ci/gw_driver.sh
+1 −0		ci/hera.sh
+13 −0		ci/hercules.sh
+3 −1		ci/orion.sh
+64 −10		ci/run_ci.sh
+0 −80		ci/run_gw_ci.sh
+41 −32		ci/stable_driver.sh
+68 −31		modulefiles/GDAS/wcoss2.intel.lua
+3 −9		parm/aero/jcb-base.yaml.j2
+6 −10		parm/io/fv3jedi_fieldmetadata_history.yaml
+1 −1		parm/jcb-algorithms
+1 −1		parm/jcb-gdas
+10 −2		parm/soca/marine-jcb-base.yaml
+3 −0		parm/soca/obsprep/obsprep_config.yaml
+1 −1		prototypes/gen_prototype.sh
+1 −1		sorc/da-utils
+1 −1		sorc/fv3-jedi
+1 −1		sorc/ioda
+1 −1		sorc/iodaconv
+1 −1		sorc/oops
+1 −1		sorc/saber
+1 −1		sorc/soca
+1 −1		sorc/ufo
+1 −1		sorc/vader
+3 −3		test/atm/global-workflow/CMakeLists.txt
+5 −4		test/atm/global-workflow/jjob_ens_init_split.sh
+8 −4		test/gw-ci/CMakeLists.txt
+3 −0		test/gw-ci/create_exp.sh
+17 −17		test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
+34 −34		test/testreference/C96C48_ufs_hybatmDA_3dvar.ref
+4 −4		test/testreference/C96C48_ufs_hybatmDA_lgetkf_observer.ref
+8 −8		test/testreference/C96C48_ufs_hybatmDA_lgetkf_solver.ref
+30 −33		test/testreference/atm_jjob_3dvar.ref
+65 −65		test/testreference/atm_jjob_lgetkf.ref
+29 −29		test/testreference/atm_jjob_lgetkf_observer.ref
+48 −48		test/testreference/atm_jjob_lgetkf_solver.ref
+2 −0		ush/module-setup.sh
+37 −20		ush/soca/prep_ocean_obs.py
+19 −12		ush/soca/prep_ocean_obs_utils.py
+1 −1		utils/chem/chem_diagb.h
+1 −1		utils/fv3jedi/fv3jedi_fv3inc.h
+1 −1		utils/ioda_example/gdas_meanioda.h
+1 −1		utils/land/land_ensrecenter.h
+1 −1		utils/obsproc/applications/gdas_obsprovider2ioda.h
+1 −1		utils/soca/gdas_ens_handler.h
+14 −8		utils/soca/gdas_incr_handler.h
+26 −18		utils/soca/gdas_postprocincr.h
+1 −1		utils/soca/gdas_soca_diagb.h
+1 −1		utils/soca/gdas_socahybridweights.h
+1 −1		utils/soca/gdassoca_obsstats.h