Skip to content

Cherry-picking #343 to fix cheyenne workflow #378

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
mkavulich merged 1 commit into from
Dec 11, 2020
Merged

Cherry-picking #343 to fix cheyenne workflow #378

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
2 changes: 1 addition & 1 deletion ush/fill_jinja_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ def main(cla):
tvars = {}
for var in template_vars:

if cfg.get(var) is None:
if cfg.get(var, "NULL") == "NULL":
raise KeyError(f'{var} does not exist in user-supplied settings!')

if not cla.quiet:
Expand Down
15 changes: 8 additions & 7 deletions ush/launch_FV3LAM_wflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,14 @@ expt_name="${EXPT_SUBDIR}"
#
#-----------------------------------------------------------------------
#
if [ "$MACHINE" != "CHEYENNE" ]; then
if [ "$MACHINE" = "ORION" ]; then
module load contrib rocoto
else
module purge
module load rocoto
fi
if [ "$MACHINE" = "CHEYENNE" ]; then
module use -a /glade/p/ral/jntp/UFS_SRW_app/modules/
module load rocoto
elif [ "$MACHINE" = "ORION" ]; then
module load contrib rocoto
else
module purge
module load rocoto
fi
#
#-----------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions ush/templates/FV3LAM_wflow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ the "HPSS" type is used for the GET_EXTRN_ICS_TN and GET_EXTRN_LBCS_TN
tasks; and the "FCST" type is used for the RUN_FCST_TN task.
-->

{%- if (partition_default != "") %}
{%- if partition_default is not none %}
<!ENTITY RSRV_DEFAULT "<account>&ACCOUNT;</account><queue>&QUEUE_DEFAULT;</queue><partition>{{ partition_default }}</partition>">
{%- else %}
<!ENTITY RSRV_DEFAULT "<account>&ACCOUNT;</account><queue>&QUEUE_DEFAULT;</queue>">
{%- endif %}
{%- if (partition_hpss != "") %}
{%- if partition_hpss is not none %}
<!ENTITY RSRV_HPSS "<account>&ACCOUNT;</account><queue>&QUEUE_HPSS;</queue><partition>{{ partition_hpss }}</partition>">
{%- else %}
<!ENTITY RSRV_HPSS "<account>&ACCOUNT;</account><queue>&QUEUE_HPSS;</queue>">
{%- endif %}
{%- if (partition_fcst != "") %}
{%- if partition_fcst is not none %}
<!ENTITY RSRV_FCST "<account>&ACCOUNT;</account><queue>&QUEUE_FCST;</queue><partition>{{ partition_fcst }}</partition>">
{%- else %}
<!ENTITY RSRV_FCST "<account>&ACCOUNT;</account><queue>&QUEUE_FCST;</queue>">
Expand Down