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

Allow use of ocean obs prep in WCDA cycling and remove R2D2 #2215

Merged
merged 9 commits into from
Jan 12, 2024
Merged

Allow use of ocean obs prep in WCDA cycling and remove R2D2 #2215

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
754fc29
add COMOUT_OBS to marine obs prep
AndrewEichmann-NOAA Dec 19, 2023
1c406db
Merge branch 'develop' into feature/marine-obsproc
AndrewEichmann-NOAA Jan 3, 2024
6e49d51
adding prepoceanobs to workflow
AndrewEichmann-NOAA Jan 8, 2024
30cab3d
Merge branch 'develop' into feature/marine-obsproc
AndrewEichmann-NOAA Jan 10, 2024
4a5cd4e
changes to use ocean obs prep in cycling and remove r2d2
AndrewEichmann-NOAA Jan 10, 2024
efab33f
coding norms correction
AndrewEichmann-NOAA Jan 10, 2024
949e3cb
coding norms correction
AndrewEichmann-NOAA Jan 10, 2024
a68b327
make OBSPROC_YAML and DMPDIR setup-determined
AndrewEichmann-NOAA Jan 11, 2024
61a18c5
bugfixes
AndrewEichmann-NOAA Jan 12, 2024
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
5 changes: 0 additions & 5 deletions parm/config/gfs/config.ocnanal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ export CASE_ANL=@CASE_ANL@
export DOMAIN_STACK_SIZE=116640000 #TODO: Make the stack size resolution dependent
export JEDI_BIN=${HOMEgfs}/sorc/gdas.cd/build/bin

# R2D2
export R2D2_OBS_DB=shared
export R2D2_OBS_DUMP=@R2D2_OBS_DUMP@
export R2D2_OBS_SRC=@R2D2_OBS_SRC@
export R2D2_OBS_WINDOW=24 # TODO: Check if the R2D2 sampling DB window is still needed
export COMIN_OBS=@COMIN_OBS@

# NICAS
Expand Down
5 changes: 4 additions & 1 deletion parm/config/gfs/config.prepoceanobs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ echo "BEGIN: config.prepoceanobs"
export OCNOBS2IODAEXEC=${HOMEgfs}/sorc/gdas.cd/build/bin/gdas_obsprovider2ioda.x

export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/config
export OBSPROC_YAML=@OBSPROC_CONFIG@
export OBSPROC_YAML=${HOMEgfs}/sorc/gdas.cd/parm/soca/obsproc/obsproc_config.yaml
export OBS_LIST=@SOCA_OBS_LIST@
[[ -n "${OBS_LIST}" ]] || export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
export OBS_YAML=${OBS_LIST}

# until dmpdir has full ocean obs; works on Hera
export DMPDIR=/scratch1/NCEPDEV/stmp4/Shastri.Paturi/forAndrew
AndrewEichmann-NOAA marked this conversation as resolved.
Show resolved Hide resolved

# Get task specific resources
. "${EXPDIR}/config.resources" prepoceanobs
echo "END: config.prepoceanobs"
10 changes: 7 additions & 3 deletions workflow/applications/gfs_cycled.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ def _get_app_configs(self):
configs += ['anal', 'analdiag']

if self.do_jediocnvar:
configs += ['ocnanalprep', 'ocnanalbmat', 'ocnanalrun', 'ocnanalchkpt', 'ocnanalpost', 'ocnanalvrfy']
configs += ['prepoceanobs', 'ocnanalprep', 'ocnanalbmat',
'ocnanalrun', 'ocnanalchkpt', 'ocnanalpost',
'ocnanalvrfy']

if self.do_ocean:
configs += ['ocnpost']
Expand Down Expand Up @@ -133,8 +135,10 @@ def get_task_names(self):
gdas_gfs_common_tasks_before_fcst += ['anal']

if self.do_jediocnvar:
gdas_gfs_common_tasks_before_fcst += ['ocnanalprep', 'ocnanalbmat', 'ocnanalrun',
'ocnanalchkpt', 'ocnanalpost', 'ocnanalvrfy']
gdas_gfs_common_tasks_before_fcst += ['prepoceanobs', 'ocnanalprep',
'ocnanalbmat', 'ocnanalrun',
'ocnanalchkpt', 'ocnanalpost',
'ocnanalvrfy']

gdas_gfs_common_tasks_before_fcst += ['sfcanl', 'analcalc']

Expand Down
18 changes: 17 additions & 1 deletion workflow/rocoto/gfs_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ def landanl(self):
task = rocoto.create_task(task_dict)
return task

def ocnanalprep(self):
def prepoceanobs(self):

ocean_hist_path = self._template_to_rocoto_cycstring(self._base["COM_OCEAN_HISTORY_TMPL"], {'RUN': 'gdas'})

Expand All @@ -588,6 +588,22 @@ def ocnanalprep(self):
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep=deps)

resources = self.get_resource('prepoceanobs')
task = create_wf_task('prepoceanobs',
AndrewEichmann-NOAA marked this conversation as resolved.
Show resolved Hide resolved
resources,
cdump=self.cdump,
envar=self.envars,
dependency=dependencies)

return task

def ocnanalprep(self):

deps = []
dep_dict = {'type': 'task', 'name': f'{self.cdump}prepoceanobs'}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep=deps)

resources = self.get_resource('ocnanalprep')
task_name = f'{self.cdump}ocnanalprep'
task_dict = {'task_name': task_name,
Expand Down
1 change: 1 addition & 0 deletions workflow/rocoto/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class Tasks:
VALID_TASKS = ['aerosol_init', 'stage_ic',
'prep', 'anal', 'sfcanl', 'analcalc', 'analdiag', 'arch', "cleanup",
'prepatmiodaobs', 'atmanlinit', 'atmanlrun', 'atmanlfinal',
'prepoceanobs',
'ocnanalprep', 'ocnanalbmat', 'ocnanalrun', 'ocnanalchkpt', 'ocnanalpost', 'ocnanalvrfy',
'earc', 'ecen', 'echgres', 'ediag', 'efcs',
'eobs', 'eomg', 'epos', 'esfc', 'eupd',
Expand Down