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.

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

Fix several run directory name mismatch. #537

Merged
merged 1 commit into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions parm/FV3LAM_wflow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,7 @@ MODULES_RUN_TASK_FP script.
<and>
<timedep><cyclestr offset="&START_TIME_CONVENTIONAL;">@Y@m@d@H@M00</cyclestr></timedep>
<or>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_ensinit_&envir;_m#mem#_@H/RESTART/</cyclestr><cyclestr offset="{{ dt_atmos }}">@Y@m@d.@H@[email protected]</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_ensinit_m#mem#_&envir;_@H/RESTART/</cyclestr><cyclestr offset="{{ dt_atmos }}">@Y@m@d.@H@[email protected]</cyclestr></datadep>
<datadep age="00:00:00:05"><cyclestr>&FG_ROOT;/&RUN;.@Y@m@d/@H/m#mem#/run_blending</cyclestr> </datadep>
</or>
</and>
Expand Down Expand Up @@ -2041,8 +2041,8 @@ MODULES_RUN_TASK_FP script.
<timedep><cyclestr offset="&START_TIME_CONVENTIONAL;">@Y@m@d@H@M00</cyclestr></timedep>
<or>
{%- if do_ensemble %}
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_&envir;_m#mem#_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_&envir;_m#mem#_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_m#mem#_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_m#mem#_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
{%- else %}
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_spinup_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
Expand Down Expand Up @@ -3200,11 +3200,11 @@ MODULES_RUN_TASK_FP script.
<timedep><cyclestr offset="&START_TIME_CONVENTIONAL;">@Y@m@d@H@M00</cyclestr></timedep>
<or>
{%- if do_ensemble %}
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_&envir;_m#mem#_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_&envir;_m#mem#_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
{%- else %}
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
{%- endif %}
</or>
</and>
Expand Down Expand Up @@ -3249,11 +3249,11 @@ MODULES_RUN_TASK_FP script.
<timedep><cyclestr offset="&START_TIME_CONVENTIONAL;">@Y@m@d@H@M00</cyclestr></timedep>
<or>
{%- if do_ensemble %}
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_long_&envir;_m#mem#_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_long_&envir;_m#mem#_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
{%- else %}
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_long_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_prod_long_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/coupler.res</cyclestr></datadep>
<datadep age="00:30"><cyclestr>&DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/</cyclestr><cyclestr offset="#fhr#:00:00">@Y@m@[email protected]</cyclestr></datadep>
{%- endif %}
</or>
</and>
Expand Down
4 changes: 2 additions & 2 deletions scripts/exrrfs_analysis_enkf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ for imem in $(seq 1 $nens) ensmean; do
memcharv0="mem"$( printf "%03d" $imem )
fi
if [ "${CYCLE_TYPE}" = "spinup" ]; then
bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${memchar}_${cyc}/INPUT
bkpath=${DATAROOT}/${RUN}_forecast_spinup_${memchar}_${envir}_${cyc}/INPUT
observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}_spinup/${memchar}/observer_gsi_spinup"
else
bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_${memchar}_${cyc}/INPUT
bkpath=${DATAROOT}/${RUN}_forecast_${memchar}_${envir}_${cyc}/INPUT
observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/${memchar}/observer_gsi"
fi
if [ "${imem}" = "ensmean" ]; then
Expand Down
6 changes: 3 additions & 3 deletions scripts/exrrfs_analysis_gsi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ if [ "${CYCLE_TYPE}" = "spinup" ]; then
bkpath=${DATAROOT}/${RUN}_calc_ensmean_spinup_${envir}_${cyc}
else
if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${mem_num}_${cyc}/INPUT
bkpath=${DATAROOT}/${RUN}_forecast_spinup_${mem_num}_${envir}_${cyc}/INPUT
else
bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${cyc}/INPUT
fi
Expand All @@ -138,9 +138,9 @@ else
bkpath=${DATAROOT}/${RUN}_calc_ensmean_${envir}_${cyc}
else
if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_${mem_num}_${cyc}/INPUT
bkpath=${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}/INPUT
else
bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_${cyc}/INPUT
bkpath=${DATAROOT}/${RUN}_forecast_${envir}_${cyc}/INPUT
fi
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions scripts/exrrfs_calc_ensmean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ for imem in $(seq 1 $nens)
memberstring=$( printf "%03d" $imem )

if [ "${CYCLE_TYPE}" = "spinup" ]; then
bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_m${ensmem}_${cyc}/INPUT # cycling, use background from RESTART
bkpath=${DATAROOT}/${RUN}_forecast_spinup_m${ensmem}_${envir}_${cyc}/INPUT # cycling, use background from RESTART
else
bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_m${ensmem}_${cyc}/INPUT # cycling, use background from RESTART
bkpath=${DATAROOT}/${RUN}_forecast_m${ensmem}_${envir}_${cyc}/INPUT # cycling, use background from RESTART
fi

dynvarfile=${bkpath}/fv_core.res.tile1.nc
Expand Down
4 changes: 2 additions & 2 deletions scripts/exrrfs_recenter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ for imem in $(seq 1 $nens)
memberstring=$( printf "%03d" $imem )

if [ "${CYCLE_TYPE}" = "spinup" ]; then
bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_m${ensmem}_${cyc}/INPUT # cycling, use background from RESTART
bkpath=${DATAROOT}/${RUN}_forecast_spinup_m${ensmem}_${envir}_${cyc}/INPUT # cycling, use background from RESTART
else
bkpath=${DATAROOT}/${RUN}_forecast_${envir}_m${ensmem}_${cyc}/INPUT # cycling, use background from RESTART
bkpath=${DATAROOT}/${RUN}_forecast_m${ensmem}_${envir}_${cyc}/INPUT # cycling, use background from RESTART
fi

dynvarfile=${bkpath}/fv_core.res.tile1.nc
Expand Down
2 changes: 1 addition & 1 deletion scripts/exrrfs_update_lbc_soil.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ if [ "${MEM_TYPE}" = "MEAN" ]; then
bkpath=${DATAROOT}/${RUN}_calc_ensmean${cycle_tag}_${envir}_${cyc}/INPUT
else
if [ ${DO_ENSEMBLE} = "TRUE" ]; then
bkpath=${DATAROOT}/${RUN}_forecast${cycle_tag}_${envir}_${mem_num}_${cyc}/INPUT
bkpath=${DATAROOT}/${RUN}_forecast${cycle_tag}_${mem_num}_${envir}_${cyc}/INPUT
else
bkpath=${DATAROOT}/${RUN}_forecast${cycle_tag}_${envir}_${cyc}/INPUT
fi
Expand Down
4 changes: 2 additions & 2 deletions ush/set_rrfs_config_general.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ elif [[ $MACHINE == "wcoss2" ]] ; then
fi
if [[ $MACHINETYPE == "backup" ]] ; then
QUEUE_DEFAULT="devhigh"
QUEUE_FORECAST="devmax"
QUEUE_ANALYSIS="devmax"
QUEUE_FORECAST="devhigh"
QUEUE_ANALYSIS="devhigh"
QUEUE_POST="devhigh"
QUEUE_PRDGEN="devhigh"
elif [[ $MACHINETYPE == "person" ]] ; then
Expand Down
Loading