From a22633d29f2ac3a82c5e8945a018fdc82ad3392c Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Wed, 15 Feb 2023 09:52:32 -0500 Subject: [PATCH 1/3] cycle with NoahMP --- Externals.cfg | 6 ++++-- scripts/exgdas_enkf_sfc.sh | 2 ++ scripts/exglobal_atmos_sfcanl.sh | 2 ++ sorc/checkout.sh | 4 +++- workflow/setup_expt.py | 12 ++---------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index ec5b58610a3..7c97c87a8f0 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -15,9 +15,11 @@ protocol = git required = True [UFS-Utils] -hash = 8b990c0 +#hash = 8b990c0 +hash = feature/cycle_noahmp local_path = sorc/ufs_utils.fd -repo_url = https://github.com/NOAA-EMC/UFS_UTILS.git +#repo_url = https://github.com/ufs-community/UFS_UTILS.git +repo_url = https://github.com/GeorgeGayno-NOAA/UFS_UTILS.git protocol = git required = True diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exgdas_enkf_sfc.sh index 3fc99c1890f..2374664be81 100755 --- a/scripts/exgdas_enkf_sfc.sh +++ b/scripts/exgdas_enkf_sfc.sh @@ -144,6 +144,7 @@ if [ $DOIAU = "YES" ]; then [[ $TILE_NUM -eq 1 ]] && mkdir -p $COMOUT_ENS/$memchar/atmos/RESTART + $NCP $COMIN_GES_ENS/$memchar/atmos/RESTART/$bPDY.${bcyc}0000.sfc_data.tile${n}.nc $COMOUT_ENS/$memchar/atmos/RESTART/$bPDY.${bcyc}0000.sfcanl_data.tile${n}.nc $NLN $COMIN_GES_ENS/$memchar/atmos/RESTART/$bPDY.${bcyc}0000.sfc_data.tile${n}.nc $DATA/fnbgsi.$cmem $NLN $COMOUT_ENS/$memchar/atmos/RESTART/$bPDY.${bcyc}0000.sfcanl_data.tile${n}.nc $DATA/fnbgso.$cmem $NLN $FIXfv3/$CASE/${CASE}_grid.tile${n}.nc $DATA/fngrid.$cmem @@ -170,6 +171,7 @@ if [ $DOSFCANL_ENKF = "YES" ]; then [[ $TILE_NUM -eq 1 ]] && mkdir -p $COMOUT_ENS/$memchar/atmos/RESTART + $NCP $COMIN_GES_ENS/$memchar/atmos/RESTART/$PDY.${cyc}0000.sfc_data.tile${n}.nc $COMOUT_ENS/$memchar/atmos/RESTART/$PDY.${cyc}0000.sfcanl_data.tile${n}.nc $NLN $COMIN_GES_ENS/$memchar/atmos/RESTART/$PDY.${cyc}0000.sfc_data.tile${n}.nc $DATA/fnbgsi.$cmem $NLN $COMOUT_ENS/$memchar/atmos/RESTART/$PDY.${cyc}0000.sfcanl_data.tile${n}.nc $DATA/fnbgso.$cmem $NLN $FIXfv3/$CASE/${CASE}_grid.tile${n}.nc $DATA/fngrid.$cmem diff --git a/scripts/exglobal_atmos_sfcanl.sh b/scripts/exglobal_atmos_sfcanl.sh index da4649c2976..7b76bc53591 100755 --- a/scripts/exglobal_atmos_sfcanl.sh +++ b/scripts/exglobal_atmos_sfcanl.sh @@ -177,6 +177,7 @@ if [[ ${DOIAU} = "YES" ]]; then # update surface restarts at the beginning of the window, if IAU # For now assume/hold dtfanl.nc valid at beginning of window for n in $(seq 1 ${ntiles}); do + ${NCP} ${COMIN_GES}/RESTART/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc ${COMOUT}/RESTART/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc ${NLN} ${COMIN_GES}/RESTART/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc ${DATA}/fnbgsi.00${n} ${NLN} ${COMOUT}/RESTART/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc ${DATA}/fnbgso.00${n} ${NLN} ${FIXfv3}/${CASE}/${CASE}_grid.tile${n}.nc ${DATA}/fngrid.00${n} @@ -193,6 +194,7 @@ fi # Update surface restarts at middle of window for n in $(seq 1 ${ntiles}); do + ${NCP} ${COMIN_GES}/RESTART/${PDY}.${cyc}0000.sfc_data.tile${n}.nc ${COMOUT}/RESTART/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc ${NLN} ${COMIN_GES}/RESTART/${PDY}.${cyc}0000.sfc_data.tile${n}.nc ${DATA}/fnbgsi.00${n} ${NLN} ${COMOUT}/RESTART/${PDY}.${cyc}0000.sfcanl_data.tile${n}.nc ${DATA}/fnbgso.00${n} ${NLN} ${FIXfv3}/${CASE}/${CASE}_grid.tile${n}.nc ${DATA}/fngrid.00${n} diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 514e772c988..85454d3d248 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -157,7 +157,9 @@ mkdir -p "${logdir}" errs=0 checkout "gfs_utils.fd" "https://github.com/NOAA-EMC/gfs-utils" "0b8ff56" ; errs=$((errs + $?)) checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-7a1ce44}" ; errs=$((errs + $?)) -checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "8b990c0" ; errs=$((errs + $?)) +# TODO update to authoritative develop when ufs_utils PR #XYZ is merged +#checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "8b990c0" ; errs=$((errs + $?)) +checkout "ufs_utils.fd" "https://github.com/GeorgeGayno-NOAA/UFS_UTILS.git" "1063f9b9" ; errs=$((errs + $?)) checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?)) if [[ ${checkout_gsi} == "YES" ]]; then diff --git a/workflow/setup_expt.py b/workflow/setup_expt.py index ef01bc9e525..37c40a1085f 100755 --- a/workflow/setup_expt.py +++ b/workflow/setup_expt.py @@ -236,16 +236,8 @@ def edit_baseconfig(host, inputs): } tmpl_dict = dict(tmpl_dict, **extend_dict) - # Determine CCPP suite and MP based on mode and app - gfsv16 = {"@CCPP_SUITE@": "FV3_GFS_v16", "@IMP_PHYSICS@": 11} - gfsv17 = {"@CCPP_SUITE@": "FV3_GFS_v17_p8", "@IMP_PHYSICS@": 8} - if inputs.mode in ['cycled']: - if inputs.app in ['ATM']: - extend_dict = gfsv16 - elif inputs.app in ['S2S', 'S2SW']: - extend_dict = gfsv17 - elif inputs.mode in ['forecast-only']: - extend_dict = gfsv17 + # All apps and modes now use the same physics and CCPP suite by default + extend_dict = {"@CCPP_SUITE@": "FV3_GFS_v17_p8", "@IMP_PHYSICS@": 8} tmpl_dict = dict(tmpl_dict, **extend_dict) base_input = f'{inputs.configdir}/config.base.emc.dyn' From f38a22250b062b9083efe0a364c321782b79d076 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Tue, 21 Feb 2023 10:36:16 -0500 Subject: [PATCH 2/3] update hashes to ufs-utils following merge of noahmp gcycle update --- Externals.cfg | 6 ++---- sorc/checkout.sh | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 7c97c87a8f0..d3680c39302 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -15,11 +15,9 @@ protocol = git required = True [UFS-Utils] -#hash = 8b990c0 -hash = feature/cycle_noahmp +hash = 86989df local_path = sorc/ufs_utils.fd -#repo_url = https://github.com/ufs-community/UFS_UTILS.git -repo_url = https://github.com/GeorgeGayno-NOAA/UFS_UTILS.git +repo_url = https://github.com/ufs-community/UFS_UTILS.git protocol = git required = True diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 85454d3d248..d3b68c50c83 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -157,9 +157,7 @@ mkdir -p "${logdir}" errs=0 checkout "gfs_utils.fd" "https://github.com/NOAA-EMC/gfs-utils" "0b8ff56" ; errs=$((errs + $?)) checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-7a1ce44}" ; errs=$((errs + $?)) -# TODO update to authoritative develop when ufs_utils PR #XYZ is merged -#checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "8b990c0" ; errs=$((errs + $?)) -checkout "ufs_utils.fd" "https://github.com/GeorgeGayno-NOAA/UFS_UTILS.git" "1063f9b9" ; errs=$((errs + $?)) +checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "86989df" ; errs=$((errs + $?)) checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?)) if [[ ${checkout_gsi} == "YES" ]]; then From e930eb27d39b9fb1ce5971ef7cdb4857febe8b65 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Wed, 22 Feb 2023 15:54:40 -0500 Subject: [PATCH 3/3] update ufs_utils hash to only build GFS required utilities --- Externals.cfg | 2 +- sorc/checkout.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index d3680c39302..4f7437f2f16 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -15,7 +15,7 @@ protocol = git required = True [UFS-Utils] -hash = 86989df +hash = 5b67e4d local_path = sorc/ufs_utils.fd repo_url = https://github.com/ufs-community/UFS_UTILS.git protocol = git diff --git a/sorc/checkout.sh b/sorc/checkout.sh index d3b68c50c83..4286960dec3 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -91,8 +91,8 @@ function checkout() { return "${status}" fi if [[ "${recursive}" == "YES" ]]; then - git submodule update --init --recursive >> "${logfile}" 2>&1 echo "|-- Updating submodules (if any)" + git submodule update --init --recursive >> "${logfile}" 2>&1 status=$? if ((status > 0)); then echo " WARNING: Error while updating submodules of ${name}" @@ -157,7 +157,7 @@ mkdir -p "${logdir}" errs=0 checkout "gfs_utils.fd" "https://github.com/NOAA-EMC/gfs-utils" "0b8ff56" ; errs=$((errs + $?)) checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-7a1ce44}" ; errs=$((errs + $?)) -checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "86989df" ; errs=$((errs + $?)) +checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "5b67e4d" ; errs=$((errs + $?)) checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?)) if [[ ${checkout_gsi} == "YES" ]]; then