Skip to content

Enables user toggling of GDASApp g-w ctests #3587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidHuber-NOAA merged 16 commits into from
Apr 28, 2025
Merged

Enables user toggling of GDASApp g-w ctests #3587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
89cc537
allow WORKFLOW_BUILD and WORKFLOW_TESTS to be set in the user environ…
RussTreadon-NOAA Apr 14, 2025
bd1cf41
update sorc/gdas.cd hash (#3579)
RussTreadon-NOAA Apr 15, 2025
1b82be7
update sorc/gsi_utils.fd hash (#3579)
RussTreadon-NOAA Apr 16, 2025
c348c65
Merge branch 'develop' into bugfix/gdasapp_gwtests
RussTreadon-NOAA Apr 16, 2025
cbf3a22
set OUTPUT_FILETYPE_ATM and OUTPUT_FILETYPE_SFC for JEDI atmospheric …
RussTreadon-NOAA Apr 16, 2025
bf871df
enable C96C48_ufs_hybatmDA CI on hera and wcoss2 (#3579)
RussTreadon-NOAA Apr 16, 2025
6d349a2
Merge branch 'NOAA-EMC:develop' into bugfix/gdasapp_gwtests
RussTreadon-NOAA Apr 16, 2025
4e33848
remove gdasappPATH from load_ufsda_modules.sh (#3595)
RussTreadon-NOAA Apr 17, 2025
7a38bd2
Merge branch 'develop' into bugfix/gdasapp_gwtests
RussTreadon-NOAA Apr 22, 2025
7b9abfe
revert cbf3a224 set OUTPUT_FILETYPE_ATM and OUTPUT_FILETYPE_SFC for J…
RussTreadon-NOAA Apr 23, 2025
d5e261f
update sorc/ufs_model.fd hash (#3593)
RussTreadon-NOAA Apr 23, 2025
d420c8c
Merge branch 'develop' into bugfix/gdasapp_gwtests
RussTreadon-NOAA Apr 23, 2025
59302e8
update sorc/gdas.cd hash (#3579)
RussTreadon-NOAA Apr 23, 2025
28092d8
set CMEPS_PIO variables in ush/parsing_ufs_configure.sh
RussTreadon-NOAA Apr 24, 2025
d34ed05
Merge branch 'develop' into bugfix/gdasapp_gwtests
RussTreadon-NOAA Apr 24, 2025
1d03f6c
Merge branch 'develop' into bugfix/gdasapp_gwtests
RussTreadon-NOAA Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,3 @@ skip_ci_on_hosts:
- orion
- hercules
- awsepicglobalworkflow
- hera
- wcoss2
4 changes: 2 additions & 2 deletions sorc/build_gdas.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ shift $((OPTIND-1))
# double quoting opts will not work since it is a string of options
# shellcheck disable=SC2086
BUILD_JOBS="${BUILD_JOBS:-8}" \
WORKFLOW_BUILD="ON" \
WORKFLOW_TESTS="OFF" \
WORKFLOW_BUILD="${WORKFLOW_BUILD:-"ON"}" \
WORKFLOW_TESTS="${WORKFLOW_TESTS:-"OFF"}" \
./gdas.cd/build.sh ${_opts} -f

exit
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Open in desktop
Submodule gdas.cd updated 126 files
2 changes: 1 addition & 1 deletion sorc/gsi_utils.fd
Open in desktop
Submodule gsi_utils.fd updated 6 files
+3 −3 modulefiles/gsiutils_hera.gnu.lua
+1 −1 modulefiles/gsiutils_hera.intel.lua
+13 −9 modulefiles/gsiutils_noaacloud.intel.lua
+4 −2 src/EnKF/gfs/src/getsfcensmeanp.fd/getsfcensmeanp.f90
+24 −12 src/EnKF/gfs/src/getsigensmeanp_smooth.fd/getsigensmeanp_smooth_ncep.f90
+2 −2 src/EnKF/gfs/src/recentersigp.fd/recentersigp.f90
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Open in desktop
Submodule ufs_model.fd updated 60 files
+2 −2 .github/workflows/aux.yml
+1 −1 .github/workflows/build_test._yml
+55 −3 CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90
+1 −1 CMEPS-interface/CMEPS
+9 −4 CMakeLists.txt
+1 −1 FV3
+1 −1 MOM6-interface/MOM6
+6 −0 MOM6-interface/mom6_files.cmake
+3 −3 modulefiles/ufs_hera.gnu.lua
+1 −1 modulefiles/ufs_hera.intel.lua
+1 −1 modulefiles/ufs_hera.intelllvm.lua
+1 −1 stochastic_physics
+1 −1 tests/bl_date.conf
+1 −1 tests/ci/repo_check.sh
+12 −4 tests/default_vars.sh
+24 −24 tests/logs/OpnReqTests_control_p8_hera.log
+12 −12 tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+15 −15 tests/logs/OpnReqTests_regional_control_hera.log
+275 −275 tests/logs/RegressionTests_acorn.log
+289 −289 tests/logs/RegressionTests_derecho.log
+317 −390 tests/logs/RegressionTests_gaeac5.log
+294 −294 tests/logs/RegressionTests_gaeac6.log
+390 −390 tests/logs/RegressionTests_hera.log
+384 −390 tests/logs/RegressionTests_hercules.log
+303 −303 tests/logs/RegressionTests_orion.log
+244 −244 tests/logs/RegressionTests_wcoss2.log
+14 −14 tests/parm/global_control.nml.IN
+5 −1 tests/parm/ufs.configure.atm_lm4.IN
+5 −0 tests/parm/ufs.configure.atm_lnd.IN
+5 −1 tests/parm/ufs.configure.atmw.IN
+5 −1 tests/parm/ufs.configure.datm_cdeps.IN
+5 −1 tests/parm/ufs.configure.hafs_atm_docn.IN
+5 −1 tests/parm/ufs.configure.hafs_atm_ocn.IN
+5 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
+5 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
+5 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
+5 −1 tests/parm/ufs.configure.hafs_atm_wav.IN
+5 −1 tests/parm/ufs.configure.s2s.IN
+5 −1 tests/parm/ufs.configure.s2s_aoflux.IN
+5 −1 tests/parm/ufs.configure.s2sa.IN
+5 −1 tests/parm/ufs.configure.s2sw.IN
+5 −1 tests/parm/ufs.configure.s2sw_fast.IN
+5 −1 tests/parm/ufs.configure.s2swa.IN
+5 −1 tests/parm/ufs.configure.s2swa_fast.IN
+5 −1 tests/parm/ufs.configure.s2swal_fast.IN
+7 −7 tests/rt.conf
+6 −6 tests/rt.sh
+4 −0 tests/run_test.sh
+0 −37 tests/test_changes.list
+6 −2 tests/tests/atmwav_control_noaero_p8
+5 −1 tests/tests/control_p8_atmlnd
+5 −1 tests/tests/control_restart_p8_atmlnd
+1 −1 tests/tests/cpld_control_gfsv17
+1 −1 tests/tests/cpld_control_gfsv17_iau
+1 −1 tests/tests/cpld_control_p8
+1 −1 tests/tests/cpld_control_sfs
+2 −2 tests/tests/cpld_mpi_gfsv17
+2 −2 tests/tests/cpld_restart_gfsv17
+2 −2 tests/tests/datm_cdeps_lm4_gswp3
+2 −2 tests/tests/datm_cdeps_lm4_gswp3_rst
3 changes: 1 addition & 2 deletions ush/load_ufsda_modules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ fi
# TODO: a better solution should be created for setting paths to package python scripts
# shellcheck disable=SC2311
pyiodaPATH="${HOMEgfs}/sorc/gdas.cd/build/lib/python${PYTHON_VERSION}/"
gdasappPATH="${HOMEgfs}/sorc/gdas.cd/sorc/iodaconv/src:${pyiodaPATH}"
PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}:${gdasappPATH}"
PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}:${pyiodaPATH}"
export PYTHONPATH

# Restore stack soft limit:
Expand Down
5 changes: 5 additions & 0 deletions ush/parsing_ufs_configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ if [[ "${cplflx}" = ".true." ]]; then
local RUNTYPE="${cmeps_run_type}"
local CMEPS_RESTART_DIR="CMEPS_RESTART/"
local CPLMODE="${cplmode}"
local CMEPS_PIO_FORMAT='pnetcdf'
local CMEPS_PIO_STRIDE=4
local CMEPS_PIO_IOTASKS=-99
local CMEPS_PIO_REARR='box'
local CMEPS_PIO_ROOT=-99
local coupling_interval_fast_sec="${CPL_FAST}"
local RESTART_N=999999
local ocean_albedo_limit=0.06
Expand Down
Loading