Skip to content
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

Update ufs_utils hash that supports global_cycle with NoahMP. #1315

Merged
merged 5 commits into from
Feb 22, 2023
+10 −14
Merged

Update ufs_utils hash that supports global_cycle with NoahMP. #1315

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a22633d
cycle with NoahMP
aerorahul Feb 15, 2023
f38a222
update hashes to ufs-utils following merge of noahmp gcycle update
aerorahul Feb 21, 2023
90a8fc8
Merge branch 'develop' into feature/cycle_noahmp
aerorahul Feb 21, 2023
e930eb2
update ufs_utils hash to only build GFS required utilities
aerorahul Feb 22, 2023
18a4681
Merge branch 'develop' into feature/cycle_noahmp
aerorahul Feb 22, 2023
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
4 changes: 2 additions & 2 deletions Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ protocol = git
required = True

[UFS-Utils]
hash = 8b990c0
hash = 86989df
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
protocol = git
required = True

Expand Down
2 changes: 2 additions & 0 deletions scripts/exgdas_enkf_sfc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,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
Expand All @@ -171,6 +172,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
Expand Down
2 changes: 2 additions & 0 deletions scripts/exglobal_atmos_sfcanl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion sorc/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" "8b990c0" ; 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
Expand Down
12 changes: 2 additions & 10 deletions workflow/setup_expt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,16 +244,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'
Expand Down