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
1 change: 1 addition & 0 deletions ci/cases/gfsv17/marinehyb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ base:
DO_JEDISNOWDA: "NO"
DO_MERGENSST: "NO"
DOHYBVAR_OCN: "YES"
DOLETKF_OCN: "NO"
DO_FIT2OBS: "YES"
DO_VERFOZN: "YES"
DO_VERFRAD: "YES"
Expand Down
1 change: 1 addition & 0 deletions ci/cases/yamls/soca_hyb_gfs_defaults_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ base:
ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
DO_JEDIOCNVAR: "YES"
DOHYBVAR_OCN: "YES"
DOLETKF_OCN: "YES"
marineanl:
SOCA_NINNER: 1
1 change: 1 addition & 0 deletions parm/config/gfs/config.base
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,7 @@ export DO_STARTMEM_FROM_JEDIICE="@DO_STARTMEM_FROM_JEDIICE@"
# Hybrid related
export DOHYBVAR="@DOHYBVAR@"
export DOHYBVAR_OCN="@DOHYBVAR_OCN@"
export DOLETKF_OCN="@DOLETKF_OCN@"
export NMEM_ENS=@NMEM_ENS@
export SMOOTH_ENKF="NO"
export l4densvar=".true."
Expand Down
1 change: 1 addition & 0 deletions parm/config/gfs/yaml/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ base:
EUPD_CYC: "gdas"
FHMAX_ENKF_GFS: 12
DOHYBVAR_OCN: "NO"
DOLETKF_OCN: "NO"
DO_TEST_MODE: "NO"

atmanl:
Expand Down
2 changes: 1 addition & 1 deletion scripts/exglobal_archive_tars.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def main():
'FHOUT_HF_WAV', 'FHMAX_WAV', 'FHMAX_HF_WAV', 'FHMAX_WAV_GFS',
'restart_interval_gdas', 'restart_interval_gfs', 'DO_ARCHCOM',
'DO_AERO_ANL', 'DO_AERO_FCST', 'DO_CA', 'DOIBP_WAV', 'DO_JEDIOCNVAR', 'DOHYBVAR_OCN',
'NMEM_ENS', 'DO_JEDIATMVAR', 'FHMAX_FITS', 'waveGRD',
'DOLETKF_OCN', 'NMEM_ENS', 'DO_JEDIATMVAR', 'FHMAX_FITS', 'waveGRD',
Comment thread
DavidHuber-NOAA marked this conversation as resolved.
'IAUFHRS', 'DO_FIT2OBS', 'NET', 'FHOUT_HF_GFS', 'FHMAX_HF_GFS', 'REPLAY_ICS',
'OFFSET_START_HOUR', 'ARCH_EXPDIR', 'EXPDIR', 'ARCH_EXPDIR_FREQ', 'ARCH_HASHES',
'ARCH_DIFFS', 'SDATE', 'EDATE', 'HOMEgfs', 'DO_GEMPAK', 'DATASETS_YAML',
Expand Down
9 changes: 7 additions & 2 deletions workflow/applications/gfs_cycled.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def _get_run_options(self, conf: Configuration) -> Dict[str, Any]:

run_options[run]['do_hybvar'] = base.get('DOHYBVAR', False)
run_options[run]['do_hybvar_ocn'] = base.get('DOHYBVAR_OCN', False)
run_options[run]['do_letkf_ocn'] = base.get('DOLETKF_OCN', False)
run_options[run]['nens'] = base.get('NMEM_ENS', 0)
if run_options[run]['do_hybvar']:
run_options[run]['lobsdiag_forenkf'] = base.get('lobsdiag_forenkf', False)
Expand Down Expand Up @@ -68,8 +69,10 @@ def _get_app_configs(self, run):

if options['do_jediocnvar']:
configs += ['prepoceanobs', 'marineanlinit', 'marinebmat', 'marineanlvar']
if options['do_letkf_ocn']:
configs += ['marineanlletkf']
if options['do_hybvar']:
configs += ['marineanlletkf', 'ocnanalecen']
configs += ['ocnanalecen']
configs += ['marineanlchkpt', 'marineanlfinal']

if options['do_ocean'] or options['do_ice']:
Expand Down Expand Up @@ -192,8 +195,10 @@ def get_task_names(self):

if options['do_jediocnvar']:
task_names[run] += ['prepoceanobs', 'marineanlinit', 'marinebmat', 'marineanlvar']
if options['do_letkf_ocn']:
task_names[run] += ['marineanlletkf']
if options['do_hybvar']:
task_names[run] += ['marineanlletkf', 'ocnanalecen']
task_names[run] += ['ocnanalecen']
task_names[run] += ['marineanlchkpt', 'marineanlfinal']

task_names[run] += ['sfcanl']
Expand Down