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

Allow increments to be added for ocean and ice cycling. #1308

Merged
merged 10 commits into from
Feb 15, 2023
Merged

Allow increments to be added for ocean and ice cycling. #1308

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
311657d
cyc with ocn-ice
guillaumevernieres Feb 11, 2023
364df4e
Update ush/forecast_postdet.sh
guillaumevernieres Feb 13, 2023
015e0bd
Update parm/config/config.base.emc.dyn
guillaumevernieres Feb 13, 2023
19c4748
addressed review comments
guillaumevernieres Feb 14, 2023
46b1e7e
Update parm/mom6/MOM_input_template_025
guillaumevernieres Feb 14, 2023
b04954b
Update parm/mom6/MOM_input_template_050
guillaumevernieres Feb 14, 2023
55df592
Update parm/mom6/MOM_input_template_100
guillaumevernieres Feb 14, 2023
acbeb76
Update parm/mom6/MOM_input_template_500
guillaumevernieres Feb 14, 2023
6be7442
Update ush/forecast_postdet.sh
guillaumevernieres Feb 14, 2023
b8963ee
typos + remove export
guillaumevernieres Feb 14, 2023
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
2 changes: 1 addition & 1 deletion jobs/rocoto/ocnanalbmat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export jobid="${job}.$$"

###############################################################
# Execute the JJOB
#"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT
"${HOMEgfs}"/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT
echo "BMAT gets run here"
status=$?
exit "${status}"
3 changes: 3 additions & 0 deletions parm/config/config.base.emc.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,9 @@ export imp_physics=@IMP_PHYSICS@
export DO_JEDIVAR="NO"
export DO_JEDIENS="NO"
export DO_JEDIOCNVAR="NO"
if [[ ${DO_JEDIOCNVAR} = "YES" ]]; then
export MOM_IAU=true
fi
guillaumevernieres marked this conversation as resolved.
Show resolved Hide resolved

# Hybrid related
export DOHYBVAR="@DOHYBVAR@"
Expand Down
5 changes: 5 additions & 0 deletions ush/forecast_postdet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,11 @@ MOM6_postdet() {
;;
esac

# Link increment
if [[ "${MOM_IAU}" = "true" ]]; then
$NLN "${ROTDIR}/${CDUMP}.${PDY}/${cyc}/ocean/${CDUMP}.t${cyc}z.ocninc.nc" "${DATA}/INPUT/inc.nc"
guillaumevernieres marked this conversation as resolved.
Show resolved Hide resolved
fi
guillaumevernieres marked this conversation as resolved.
Show resolved Hide resolved

# Copy MOM6 fixed files
$NCP -pf $FIXmom/$OCNRES/* $DATA/INPUT/

Expand Down
3 changes: 2 additions & 1 deletion ush/load_ufsda_modules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#! /usr/bin/env bash

###############################################################
if [[ "${DEBUG_WORKFLOW:-NO}" == "NO" ]]; then
export DEBUG_WORKFLOW="${DEBUG_WORKFLOW:-NO}"
Copy link
Contributor

Choose a reason for hiding this comment

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

is this a lint thing?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@CoryMartin-NOAA , nope, that was an issue before you added a default to the other places where DEBUG_WORKFLOW is used. I'll remove that line.

if [[ "${DEBUG_WORKFLOW}" == "NO" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this was a mistake to merge this change in... did anyone test? @jiaruidong2017 seems to be having an issue here

echo "Loading modules quietly..."
set +x
fi
Expand Down
5 changes: 2 additions & 3 deletions workflow/rocoto/workflow_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,9 +649,8 @@ def _fcst_cycled(self):
dependencies = rocoto.create_dependency(dep=dep)

if self.app_config.do_jediocnvar:
dep_dict = {'type': 'task', 'name': f'{self.cdump}ocnanalrun'}
dep = rocoto.add_dependency(dep_dict)
dependencies = rocoto.create_dependency(dep=dep)
dep_dict = {'type': 'task', 'name': f'{self.cdump}ocnanalpost'}
dependencies.append(rocoto.add_dependency(dep_dict))

if self.app_config.do_gldas and self.cdump in ['gdas']:
dep_dict = {'type': 'task', 'name': f'{self.cdump}gldas'}
Expand Down
8 changes: 8 additions & 0 deletions workflow/setup_expt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ def link_files_from_src_to_dst(src_dir, dst_dir):
makedirs_if_missing(dst_dir)
link_files_from_src_to_dst(src_dir, dst_dir)

# First 1/2 cycle needs a MOM6 increment
Copy link
Contributor

Choose a reason for hiding this comment

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

why? is it not a cold start?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, it's a warm start.

incdir = f'{inputs.cdump}.{idatestr[:8]}/{idatestr[8:]}'
incfile = f'{inputs.cdump}.t{idatestr[8:]}z.ocninc.nc'
src_file = os.path.join(inputs.icsdir, incdir, 'ocean', incfile)
dst_file = os.path.join(comrot, incdir, 'ocean', incfile)
makedirs_if_missing(os.path.join(comrot, incdir, 'ocean'))
os.symlink(src_file, dst_file)

# Link ice files
if do_ice:
detdir = f'{inputs.cdump}.{rdatestr[:8]}/{rdatestr[8:]}'
Expand Down