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

Jump to bottom

Merge S2S defaults config back into other configs #1876

Merged
merged 4 commits into from
Sep 29, 2023
Merged

Merge S2S defaults config back into other configs #1876

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95cab5c
Meld S2SW config back into regular files
WalterKolczynski-NOAA Sep 19, 2023
ad56eb4
Update output frequency
WalterKolczynski-NOAA Sep 22, 2023
3c7daf5
Remove some unneeded pass-throughs in configs
WalterKolczynski-NOAA Sep 25, 2023
2fac377
Remove more setting pass-throughs
WalterKolczynski-NOAA Sep 25, 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
16 changes: 7 additions & 9 deletions parm/config/gefs/config.base.emc.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,6 @@ case "${APP}" in
export confignamevarfornems="${confignamevarfornems}_outerwave"
fi

source ${EXPDIR}/config.defaults.s2sw

;;
*)
echo "Unrecognized APP: ${1}"
Expand All @@ -234,15 +232,15 @@ export gfs_cyc=@gfs_cyc@ # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4:
# GFS output and frequency
export FHMIN_GFS=0

export FHMAX_GFS_00=${FHMAX_GFS_00:-120}
export FHMAX_GFS_06=${FHMAX_GFS_06:-120}
export FHMAX_GFS_12=${FHMAX_GFS_12:-120}
export FHMAX_GFS_18=${FHMAX_GFS_18:-120}
export FHMAX_GFS_00=120
export FHMAX_GFS_06=120
export FHMAX_GFS_12=120
export FHMAX_GFS_18=120
current_fhmax_var=FHMAX_GFS_${cyc}; declare -x FHMAX_GFS=${!current_fhmax_var}

export FHOUT_GFS=${FHOUT_GFS:-3}
export FHMAX_HF_GFS=${FHMAX_HF_GFS:-0}
export FHOUT_HF_GFS=${FHOUT_HF_GFS:-1}
export FHOUT_GFS=6 # Must be 6 for S2S until #1629 is addressed; 3 for ops
export FHMAX_HF_GFS=0
export FHOUT_HF_GFS=1
if (( gfs_cyc != 0 )); then
export STEP_GFS=$(( 24 / gfs_cyc ))
else
Expand Down
1 change: 0 additions & 1 deletion parm/config/gefs/config.defaults.s2sw
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions parm/config/gfs/config.arch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ echo "BEGIN: config.arch"
# Get task specific resources
. "${EXPDIR}/config.resources" arch

export ARCH_GAUSSIAN=${ARCH_GAUSSIAN:-"NO"}
export ARCH_GAUSSIAN_FHMAX=${ARCH_GAUSSIAN_FHMAX:-36}
export ARCH_GAUSSIAN_FHINC=${ARCH_GAUSSIAN_FHINC:-6}
export ARCH_GAUSSIAN="YES"
export ARCH_GAUSSIAN_FHMAX=${FHMAX_GFS}
export ARCH_GAUSSIAN_FHINC=${FHOUT_GFS}

#--online archive of nemsio files for fit2obs verification
export FITSARC="YES"
Expand Down
16 changes: 7 additions & 9 deletions parm/config/gfs/config.base.emc.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,6 @@ case "${APP}" in
export confignamevarfornems="${confignamevarfornems}_outerwave"
fi

source "${EXPDIR}/config.defaults.s2sw"

;;
*)
echo "Unrecognized APP: '${APP}'"
Expand Down Expand Up @@ -258,15 +256,15 @@ export gfs_cyc=@gfs_cyc@ # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4:
# GFS output and frequency
export FHMIN_GFS=0

export FHMAX_GFS_00=${FHMAX_GFS_00:-120}
export FHMAX_GFS_06=${FHMAX_GFS_06:-120}
export FHMAX_GFS_12=${FHMAX_GFS_12:-120}
export FHMAX_GFS_18=${FHMAX_GFS_18:-120}
export FHMAX_GFS_00=120
export FHMAX_GFS_06=120
export FHMAX_GFS_12=120
export FHMAX_GFS_18=120
current_fhmax_var=FHMAX_GFS_${cyc}; declare -x FHMAX_GFS=${!current_fhmax_var}

export FHOUT_GFS=${FHOUT_GFS:-3}
export FHMAX_HF_GFS=${FHMAX_HF_GFS:-0}
export FHOUT_HF_GFS=${FHOUT_HF_GFS:-1}
export FHOUT_GFS=6 # Must be 6 for S2S until #1629 is addressed; 3 for ops
export FHMAX_HF_GFS=0
export FHOUT_HF_GFS=1
if (( gfs_cyc != 0 )); then
export STEP_GFS=$(( 24 / gfs_cyc ))
else
Expand Down
29 changes: 0 additions & 29 deletions parm/config/gfs/config.defaults.s2sw
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions parm/config/gfs/config.ice
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@

echo "BEGIN: config.ice"

# Override atm-only FV3 settings when ice model is on
export min_seaice="1.0e-6"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both of these are variables set in input.nml . Do the tests that were run confirm that there are no answer changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can confirm the namelists use these settings. I have not checked the output for bitwise indenticality.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, it'd might be good to check for bitwise identity too and to make sure this isn't being sourced for atm-only case as mentioned in the comments. Right now I can't seem to find where the sourcing of this config is happening - but perhaps the logic has just changed and I haven't had time to understand but I don't see where this config is sourced for the forecast job if coupled. I'll try to test this tomorrow unless you have saved output that we can compare results with.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It gets sourced by config.fcst based on the DO_ switches:

global-workflow/parm/config/gfs/config.fcst

Lines 23 to 29 in 527aa16

# Source component configs if necessary
for component in WAVE OCN ICE AERO; do
control="DO_${component}"
if [[ ${!control} == "YES" ]]; then
source "${EXPDIR}/config.${component,,}"
fi
done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing this out! If the output is all the same as before and has been confirmed, this all looks good to me. Although I'm still not 100% sure I'd leave this as an "ice" configuration variables as these are really atm variables that are associated with ice not ice variables. Will people know to look for these here? This isn't where I'd look personally.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was finally able to check the files and they are bitwise identical.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this check @WalterKolczynski-NOAA !!!!

export use_cice_alb=".true."

echo "END: config.ice"
2 changes: 1 addition & 1 deletion parm/config/gfs/config.ocnpost
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ if [[ "${machine}" = "WCOSS2" ]]; then
fi

# No. of concurrent post jobs [0 implies sequential]
export NPOSTGRP=2
export NPOSTGRP=5

echo "END: config.ocnpost"
6 changes: 3 additions & 3 deletions parm/config/gfs/config.wave
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,18 @@ fi
export WAVHINDH=${WAVHINDH:-0}
export FHMIN_WAV=${FHMIN_WAV:-0}
export FHOUT_WAV=${FHOUT_WAV:-3}
export FHMAX_HF_WAV=${FHMAX_HF_WAV:-120}
export FHMAX_HF_WAV=${FHMAX_HF_WAV:-0} # 120 for ops
WalterKolczynski-NOAA marked this conversation as resolved.
Show resolved Hide resolved
export FHOUT_HF_WAV=${FHOUT_HF_WAV:-1}
export FHMAX_WAV_IBP=180
if (( FHMAX_WAV < FHMAX_WAV_IBP )); then export FHMAX_WAV_IBP=${FHMAX_GFS} ; fi

# gridded and point output rate
export DTFLD_WAV=$(( FHOUT_HF_WAV * 3600 ))
export DTPNT_WAV=${DTPNT_WAV:-3600}
export DTPNT_WAV=${DTPNT_WAV:-10800} # 3600 for ops
WalterKolczynski-NOAA marked this conversation as resolved.
Show resolved Hide resolved
export FHINCP_WAV=$(( DTPNT_WAV / 3600 ))

# Selected output parameters (gridded)
export OUTPARS_WAV=${OUTPARS_WAV:-"WND HS FP DP PHS PTP PDIR"}
export OUTPARS_WAV="WND CUR ICE HS T01 T02 DIR FP DP PHS PTP PDIR CHA"
WalterKolczynski-NOAA marked this conversation as resolved.
Show resolved Hide resolved

# Restart file config
if [[ "${CDUMP}" = "gdas" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ush/hpssarch_gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ if [[ ${type} = "gfs" ]]; then
"loginc.txt")
for file in "${gsida_files[@]}"; do
[[ -s ${COM_ATMOS_ANALYSIS}/${head}${file} ]] && echo "${COM_ATMOS_ANALYSIS/${ROTDIR}\//}/${head}${file}"
done
done
} >> gfs_netcdfa.txt
fi

Expand Down