Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions dev/ci/cases/pr/C96mx025_S2S.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
experiment:
net: sfs
mode: forecast-only
idate: 1994050100
edate: 1994050100
pslot: {{ 'pslot' | getenv }}
app: S2S
resdetatmos: 96
resensatmos: 96
resdetocean: 0.25
start: 'cold'
nens: 2
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96mx025/20251217
yaml: {{ HOMEgfs }}/dev/ci/cases/yamls/sfs_CPC_defaults.yaml

skip_ci_on_hosts:
- gaeac5
- awsepicglobalworkflow

workflow:
engine: rocoto
rocoto:
maxtries: 2
cyclethrottle: 3
taskthrottle: 25
verbosity: 2
1 change: 0 additions & 1 deletion dev/ci/cases/yamls/gefs_defaults_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ base:
DO_BUFRSND: "NO"
DO_GEMPAK: "NO"
DO_AWIPS: "NO"
ocn:
MOM6_INTERP_ICS: "NO"
10 changes: 10 additions & 0 deletions dev/ci/cases/yamls/sfs_CPC_defaults.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
defaults:
!INC {{ HOMEgfs }}/dev/parm/config/sfs/yaml/defaults.yaml
base:
FHMAX_GFS: 144
FCST_BREAKPOINTS: "48,96"
USE_OCN_ENS_PERTURB_FILES: "YES"
USE_ATM_ENS_PERTURB_FILES: "YES"
MOM6_INTERP_ICS: "YES"
nsst:
NST_SPINUP: 1
1 change: 0 additions & 1 deletion dev/ci/cases/yamls/sfs_defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ base:
FCST_BREAKPOINTS: "48,96"
USE_OCN_ENS_PERTURB_FILES: "YES"
USE_ATM_ENS_PERTURB_FILES: "YES"
ocn:
MOM6_INTERP_ICS: "YES"
1 change: 0 additions & 1 deletion dev/ci/cases/yamls/sfs_full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ base:
FCST_BREAKPOINTS: ""
USE_OCN_ENS_PERTURB_FILES: "YES"
USE_ATM_ENS_PERTURB_FILES: "YES"
ocn:
MOM6_INTERP_ICS: "YES"
10 changes: 5 additions & 5 deletions dev/ci/gitlab-ci-hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@

# Template matrices for case lists
.hera_cases_matrix: &hera_cases
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48_ufsgsi_hybatmDA", "C96C48_ufs_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96_gcafs_cycled", "C96_gcafs_cycled_noDA", "C96mx100_S2S"]
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48_ufsgsi_hybatmDA", "C96C48_ufs_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96_gcafs_cycled", "C96_gcafs_cycled_noDA", "C96mx100_S2S", "C96mx025_S2S"]

.gaeac6_cases_matrix: &gaeac6_cases
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96_gcafs_cycled", "C96_gcafs_cycled_noDA", "C96mx100_S2S"]
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96_gcafs_cycled", "C96_gcafs_cycled_noDA", "C96mx100_S2S", "C96mx025_S2S"]

.orion_cases_matrix: &orion_cases
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C96C48_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96_gcafs_cycled"]
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C96C48_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96_gcafs_cycled", "C96mx025_S2S"]

.hercules_cases_matrix: &hercules_cases
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96_gcafs_cycled"]
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96_gcafs_cycled", "C96mx025_S2S"]

.ursa_cases_matrix: &ursa_cases
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48_ufsgsi_hybatmDA", "C96C48_ufs_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S"]
- caseName: ["C48_ATM", "C48_S2SW", "C48_S2SWA_gefs", "C48mx500_3DVarAOWCDA", "C48mx500_hybAOWCDA", "C96C48_hybatmDA", "C96C48_hybatmsnowDA", "C96C48_hybatmsoilDA", "C96C48_ufsgsi_hybatmDA", "C96C48_ufs_hybatmDA", "C96C48mx500_S2SW_cyc_gfs", "C96_atm3DVar", "C96mx100_S2S", "C96mx025_S2S"]

# Host: Hera - Standard Cases
setup_experiments-hera:
Expand Down
3 changes: 3 additions & 0 deletions dev/parm/config/gefs/config.base.j2
Original file line number Diff line number Diff line change
Expand Up @@ -326,4 +326,7 @@ export CLIENT_GLOBUS_UUID="{{ CLIENT_GLOBUS_UUID }}"
# Number of regional collectives to create soundings for
export NUM_SND_COLLECTIVES=${NUM_SND_COLLECTIVES:-9}

# MOM6 IC setting needed for forecast and stage ics
export MOM6_INTERP_ICS="{{ MOM6_INTERP_ICS }}"

echo "END: config.base"
2 changes: 1 addition & 1 deletion dev/parm/config/gefs/config.ufs
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ if [[ "${skip_mom6}" == "false" ]]; then
FRUNOFF="runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc"
CHLCLIM="seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc"
MOM6_RIVER_RUNOFF='True'
MOM6_RESTART_SETTING="r"
MOM6_RESTART_SETTING=${MOM6_RESTART_SETTING:-'r'}
eps_imesh="1.0e-1"
case ${RUN} in
gfs|gefs|sfs)
Expand Down
3 changes: 1 addition & 2 deletions dev/parm/config/gefs/yaml/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@ base:
USE_OCN_ENS_PERTURB_FILES: "NO"
USE_ATM_ENS_PERTURB_FILES: "NO"
DO_TEST_MODE: "NO"
MOM6_INTERP_ICS: "NO"
fcst:
CHECK_LAND_RESTART_OROG: "YES"
reforecast: "NO"
FHZERO: 6
TYPE: "nh"
MONO: "non-mono"
ocn:
MOM6_INTERP_ICS: "NO"
nsst:
NST_SPINUP: 0
# config.aero has just a system-specific path to add.
Expand Down
3 changes: 1 addition & 2 deletions dev/parm/config/gfs/config.ocn.j2
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ else
export ODA_INCUPD_NHOURS="3.0"
fi

MOM6_INTERP_ICS="{{ MOM6_INTERP_ICS }}"
if [[ "${MOM6_INTERP_ICS}" == "YES" ]]; then
if [[ "${MOM6_INTERP_ICS:-NO}" == "YES" ]]; then
export MOM6_RESTART_SETTING='n'
export MOM6_WARMSTART_FILE="MOM.res.nc"
export MOM6_INIT_FROM_Z='False'
Expand Down
3 changes: 3 additions & 0 deletions dev/parm/config/sfs/config.base.j2
Original file line number Diff line number Diff line change
Expand Up @@ -322,4 +322,7 @@ export ARCHCOM_TO="{{ ARCHCOM_TO }}" # Valid options are hpss, globus_hpss, a
# Number of regional collectives to create soundings for
export NUM_SND_COLLECTIVES=${NUM_SND_COLLECTIVES:-9}

# MOM6 IC setting needed for forecast and stage ics
export MOM6_INTERP_ICS="{{ MOM6_INTERP_ICS }}"

echo "END: config.base"
4 changes: 2 additions & 2 deletions dev/parm/config/sfs/config.efcs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ source "${EXPDIR}/config.ufs" ${string}
source "${EXPDIR}/config.resources" efcs

# Stochastic physics parameters (only for ensemble forecasts)
if [[ "${CASE}" == "C96" ]] ; then
export DO_SKEB="NO" # SKEB turned off for C96
if [[ "${TYPE}" == "hydro" ]] ; then
export DO_SKEB="NO" # SKEB turned off for hydrostatic runs due to bug in FV3
export SKEB=-999.
else
export DO_SKEB="YES" # SKEB turned on for all other resolutions
Expand Down
3 changes: 1 addition & 2 deletions dev/parm/config/sfs/yaml/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@ base:
USE_OCN_ENS_PERTURB_FILES: "NO"
USE_ATM_ENS_PERTURB_FILES: "NO"
DO_TEST_MODE: "NO"
MOM6_INTERP_ICS: "NO"
fcst:
CHECK_LAND_RESTART_OROG: "YES"
reforecast: "YES"
FHZERO: 24
TYPE: "hydro"
MONO: "mono"
ocn:
MOM6_INTERP_ICS: "NO"
nsst:
NST_SPINUP: 0
# config.aero has just a system-specific path to add.
Expand Down
2 changes: 1 addition & 1 deletion parm/stage/ocean.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ocean:
- "{{ COMOUT_OCEAN_RESTART_PREV }}"
link_req:
- ["{{ ICSDIR }}/{{ COMOUT_OCEAN_RESTART_PREV | relpath(ROTDIR) }}/{{ m_prefix }}.MOM.res.nc", "{{ COMOUT_OCEAN_RESTART_PREV }}"]
{% if OCNRES == "025" %}
{% if OCNRES == "025" and not MOM6_INTERP_ICS %}
{% for nn in range(1, 4) %}
- ["{{ ICSDIR }}/{{ COMOUT_OCEAN_RESTART_PREV | relpath(ROTDIR) }}/{{ m_prefix }}.MOM.res_{{ nn }}.nc", "{{ COMOUT_OCEAN_RESTART_PREV }}"]
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion ush/python/pygfs/task/stage_ic.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def _copy_base_config(self) -> Dict[str, Any]:
'ROTDIR', 'ICSDIR', 'STAGE_IC_YAML_TMPL', 'DO_JEDIATMVAR',
'OCNRES', 'waveGRD', 'ntiles', 'DOIAU', 'ATMINC_GRID',
'DO_JEDIOCNVAR', 'DO_STARTMEM_FROM_JEDIICE',
'DO_WAVE', 'DO_OCN', 'DO_ICE', 'DO_NEST', 'DO_CA', 'DO_AERO_ANL',
'DO_WAVE', 'DO_OCN', 'DO_ICE', 'DO_NEST', 'DO_CA', 'DO_AERO_ANL', 'MOM6_INTERP_ICS',
'USE_ATM_ENS_PERTURB_FILES', 'USE_OCN_ENS_PERTURB_FILES', 'DO_GSISOILDA', 'DO_LAND_IAU'
]

Expand Down
Loading