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

Marine DA bug fix and cycling of the verify task #1514

Merged
merged 1 commit into from
Apr 25, 2023
Merged

Marine DA bug fix and cycling of the verify task #1514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions jobs/rocoto/ocnanalchkpt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#! /usr/bin/env bash

source "${HOMEgfs}/ush/preamble.sh"

###############################################################
# Source UFSDA workflow modules
. "${HOMEgfs}/ush/load_ufsda_modules.sh"
status=$?
[[ ${status} -ne 0 ]] && exit "${status}"

export job="ocnanalchkpt"
export jobid="${job}.$$"

###############################################################
# Execute the JJOB
"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT
status=$?
exit "${status}"
10 changes: 10 additions & 0 deletions parm/config/config.ocnanalvrfy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

########## config.ocnanalvrfy ##########
# Pre Ocn Analysis specific

echo "BEGIN: config.ocnanalvrfy"

# Get task specific resources
. "${EXPDIR}/config.resources" ocnanalvrfy
echo "END: config.ocnanalvrfy"
14 changes: 11 additions & 3 deletions parm/config/config.resources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ if [[ $# -ne 1 ]]; then
echo "wavegempak waveawipsbulls waveawipsgridded"
echo "postsnd awips gempak"
echo "wafs wafsgrib2 wafsblending wafsgrib20p25 wafsblending0p25 wafsgcip"
echo "ocnanalprep ocnanalbmat ocnanalrun ocnanalchkpt ocnanalpost"

echo "ocnanalprep ocnanalbmat ocnanalrun ocnanalchkpt ocnanalpost ocnanalvrfy"
exit 1

fi
Expand Down Expand Up @@ -228,7 +227,7 @@ elif [[ "${step}" = "landanlinit" || "${step}" = "landanlrun" || "${step}" = "l
export layout_x
export layout_y

if [[ "${step}" = "landanlinit" || "${step}" = "landanlfinal" ]]; then
if [[ "${step}" = "landanlinit" || "${step}" = "landanlfinal" ]]; then
declare -x "wtime_${step}"="00:10:00"
declare -x "npe_${step}"=1
declare -x "nth_${step}"=1
Expand Down Expand Up @@ -397,6 +396,15 @@ elif [[ "${step}" = "ocnanalpost" ]]; then
npe_node_ocnanalpost=$(echo "${npe_node_max} / ${nth_ocnanalpost}" | bc)
export npe_node_ocnanalpost

elif [[ "${step}" = "ocnanalvrfy" ]]; then

export wtime_ocnanalvrfy="00:35:00"
export npe_ocnanalvrfy=1
export nth_ocnanalvrfy=1
npe_node_ocnanalvrfy=$(echo "${npe_node_max} / ${nth_ocnanalvrfy}" | bc)
export npe_node_ocnanalvrfy
export memory_ocnanalvrfy="24GB"

elif [[ ${step} = "anal" ]]; then

export wtime_anal="00:50:00"
Expand Down
5 changes: 3 additions & 2 deletions workflow/applications.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ def _cycled_configs(self):
configs += ['anal', 'analdiag']

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

if self.do_ocean:
configs += ['ocnpost']

Expand Down Expand Up @@ -362,7 +363,7 @@ def _get_cycled_task_names(self):

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

Choose a reason for hiding this comment

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

Just curious q. here;
is ocnanalvrfy REQUIRED to be run before forecast? As in, does it produce files that the model needs? Or is this more of a check to ensure that the ocean initial conditions are sane?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@aerorahul , the later, nothing should depend on that task.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you. We will keep in mind when we streamline these ocean jobs and be mindful of not delaying the forecast job if this adds time to trigger.


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

Expand Down
18 changes: 17 additions & 1 deletion workflow/rocoto/workflow_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Tasks:
VALID_TASKS = ['aerosol_init', 'coupled_ic', 'getic', 'init',
'prep', 'anal', 'sfcanl', 'analcalc', 'analdiag', 'gldas', 'arch',
'atmanlinit', 'atmanlrun', 'atmanlfinal',
'ocnanalprep', 'ocnanalbmat', 'ocnanalrun', 'ocnanalchkpt', 'ocnanalpost',
'ocnanalprep', 'ocnanalbmat', 'ocnanalrun', 'ocnanalchkpt', 'ocnanalpost', 'ocnanalvrfy',
'earc', 'ecen', 'echgres', 'ediag', 'efcs',
'eobs', 'eomg', 'epos', 'esfc', 'eupd',
'atmensanlinit', 'atmensanlrun', 'atmensanlfinal',
Expand Down Expand Up @@ -632,6 +632,22 @@ def ocnanalpost(self):

return task

def ocnanalvrfy(self):

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

resources = self.get_resource('ocnanalvrfy')
task = create_wf_task('ocnanalvrfy',
resources,
cdump=self.cdump,
envar=self.envars,
dependency=dependencies)

return task

def gldas(self):

deps = []
Expand Down