From 89cc5373e6786aacb763463c507bf31aacbfa128 Mon Sep 17 00:00:00 2001 From: "russ.treadon" Date: Mon, 14 Apr 2025 10:13:37 +0000 Subject: [PATCH 01/10] allow WORKFLOW_BUILD and WORKFLOW_TESTS to be set in the user environment (#3579) --- sorc/build_gdas.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sorc/build_gdas.sh b/sorc/build_gdas.sh index 21e70aeb256..f67945aec85 100755 --- a/sorc/build_gdas.sh +++ b/sorc/build_gdas.sh @@ -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 From bd1cf41f5dbba8a4d73f6f4d841f8aa632bc0de1 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Tue, 15 Apr 2025 20:15:43 +0000 Subject: [PATCH 02/10] update sorc/gdas.cd hash (#3579) --- sorc/gdas.cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 492aa9967df..460abb82e00 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 492aa9967dfe0a3d8bc9e729ed4aa58eb7fc599c +Subproject commit 460abb82e004820f92d8edcbc4b173b7775a36b0 From 1b82be7e8bd587c9bfc92bd4dd07458bc9431957 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Wed, 16 Apr 2025 13:02:17 +0000 Subject: [PATCH 03/10] update sorc/gsi_utils.fd hash (#3579) --- sorc/gsi_utils.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd index f716012812c..ec424437760 160000 --- a/sorc/gsi_utils.fd +++ b/sorc/gsi_utils.fd @@ -1 +1 @@ -Subproject commit f716012812c2564e7eab24041f7a3ec14c7aa383 +Subproject commit ec42443776077f4fdeaa5c2503c247e078d6f298 From cbf3a2244c842bc13b0962b18bc1199d92859568 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Wed, 16 Apr 2025 18:55:11 +0000 Subject: [PATCH 04/10] set OUTPUT_FILETYPE_ATM and OUTPUT_FILETYPE_SFC for JEDI atmospheric DA (#3593) --- parm/config/gfs/config.efcs | 6 ++++++ parm/config/gfs/config.ufs | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/parm/config/gfs/config.efcs b/parm/config/gfs/config.efcs index 7378403de90..4826833b67c 100644 --- a/parm/config/gfs/config.efcs +++ b/parm/config/gfs/config.efcs @@ -46,6 +46,12 @@ fi export OUTPUT_FILETYPE_ATM="netcdf" export OUTPUT_FILETYPE_SFC="netcdf" +# Turn on cubed_sphere_grid output for JEDI atmospheric DA +if [[ "${DO_JEDIATMVAR}" = "YES" || "${DO_JEDIATMENS}" = "YES" ]]; then + OUTPUT_FILETYPE_ATM="netcdf_parallel" + OUTPUT_FILETYPE_SFC="netcdf_parallel" +fi + # Turn off inline UPP for EnKF forecast export WRITE_DOPOST=".false." diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index 11e81d8d60b..5bfb4d0e45b 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -368,6 +368,13 @@ case ${fv3_res} in exit 15 ;; esac + +# Turn on cubed_sphere_grid output for JEDI atmospheric DA +if [[ "${DO_JEDIATMVAR}" = "YES" || "${DO_JEDIATMENS}" = "YES" ]]; then + OUTPUT_FILETYPE_ATM="netcdf_parallel" + OUTPUT_FILETYPE_SFC="netcdf_parallel" +fi + export zstandard_level ideflate quantize_nsd export OUTPUT_FILETYPE_ATM OUTPUT_FILETYPE_SFC From bf871df7a4c16b87b5b11af0fa2931242bfc2c78 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Wed, 16 Apr 2025 19:03:35 +0000 Subject: [PATCH 05/10] enable C96C48_ufs_hybatmDA CI on hera and wcoss2 (#3579) --- dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml b/dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml index 37f4299cdb7..4d785ada96b 100644 --- a/dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml +++ b/dev/ci/cases/pr/C96C48_ufs_hybatmDA.yaml @@ -24,5 +24,3 @@ skip_ci_on_hosts: - orion - hercules - awsepicglobalworkflow - - hera - - wcoss2 From 4e338489cb82dac631441934cd2f7054ec24bb32 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Thu, 17 Apr 2025 17:17:00 +0000 Subject: [PATCH 06/10] remove gdasappPATH from load_ufsda_modules.sh (#3595) --- ush/load_ufsda_modules.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ush/load_ufsda_modules.sh b/ush/load_ufsda_modules.sh index 05e7d736030..88601de1917 100755 --- a/ush/load_ufsda_modules.sh +++ b/ush/load_ufsda_modules.sh @@ -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: From 7b9abfe4bfc2fdddf132b1136526da2e023b70bb Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Wed, 23 Apr 2025 20:34:35 +0000 Subject: [PATCH 07/10] revert cbf3a224 set OUTPUT_FILETYPE_ATM and OUTPUT_FILETYPE_SFC for JEDI atmospheric DA (#3593) --- parm/config/gfs/config.efcs | 6 ------ parm/config/gfs/config.ufs | 7 ------- 2 files changed, 13 deletions(-) diff --git a/parm/config/gfs/config.efcs b/parm/config/gfs/config.efcs index 4826833b67c..7378403de90 100644 --- a/parm/config/gfs/config.efcs +++ b/parm/config/gfs/config.efcs @@ -46,12 +46,6 @@ fi export OUTPUT_FILETYPE_ATM="netcdf" export OUTPUT_FILETYPE_SFC="netcdf" -# Turn on cubed_sphere_grid output for JEDI atmospheric DA -if [[ "${DO_JEDIATMVAR}" = "YES" || "${DO_JEDIATMENS}" = "YES" ]]; then - OUTPUT_FILETYPE_ATM="netcdf_parallel" - OUTPUT_FILETYPE_SFC="netcdf_parallel" -fi - # Turn off inline UPP for EnKF forecast export WRITE_DOPOST=".false." diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs index 5bfb4d0e45b..11e81d8d60b 100644 --- a/parm/config/gfs/config.ufs +++ b/parm/config/gfs/config.ufs @@ -368,13 +368,6 @@ case ${fv3_res} in exit 15 ;; esac - -# Turn on cubed_sphere_grid output for JEDI atmospheric DA -if [[ "${DO_JEDIATMVAR}" = "YES" || "${DO_JEDIATMENS}" = "YES" ]]; then - OUTPUT_FILETYPE_ATM="netcdf_parallel" - OUTPUT_FILETYPE_SFC="netcdf_parallel" -fi - export zstandard_level ideflate quantize_nsd export OUTPUT_FILETYPE_ATM OUTPUT_FILETYPE_SFC From d5e261ffdff5401f258d250f46c0822c1afed23f Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Wed, 23 Apr 2025 20:38:01 +0000 Subject: [PATCH 08/10] update sorc/ufs_model.fd hash (#3593) --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 6ece76a2e25..4a566203b76 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 6ece76a2e25147c7bbdf289e9d4b641576b64537 +Subproject commit 4a566203b76e0abbe6382ab12af1449efbbef8a4 From 59302e86462573d55c7d4ce6c9773821e97ca845 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Wed, 23 Apr 2025 21:03:28 +0000 Subject: [PATCH 09/10] update sorc/gdas.cd hash (#3579) --- sorc/gdas.cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 460abb82e00..03c10c2a1b0 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 460abb82e004820f92d8edcbc4b173b7775a36b0 +Subproject commit 03c10c2a1b053d8299f0539e62bae7045fea9ac9 From 28092d8926cb1767ec436ed63e7405044c7b8e80 Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA Date: Thu, 24 Apr 2025 12:49:05 +0000 Subject: [PATCH 10/10] set CMEPS_PIO variables in ush/parsing_ufs_configure.sh --- ush/parsing_ufs_configure.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ush/parsing_ufs_configure.sh b/ush/parsing_ufs_configure.sh index f5e58578301..fe428d77358 100755 --- a/ush/parsing_ufs_configure.sh +++ b/ush/parsing_ufs_configure.sh @@ -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