Skip to content

Commit

Permalink
Enable wcoss2 ufsda build and module load (#2620)
Browse files Browse the repository at this point in the history
This PR enables ufsda (`sorc/gdas.cd`) to be built and run on WCOSS2.

Resolves #2602
Resolves #2579
  • Loading branch information
RussTreadon-NOAA authored Jun 5, 2024
1 parent 67b833e commit aa23ccf
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion ci/cases/pr/C96C48_ufs_hybatmDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ skip_ci_on_hosts:
- hera
- orion
- hercules
- wcoss2

2 changes: 1 addition & 1 deletion ci/scripts/clone-build_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ set +e
source "${HOMEgfs}/ush/module-setup.sh"
export BUILD_JOBS=8
rm -rf log.build
./build_all.sh -gk >> log.build 2>&1
./build_all.sh -guk >> log.build 2>&1
build_status=$?

DATE=$(date +'%D %r')
Expand Down
2 changes: 1 addition & 1 deletion sorc/build_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ build_opts["ww3prepost"]="${_wave_opt} ${_verbose_opt} ${_build_ufs_opt} ${_buil

# Optional DA builds
if [[ "${_build_ufsda}" == "YES" ]]; then
if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" && "${MACHINE_ID}" != "hercules" ]]; then
if [[ "${MACHINE_ID}" != "orion" && "${MACHINE_ID}" != "hera" && "${MACHINE_ID}" != "hercules" && "${MACHINE_ID}" != "wcoss2" ]]; then
echo "NOTE: The GDAS App is not supported on ${MACHINE_ID}. Disabling build."
else
build_jobs["gdas"]=8
Expand Down
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Submodule gdas.cd updated 79 files
+1 −1 build.sh
+1 −1 ci/run_ci.sh
+25 −0 modulefiles/EVA/wcoss2.lua
+96 −0 modulefiles/GDAS/gaea.intel.lua
+1 −1 modulefiles/GDAS/hera.intel.lua
+6 −2 modulefiles/GDAS/wcoss2.intel.lua
+47 −0 parm/aero/berror/aero_diffparm.yaml.j2
+14 −0 parm/aero/prep/prep_viirs.yaml.j2
+12 −0 parm/ioda/bufr2ioda/bufr2ioda_adpupa.json
+1 −1 parm/ioda/bufr2ioda/bufr2ioda_insitu_profile_marinemammals.json
+0 −0 parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.json
+0 −0 parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_avhrr.json
+0 −0 parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_goes.json
+15 −0 parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_leogeo.json
+0 −0 parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_modis.json
+0 −0 parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.json
+0 −0 parm/ioda/bufr2ioda/bufr2ioda_satwnd_amv_viirs.json
+1 −1 parm/jcb-algorithms
+1 −1 parm/jcb-gdas
+69 −0 parm/soca/letkf/letkf.yaml.j2
+0 −22 parm/soca/obs/config/dev/insitu_profile_argo.yaml
+0 −158 parm/soca/obs/config/dev/insitu_profile_bathy.yaml
+0 −256 parm/soca/obs/config/dev/insitu_profile_tesac.yaml
+0 −253 parm/soca/obs/config/dev/insitu_profile_tesac_salinity.yaml
+0 −45 parm/soca/obs/config/dev/insitu_surface_trkob.yaml
+603 −0 parm/soca/obs/config/insitu_profile_argo.yaml
+17 −0 parm/soca/obs/config/insitu_profile_bathy.yaml
+2 −2 parm/soca/obs/config/insitu_profile_dbuoy.yaml
+2 −2 parm/soca/obs/config/insitu_profile_dbuoyb.yaml
+2 −2 parm/soca/obs/config/insitu_profile_glider.yaml
+2 −2 parm/soca/obs/config/insitu_profile_marinemammal.yaml
+2 −2 parm/soca/obs/config/insitu_profile_mbuoy.yaml
+2 −2 parm/soca/obs/config/insitu_profile_mbuoyb.yaml
+20 −0 parm/soca/obs/config/insitu_profile_tesac.yaml
+22 −0 parm/soca/obs/config/insitu_profile_tesac_salinity.yaml
+2 −2 parm/soca/obs/config/insitu_profile_xbtctd.yaml
+0 −0 parm/soca/obs/config/insitu_surface_altkob.yaml
+18 −0 parm/soca/obs/config/insitu_surface_trkob.yaml
+0 −0 parm/soca/obs/config/insitu_surface_trkob_salinity.yaml
+18 −18 parm/soca/obs/obs_list.yaml
+2 −2 scripts/exgdas_global_marine_analysis_vrfy.py
+7 −11 test/CMakeLists.txt
+94 −0 test/atm/global-workflow/3dvar.ref
+7 −0 test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2
+7 −0 test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2
+197 −0 test/atm/global-workflow/lgetkf.ref
+86 −0 test/gw-ci/CMakeLists.txt
+21 −0 test/gw-ci/create_exp.sh
+38 −0 test/gw-ci/get_cycles.py
+39 −0 test/gw-ci/run_exp.sh
+7 −4 test/soca/gw/CMakeLists.txt
+2 −4 ush/detect_machine.sh
+450 −0 ush/ioda/bufr2ioda/bufr2ioda_adpupa.py
+12 −12 ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_ahi.py
+12 −12 ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_avhrr.py
+12 −12 ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_goes.py
+445 −0 ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_leogeo.py
+2 −2 ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_modis.py
+12 −12 ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_seviri.py
+2 −2 ush/ioda/bufr2ioda/bufr2ioda_satwnd_amv_viirs.py
+1 −1 ush/ioda/bufr2ioda/marine/bufr2ioda_insitu_profile_glider.py
+1 −1 ush/ioda/bufr2ioda/marine/bufr2ioda_insitu_profile_marinemammal.py
+1 −1 ush/ioda/bufr2ioda/marine/bufr2ioda_insitu_profile_xbtctd.py
+0 −319 ush/ioda/bufr2ioda/marine/bufr2ioda_insitu_profiles_tesac.py
+1 −26 ush/module-setup.sh
+3 −4 ush/soca/run_jjobs.py
+2 −2 ush/soca/soca_vrfy.py
+1 −0 utils/CMakeLists.txt
+5 −0 utils/land/CMakeLists.txt
+8 −0 utils/land/land_ensrecenter.cc
+174 −0 utils/land/land_ensrecenter.h
+1 −0 utils/obsproc/CMakeLists.txt
+602 −0 utils/obsproc/RTOFSInSitu.h
+9 −10 utils/obsproc/Viirsaod2Ioda.h
+9 −3 utils/obsproc/applications/CMakeLists.txt
+4 −0 utils/obsproc/applications/gdas_obsprovider2ioda.h
+72 −18 utils/obsproc/superob.h
+11 −0 utils/test/CMakeLists.txt
+13 −0 utils/test/testinput/gdas_rtofsinsitu.yaml
2 changes: 1 addition & 1 deletion sorc/gsi_utils.fd
4 changes: 2 additions & 2 deletions ush/load_ufsda_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ source "${HOMEgfs}/ush/module-setup.sh"
module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"

case "${MACHINE_ID}" in
("hera" | "orion" | "hercules")
("hera" | "orion" | "hercules" | "wcoss2")
module load "${MODS}/${MACHINE_ID}"
ncdump=$( command -v ncdump )
NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )
export NETCDF
;;
("wcoss2" | "acorn" | "jet" | "gaea" | "s4")
("jet" | "gaea" | "s4" | "acorn")
echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
;;
*)
Expand Down

0 comments on commit aa23ccf

Please sign in to comment.