Skip to content

Refactor marine DA tasks #4160

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

Merged
DavidNew-NOAA merged 43 commits into from
Oct 25, 2025
Merged

Refactor marine DA tasks #4160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c9f139b
Update
DavidNew-NOAA Oct 15, 2025
5a6b837
Merge branch 'develop' into feature/marine-refactor
DavidNew-NOAA Oct 15, 2025
117fa58
Debug
DavidNew-NOAA Oct 16, 2025
a94c68b
Add recentering
DavidNew-NOAA Oct 16, 2025
463bd6f
marine letkf debug
DavidNew-NOAA Oct 17, 2025
57c60cc
Merge branch 'develop' into feature/marine-refactor
DavidNew-NOAA Oct 17, 2025
295ca00
Update gdas hash
DavidNew-NOAA Oct 17, 2025
816e6c6
comment out hack
DavidNew-NOAA Oct 17, 2025
f92ab56
Update gdas hash
DavidNew-NOAA Oct 20, 2025
0bf4885
pynorms
DavidNew-NOAA Oct 20, 2025
79d3e1b
pynorms
DavidNew-NOAA Oct 20, 2025
f79501b
Use namelist prep subroutine for mom6 in letkf
DavidNew-NOAA Oct 20, 2025
43e8ffa
Debug
DavidNew-NOAA Oct 20, 2025
7ee6576
Update comments and add LETKF dependency in rocoto for marine archiving
DavidNew-NOAA Oct 20, 2025
ef42478
pynorms
DavidNew-NOAA Oct 20, 2025
0f6e4f1
Update gdas hash
DavidNew-NOAA Oct 20, 2025
cfec1db
Clean up
DavidNew-NOAA Oct 20, 2025
b7c205e
Update GDAS hash
DavidNew-NOAA Oct 21, 2025
03103ac
Merge branch 'develop' into feature/marine-refactor
DavidNew-NOAA Oct 21, 2025
ff970e1
update gdas hash
DavidNew-NOAA Oct 22, 2025
16298d7
Update gdas hash
DavidNew-NOAA Oct 22, 2025
780112b
Merge branch 'develop' into feature/marine-refactor
DavidNew-NOAA Oct 22, 2025
5f52a90
Update gdas hash
DavidNew-NOAA Oct 22, 2025
f8ef025
Update gdas hash
DavidNew-NOAA Oct 22, 2025
1e9a1ed
wrong jcb-gdas hash D:
DavidNew-NOAA Oct 22, 2025
5cf28e4
Debug
DavidNew-NOAA Oct 22, 2025
c5c7c17
Update gdas hash
DavidNew-NOAA Oct 22, 2025
af3532b
Upudate gdas hash
DavidNew-NOAA Oct 22, 2025
b13a88e
Update GDAS hash
DavidNew-NOAA Oct 23, 2025
39407fc
untangle config files
DavidNew-NOAA Oct 23, 2025
4c2b3c7
Update gdas hash
DavidNew-NOAA Oct 23, 2025
9ef46f8
Merge branch 'develop' into feature/marine-refactor
DavidNew-NOAA Oct 23, 2025
b1a1608
Debug
DavidNew-NOAA Oct 23, 2025
1760948
debug
DavidNew-NOAA Oct 23, 2025
1f40289
add .j2
DavidNew-NOAA Oct 23, 2025
9d52277
Forgot something
DavidNew-NOAA Oct 23, 2025
eb06572
Debug
DavidNew-NOAA Oct 23, 2025
8076d67
Debug
DavidNew-NOAA Oct 23, 2025
8f4e0ba
Update gdas hash to develop
DavidNew-NOAA Oct 23, 2025
1f25c36
Update gdas hash to develop
DavidNew-NOAA Oct 23, 2025
90526db
Update jobs/JGLOBAL_MARINE_ANALYSIS_LETKF
DavidNew-NOAA Oct 23, 2025
8f73906
Merge branch 'develop' into feature/marine-refactor
DavidNew-NOAA Oct 24, 2025
078f15a
Merge branch 'develop' into feature/marine-refactor
DavidNew-NOAA Oct 24, 2025
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: 4 additions & 0 deletions dev/ci/cases/gfsv17/marine3dvar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ prepoceanobs:
# will not work for realtime or retros
dmpdir_exp: "${BASE_DATA}/experimental_obs"

marinebmat:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca

marineanl:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
Expand Down
13 changes: 13 additions & 0 deletions dev/ci/cases/gfsv17/marinehyb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,21 @@ prepoceanobs:
# will not work for realtime or retros
dmpdir_exp: "${BASE_DATA}/experimental_obs"

marinebmat:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca

marineanl:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2
SOCA_NINNER: 100

marineanlecen:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca

marineanlletkf:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2
17 changes: 15 additions & 2 deletions dev/ci/cases/gfsv17/s2sw.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,26 @@ base:

prepoceanobs:
use_exp_obs: "YES"
# retro
# retro
# dmpdir_exp: /lfs/h2/emc/da/noscrub/common_obsForge
# realtime
dmpdir_exp: /lfs/h2/emc/da/noscrub/mindo.choi/MARINE_obs/COMROOT/realtime

marinebmat:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
Comment on lines +35 to +36
Copy link
Copy Markdown
Contributor

@aerorahul aerorahul Oct 24, 2025

Choose a reason for hiding this comment

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

Why are these not in config.base if they are used across so many jobs?

Copy link
Copy Markdown
Contributor Author

@DavidNew-NOAA DavidNew-NOAA Oct 24, 2025

Choose a reason for hiding this comment

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

Good point. I have another PR planned at some point to remove utilities from ush/python/pygfs/utils, so I will put them in config.base there.


marineanl:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2
SOCA_NINNER: 100

marineanlecen:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca

marineanlletkf:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2
15 changes: 14 additions & 1 deletion dev/ci/cases/gfsv17/s2sw_rdhpcs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,21 @@ prepoceanobs:
# ursa
# dmpdir_exp: /scratch3/NCEPDEV/da/common_obsForge

marinebmat:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca

marineanl:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2
SOCA_NINNER: 100

marineanlecen:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca

marineanlletkf:
SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
SOCA_ANL_GEOM: {{ HOMEgfs }}/fix/gdas/soca/720x540x75/soca
SOCA_OBS_LIST: {{ HOMEgfs }}/parm/gdas/marine/obs/obs_list_gfsv17.yaml.j2
2 changes: 1 addition & 1 deletion dev/ci/cases/yamls/soca_hyb_gfs_defaults_ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ defaults:
base:
DO_JEDIOCNVAR: "YES"
DOHYBVAR_OCN: "YES"
DOLETKF_OCN: "NO"
DOLETKF_OCN: "YES"
marineanl:
SOCA_NINNER: 1
14 changes: 13 additions & 1 deletion dev/parm/config/gcafs/yaml/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,24 @@ snowanl:
IO_LAYOUT_X: 1
IO_LAYOUT_Y: 1

marinebmat:
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"

marineanl:
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_OBS_LIST: "${PARMgfs}/gdas/marine/obs/obs_list.yaml" # TODO: This is also repeated in oceanprepobs
SOCA_NINNER: 100
JCB_ALGO_YAML_VAR: "${PARMgfs}/gdas/marine/marine-jcb-3dfgat.yaml.j2"

marineanlecen:
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"

marineanlletkf:
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_OBS_LIST: "${PARMgfs}/gdas/marine/obs/obs_list.yaml.j2"

prepoceanobs:
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
Expand Down
13 changes: 2 additions & 11 deletions dev/parm/config/gfs/config.marineanl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,11 @@ echo "BEGIN: config.marineanl"
# TODO: This should be sourced in a config file specific to marine deterministic analysis
# and renamed to remove _DET

export JCB_ALGO_YAML_VAR="{{ JCB_ALGO_YAML_VAR }}"

export OBS_LIST_YAML="{{ SOCA_OBS_LIST }}"
export INPUT_FIX_DIR="{{ SOCA_INPUT_FIX_DIR }}"
export ANL_GEOM="{{ SOCA_ANL_GEOM }}"
export NINNER="{{ SOCA_NINNER }}"

export DOMAIN_STACK_SIZE=116640000 #TODO: Make the stack size resolution dependent
export MARINE_JCB_GDAS_OBS="${PARMgfs}/gdas/jcb-gdas/observations/marine"

export JEDI_CONFIG_YAML_DET="${PARMgfs}/gdas/marine/marine_det_jedi_config.yaml.j2"
export STAGE_FIX_YAML="${PARMgfs}/gdas/marine/marine_stage_fix_${OCNRES}.yaml.j2"
export STAGE_UTILITIES_YAML="${PARMgfs}/gdas/marine/marine_stage_utilities.yaml.j2"
export STAGE_DET_BKG_YAML="${PARMgfs}/gdas/marine/marine_det_stage_bkg.yaml.j2"
export STAGE_ENS_BKG_YAML="${PARMgfs}/gdas/marine/marine_ens_stage_bkg.yaml.j2"
export OBS_LIST_YAML="{{ SOCA_OBS_LIST }}"
export TASK_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_det_config.yaml.j2"
Comment thread
aerorahul marked this conversation as resolved.

echo "END: config.marineanl"
7 changes: 4 additions & 3 deletions dev/parm/config/gfs/config.marineanlecen → dev/parm/config/gfs/config.marineanlecen.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ echo "BEGIN: config.marineanlecen"
# Get task specific resources
source "${EXPDIR}/config.resources" marineanlecen

export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_ecen_jedi_config.yaml.j2"
export STAGE_YAML="${PARMgfs}/gdas/marine/marine_ecen_stage.yaml.j2"
export SAVE_YAML="${PARMgfs}/gdas/marine/marine_ecen_save.yaml.j2"
export INPUT_FIX_DIR="{{ SOCA_INPUT_FIX_DIR }}"
export ANL_GEOM="{{ SOCA_ANL_GEOM }}"

export TASK_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_ecen_config.yaml.j2"

echo "END: config.marineanlecen"
3 changes: 0 additions & 3 deletions dev/parm/config/gfs/config.marineanlfinal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@

echo "BEGIN: config.marineanlfinal"


# Get task specific resources
source "${EXPDIR}/config.resources" marineanlfinal

export SAVE_YAML="${PARMgfs}/gdas/marine/marine_det_save.yaml.j2"

echo "END: config.marineanlfinal"
2 changes: 0 additions & 2 deletions dev/parm/config/gfs/config.marineanlinit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ echo "BEGIN: config.marineanlinit"
# Get task specific resources
source "${EXPDIR}/config.resources" marineanlinit

export STAGE_YAML="${PARMgfs}/gdas/marine/marine_det_stage.yaml.j2"

echo "END: config.marineanlinit"
21 changes: 0 additions & 21 deletions dev/parm/config/gfs/config.marineanlletkf
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions dev/parm/config/gfs/config.marineanlletkf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

########## config.marineanlletkf ##########
# Ocn Analysis specific

echo "BEGIN: config.marineanlletkf"

# Get task specific resources
source "${EXPDIR}/config.resources" marineanlletkf

export INPUT_FIX_DIR="{{ SOCA_INPUT_FIX_DIR }}"
export ANL_GEOM="{{ SOCA_ANL_GEOM }}"

export OBS_LIST_YAML="{{ SOCA_OBS_LIST }}"
export TASK_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_ens_config.yaml.j2"

echo "END: config.marineanlletkf"
3 changes: 0 additions & 3 deletions dev/parm/config/gfs/config.marineanlvar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,4 @@ echo "BEGIN: config.marineanlvar"
# Get task specific resources
source "${EXPDIR}/config.resources" marineanlvar

export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_det_jedi_config.yaml.j2"
export JCB_ALGO_YAML_VAR="{{ JCB_ALGO_YAML_VAR }}"

echo "END: config.marineanlvar"
7 changes: 4 additions & 3 deletions dev/parm/config/gfs/config.marinebmat → dev/parm/config/gfs/config.marinebmat.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ echo "BEGIN: config.marinebmat"
# Get task specific resources
source "${EXPDIR}/config.resources" marinebmat

export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_bmat_jedi_config.yaml.j2"
export SAVE_YAML="${PARMgfs}/gdas/marine/marine_bmat_save.yaml.j2"
export COPY_BMAT_BKGERR_YAML="${PARMgfs}/gdas/marine/marine_bmat_copy_bkgerr.yaml.j2"
export INPUT_FIX_DIR="{{ SOCA_INPUT_FIX_DIR }}"
export ANL_GEOM="{{ SOCA_ANL_GEOM }}"

export TASK_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_bmat_config.yaml.j2"

echo "END: config.marinebmat"
2 changes: 0 additions & 2 deletions dev/parm/config/gfs/config.marinebmatinit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@ echo "BEGIN: config.marinebmatinit"
# Get task specific resources
source "${EXPDIR}/config.resources" marinebmatinit

export JEDI_CONFIG_YAML="${PARMgfs}/gdas/marine/marine_bmat_jedi_config.yaml.j2"

echo "END: config.marinebmatinit"
2 changes: 2 additions & 0 deletions dev/parm/config/gfs/config.prepoceanobs.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ fi

export DMPDIR="${dmpdir_exp:-${DMPDIR}}"

export MARINE_JCB_GDAS_OBS="${PARMgfs}/gdas/jcb-gdas/observations/marine"

# Get task specific resources
. "${EXPDIR}/config.resources" prepoceanobs
echo "END: config.prepoceanobs"
14 changes: 13 additions & 1 deletion dev/parm/config/gfs/yaml/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,24 @@ snowanl:
IO_LAYOUT_X: 1
IO_LAYOUT_Y: 1

marinebmat:
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"

marineanl:
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_OBS_LIST: "${PARMgfs}/gdas/marine/obs/obs_list.yaml.j2" # TODO: This is also repeated in oceanprepobs
SOCA_NINNER: 100
JCB_ALGO_YAML_VAR: "${PARMgfs}/gdas/marine/jcb-prototype_3dfgat.yaml.j2"

marineanlecen:
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"

marineanlletkf:
SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_ANL_GEOM: "${FIXgfs}/gdas/soca/72x35x25/soca"
SOCA_OBS_LIST: "${PARMgfs}/gdas/marine/obs/obs_list.yaml.j2"

prepoceanobs:
use_exp_obs: "YES"
Expand Down
6 changes: 6 additions & 0 deletions dev/workflow/rocoto/gfs_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3102,6 +3102,9 @@ def earc_tars(self):
if not self.options['do_jediatmvar']:
dep_dict = {'type': 'task', 'name': f'{self.run}_echgres'}
deps.append(rocoto.add_dependency(dep_dict))
if self._base.get('DOLETKF_OCN', True):
dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlletkf'}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)
else: # early cycle enkf run (enkfgfs)
dep_dict = {'type': 'task', 'name': f'{self.run}_esfc'}
Expand All @@ -3113,6 +3116,9 @@ def earc_tars(self):
deps.append(rocoto.add_dependency(dep_dict))
dep_dict = {'type': 'task', 'name': f'gfs_marineanlfinal'}
deps.append(rocoto.add_dependency(dep_dict))
if self._base.get('DOLETKF_OCN', True):
dep_dict = {'type': 'task', 'name': f'enkfgfs_marineanlletkf'}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)

earcenvars = self.envars.copy()
Expand Down
2 changes: 1 addition & 1 deletion jobs/JGLOBAL_MARINE_ANALYSIS_ECEN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export DATAjob="${DATAROOT/enkf/}/marineanalysis.${PDY:-}${cyc}"
export DATA="${DATAjob}/marineanlecen"
export DATAens="${DATAjob}/ensdata"

source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlecen" -c "base marineanl marineanlecen"
source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlecen" -c "base marineanlecen"

##############################################
# Set variables used in the script
Expand Down
4 changes: 3 additions & 1 deletion jobs/JGLOBAL_MARINE_ANALYSIS_LETKF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export DATA="${DATAjob}/marineanlletkf"
export DATAens="${DATAjob}/ensdata"
if [[ ! -d "${DATAens}" ]]; then mkdir -p "${DATAens}"; fi

source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlletkf" -c "base marineanl marineanlletkf"
source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlletkf" -c "base marineanlletkf"

##############################################
# Set variables used in the script
Expand Down Expand Up @@ -43,6 +43,8 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
YMD=${PDY} HH=${cyc} MEMDIR="ensstat" declare_from_tmpl -rx \
COMOUT_CONF:COM_CONF_TMPL

if [[ ! -d "${COMOUT_OCEAN_LETKF}" ]]; then mkdir -p "${COMOUT_OCEAN_LETKF}"; fi
if [[ ! -d "${COMOUT_ICE_LETKF}" ]]; then mkdir -p "${COMOUT_ICE_LETKF}"; fi
if [[ ! -d ${COMOUT_CONF} ]]; then mkdir -p "${COMOUT_CONF}"; fi
##############################################
# Begin JOB SPECIFIC work
Expand Down
2 changes: 1 addition & 1 deletion jobs/JGLOBAL_MARINE_BMAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [[ ! -d "${DATAstaticb}" ]]; then mkdir -p "${DATAstaticb}"; fi

# source config.base, config.ocnanal and config.marinebmat
# and pass marinebmat to ${machine}.env
source "${HOMEgfs}/ush/jjob_header.sh" -e "marinebmat" -c "base marineanl marinebmat"
source "${HOMEgfs}/ush/jjob_header.sh" -e "marinebmat" -c "base marinebmat"

##############################################
# Set variables used in the script
Expand Down
2 changes: 1 addition & 1 deletion jobs/JGLOBAL_MARINE_BMAT_INITIALIZE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [[ ! -d "${DATAstaticb}" ]]; then mkdir -p "${DATAstaticb}"; fi

# source config.base, config.ocnanal and config.marinebmatinit
# and pass marinebmat to ${machine}.env
source "${HOMEgfs}/ush/jjob_header.sh" -e "marinebmatinit" -c "base marineanl marinebmatinit"
source "${HOMEgfs}/ush/jjob_header.sh" -e "marinebmatinit" -c "base marinebmat marinebmatinit"

##############################################
# Set variables used in the script
Expand Down
2 changes: 1 addition & 1 deletion scripts/exglobal_marine_analysis_letkf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
# Instantiate the marine letkf task
MarineLetkf = MarineLETKF(config)
MarineLetkf.initialize()
MarineLetkf.run()
MarineLetkf.execute()
MarineLetkf.finalize()
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Open in desktop
Submodule gdas.cd updated 24 files
+1 −1 parm/jcb-gdas
+42 −14 parm/marine/jcb-base.yaml.j2
+5 −0 parm/marine/jcb-prototype_letkf.yaml.j2
+124 −0 parm/marine/marine_bmat_config.yaml.j2
+0 −8 parm/marine/marine_bmat_copy_bkgerr.yaml.j2
+0 −49 parm/marine/marine_bmat_jedi_config.yaml.j2
+0 −39 parm/marine/marine_bmat_save.yaml.j2
+105 −0 parm/marine/marine_det_config.yaml.j2
+0 −19 parm/marine/marine_det_jedi_config.yaml.j2
+0 −53 parm/marine/marine_det_save.yaml.j2
+0 −22 parm/marine/marine_det_stage.yaml.j2
+7 −18 parm/marine/marine_det_stage_bkg.yaml.j2
+87 −0 parm/marine/marine_ecen_config.yaml.j2
+0 −12 parm/marine/marine_ecen_jedi_config.yaml.j2
+0 −37 parm/marine/marine_ecen_save.yaml.j2
+0 −18 parm/marine/marine_ecen_stage.yaml.j2
+89 −0 parm/marine/marine_ens_config.yaml.j2
+0 −31 parm/marine/marine_ens_save.yaml.j2
+0 −11 parm/marine/marine_ens_stage.yaml.j2
+8 −18 parm/marine/marine_ens_stage_bkg.yaml.j2
+3 −5 parm/marine/marine_stage_fix_025.yaml.j2
+2 −4 parm/marine/marine_stage_fix_100.yaml.j2
+3 −5 parm/marine/marine_stage_fix_500.yaml.j2
+0 −1 parm/marine/marine_stage_utilities.yaml.j2
3 changes: 3 additions & 0 deletions ush/python/pygfs/task/analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def __init__(self, config: Dict[str, Any]):

# Get assimilation window times
_window_begin = add_to_datetime(self.task_config.current_cycle, -to_timedelta(f"{self.task_config.assim_freq}H") / 2)
_window_end = add_to_datetime(self.task_config.current_cycle, to_timedelta(f"{self.task_config.assim_freq}H") / 2)
_next_cycle = add_to_datetime(self.task_config.current_cycle, to_timedelta(f"{self.task_config.assim_freq}H"))

# Get specific assimilation times within the assimulation window
Expand Down Expand Up @@ -68,6 +69,8 @@ def __init__(self, config: Dict[str, Any]):
self.task_config.update(AttrDict(
{
'WINDOW_BEGIN': _window_begin,
'WINDOW_MIDDLE': self.task_config.current_cycle,
'WINDOW_END': _window_end,
'WINDOW_LENGTH': f"PT{self.task_config.assim_freq}H",
'next_cycle': _next_cycle,
'OPREFIX': f"{self.task_config.RUN.replace('enkf','')}.t{self.task_config.cyc:02d}z.",
Expand Down
Loading