From c7884af2018f4b8b77f2c2c3271e60b1a75f4428 Mon Sep 17 00:00:00 2001 From: MatthewPyle-NOAA <48285220+MatthewPyle-NOAA@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:40:45 -0400 Subject: [PATCH 1/2] Update README.md (#522) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fec11d9ae..92fb185b8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Forecast System (RRFS)](https://gsl.noaa.gov/focus-areas/unified_forecast_system/rrfs). For more information see the [RRFS-Workflow User's -guide](https://chanhoo-rrfs-workflow.readthedocs.io/en/latest/index.html). +guide](https://rrfs-workflow.readthedocs.io/en/latest/index.html). ## Team From f9c273b9060406eb6b85b117a4e1a420685d52eb Mon Sep 17 00:00:00 2001 From: Ming Hu Date: Fri, 11 Oct 2024 11:24:20 -0600 Subject: [PATCH 2/2] Add taskid/jobid for various DA jobs. (#524) --- jobs/JRRFS_BLEND_ICS | 2 +- jobs/JRRFS_PREP_CYC | 23 ++-------------- jobs/JRRFS_SAVE_RESTART | 11 ++++---- parm/FV3LAM_wflow.xml | 45 +++++++++++++++++++++++-------- scripts/exrrfs_analysis_enkf.sh | 4 +-- scripts/exrrfs_analysis_gsi.sh | 6 ++--- scripts/exrrfs_calc_ensmean.sh | 4 +-- scripts/exrrfs_make_ics.sh | 3 +++ scripts/exrrfs_make_lbcs.sh | 3 +++ scripts/exrrfs_recenter.sh | 4 +-- scripts/exrrfs_update_lbc_soil.sh | 2 +- 11 files changed, 59 insertions(+), 48 deletions(-) diff --git a/jobs/JRRFS_BLEND_ICS b/jobs/JRRFS_BLEND_ICS index 961d684e1..dc883df78 100755 --- a/jobs/JRRFS_BLEND_ICS +++ b/jobs/JRRFS_BLEND_ICS @@ -59,9 +59,9 @@ on the RRFS initial conditions. export pid=${pid:-$$} export RUN=${RUN:-rrfs} +export jobid=${taskid} export mem_num=m$(echo "${ENSMEM_INDX}") -export jobid=${RUN}_make_ics_${mem_num}_${envir}_${cyc} export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/ics" export DATA=${DATAROOT}/${jobid} diff --git a/jobs/JRRFS_PREP_CYC b/jobs/JRRFS_PREP_CYC index 5bad60a69..bed10d9d3 100755 --- a/jobs/JRRFS_PREP_CYC +++ b/jobs/JRRFS_PREP_CYC @@ -62,32 +62,13 @@ This is the J-job script for the prep_cyc tasks for the specified cycle. export pid=${pid:-$$} export RUN=${RUN:-rrfs} +export jobid=${taskid} export mem_num=m$(echo "${ENSMEM_INDX}") export CYCLE_TYPE=${CYCLE_TYPE:-prod} export CYCLE_SUBTYPE=${CYCLE_SUBTYPE:-empty} -#export ctrlpath="" -if [ "${CYCLE_TYPE}" = "spinup" ]; then - if [ "${DO_ENSEMBLE}" = "TRUE" ]; then # EnKF has spinup forecasts - export INPUT_DATA=${DATAROOT}/${RUN}_forecast_spinup_${mem_num}_${envir}_${cyc}/INPUT - if [ "${DO_ENSINIT}" = "TRUE" ] && [ "${CYCLE_SUBTYPE}" = "ensinit" ]; then - export INPUT_DATA=${DATAROOT}/${RUN}_forecast_ensinit_${mem_num}_${envir}_${cyc}/INPUT - fi -# if [ "${DO_ENSINIT}" = "TRUE" ] && [ "${CYCLE_SUBTYPE}" = "spinup" ]; then -# ctrlpath=${ENSCTRL_DATAROOT} -# fi - else - export INPUT_DATA=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${cyc}/INPUT -# ctrlpath=${ENSCTRL_DATAROOT} - fi -else - if [ "${DO_ENSEMBLE}" = "TRUE" ]; then - export INPUT_DATA=${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}/INPUT - else - export INPUT_DATA=${DATAROOT}/${RUN}_forecast_${envir}_${cyc}/INPUT - fi -fi +export INPUT_DATA=${DATAROOT}/${taskid}/INPUT mkdir -p ${INPUT_DATA} cd ${INPUT_DATA} diff --git a/jobs/JRRFS_SAVE_RESTART b/jobs/JRRFS_SAVE_RESTART index c6f1cef5a..a92aa7954 100755 --- a/jobs/JRRFS_SAVE_RESTART +++ b/jobs/JRRFS_SAVE_RESTART @@ -58,6 +58,7 @@ This is the J-job script for the task that saves restart files to nwges. export pid=${pid:-$$} export RUN=${RUN:-rrfs} +export jobid=${taskid} export mem_num=m$(echo "${ENSMEM_INDX}") @@ -66,22 +67,22 @@ export CYCLE_SUBTYPE=${CYCLE_SUBTYPE:-empty} export SURFACE_DIR=${SURFACE_DIR:-empty} if [ "${CYCLE_TYPE}" = "spinup" ]; then if [ "${DO_ENSEMBLE}" = "TRUE" ]; then # EnKF has spinup forecasts - export DATA="${DATAROOT}/${RUN}_forecast_spinup_${mem_num}_${envir}_${cyc}" + export DATA="${DATAROOT}/${jobid}" export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast_spinup" if [ "${CYCLE_SUBTYPE}" = "ensinit" ]; then - export DATA="${DATAROOT}/${RUN}_forecast_ensinit_${mem_num}_${envir}_${cyc}" + export DATA="${DATAROOT}/${jobid}" export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast_ensinit" fi else - export DATA="${DATAROOT}/${RUN}_forecast_spinup_${envir}_${cyc}" + export DATA="${DATAROOT}/${jobid}" export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/forecast_spinup" fi else if [ "${DO_ENSEMBLE}" = "TRUE" ]; then - export DATA="${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}" + export DATA="${DATAROOT}/${jobid}" export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast" else - export DATA="${DATAROOT}/${RUN}_forecast_${envir}_${cyc}" + export DATA="${DATAROOT}/${jobid}" export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/forecast" fi fi diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml index b465a473b..773292300 100644 --- a/parm/FV3LAM_wflow.xml +++ b/parm/FV3LAM_wflow.xml @@ -659,6 +659,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&MAKE_ICS_TN;_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&MAKE_ICS_TN;_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H cyc@H @@ -762,6 +763,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&BLEND_ICS_TN;_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&MAKE_ICS_TN;_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H cyc@H @@ -840,6 +842,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&MAKE_LBCS_TN;_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H_#bcgrp#.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&MAKE_LBCS_TN;_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H cyc@H @@ -972,6 +975,11 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&PREP_CYC_SPINUP_TN;_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + {%- if do_ensinit %} + taskid&RUN;_&FORECAST_TN;_ensinit_&envir;{{ uscore_ensmem_name }}_@H + {%- else %} + taskid&RUN;_&FORECAST_TN;_spinup_&envir;{{ uscore_ensmem_name }}_@H + {%- endif %} PDY@Y@m@d HH@H cyc@H @@ -1064,6 +1072,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&PREP_CYC_SPINUP_TN;_ensinit_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_ensinit_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d HH@H cyc@H @@ -1153,6 +1162,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&FORECAST_TN;_ensinit_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_ensinit_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H cyc@H @@ -1197,6 +1207,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&SAVE_RESTART_TN;_ensinit_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_ensinit_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H HOMErrfs&HOMErrfs; @@ -1214,7 +1225,7 @@ MODULES_RUN_TASK_FP script. @Y@m@d@H@M00 - &DATAROOT;/&RUN;_forecast_ensinit_m#mem#_&envir;_@H/RESTART/@Y@m@d.@H@M@S.coupler.res + &DATAROOT;/&RUN;_forecast_ensinit_&envir;_m#mem#_@H/RESTART/@Y@m@d.@H@M@S.coupler.res &FG_ROOT;/&RUN;.@Y@m@d/@H/m#mem#/run_blending @@ -1240,6 +1251,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&PREP_CYC_SPINUP_TN;_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_spinup_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H HH@H @@ -1919,6 +1931,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&FORECAST_TN;_spinup_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_spinup_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H HH@H @@ -1991,6 +2004,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&SAVE_RESTART_TN;_spinup_&TAG;{{ uscore_ensmem_name }}_f#fhr#_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_spinup_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H HOMErrfs&HOMErrfs; @@ -2008,8 +2022,8 @@ MODULES_RUN_TASK_FP script. @Y@m@d@H@M00 {%- if do_ensemble %} - &DATAROOT;/&RUN;_forecast_spinup_m#mem#_&envir;_@H/RESTART/coupler.res - &DATAROOT;/&RUN;_forecast_spinup_m#mem#_&envir;_@H/RESTART/@Y@m@d.@H0000.coupler.res + &DATAROOT;/&RUN;_forecast_spinup_&envir;_m#mem#_@H/RESTART/coupler.res + &DATAROOT;/&RUN;_forecast_spinup_&envir;_m#mem#_@H/RESTART/@Y@m@d.@H0000.coupler.res {%- else %} &DATAROOT;/&RUN;_forecast_spinup_&envir;_@H/RESTART/coupler.res &DATAROOT;/&RUN;_forecast_spinup_&envir;_@H/RESTART/@Y@m@d.@H0000.coupler.res @@ -2139,6 +2153,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&PREP_CYC_PROD_TN;_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_prod_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H HH@H @@ -2975,6 +2990,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&FORECAST_TN;_prod_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_prod_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H HH@H @@ -3054,6 +3070,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&FORECAST_TN;_prod_&TAG;{{ uscore_ensmem_name }}_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_prod_long_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H HH@H @@ -3131,6 +3148,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&SAVE_RESTART_TN;_&TAG;{{ uscore_ensmem_name }}_f#fhr#_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_prod_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H HOMErrfs&HOMErrfs; @@ -3149,11 +3167,11 @@ MODULES_RUN_TASK_FP script. @Y@m@d@H@M00 {%- if do_ensemble %} - &DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/coupler.res - &DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/@Y@m@d.@H0000.coupler.res + &DATAROOT;/&RUN;_forecast_prod_&envir;_m#mem#_@H/RESTART/coupler.res + &DATAROOT;/&RUN;_forecast_prod_&envir;_m#mem#_@H/RESTART/@Y@m@d.@H0000.coupler.res {%- else %} - &DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/coupler.res - &DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/@Y@m@d.@H0000.coupler.res + &DATAROOT;/&RUN;_forecast_prod_&envir;_@H/RESTART/coupler.res + &DATAROOT;/&RUN;_forecast_prod_&envir;_@H/RESTART/@Y@m@d.@H0000.coupler.res {%- endif %} @@ -3179,6 +3197,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&SAVE_RESTART_TN;_&TAG;{{ uscore_ensmem_name }}_f#fhr#_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&FORECAST_TN;_prod_long_&envir;{{ uscore_ensmem_name }}_@H PDY@Y@m@d CDATE@Y@m@d@H HOMErrfs&HOMErrfs; @@ -3197,11 +3216,11 @@ MODULES_RUN_TASK_FP script. @Y@m@d@H@M00 {%- if do_ensemble %} - &DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/coupler.res - &DATAROOT;/&RUN;_forecast_m#mem#_&envir;_@H/RESTART/@Y@m@d.@H0000.coupler.res + &DATAROOT;/&RUN;_forecast_prod_long_&envir;_m#mem#_@H/RESTART/coupler.res + &DATAROOT;/&RUN;_forecast_prod_long_&envir;_m#mem#_@H/RESTART/@Y@m@d.@H0000.coupler.res {%- else %} - &DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/coupler.res - &DATAROOT;/&RUN;_forecast_&envir;_@H/RESTART/@Y@m@d.@H0000.coupler.res + &DATAROOT;/&RUN;_forecast_prod_long_&envir;_@H/RESTART/coupler.res + &DATAROOT;/&RUN;_forecast_prod_long_&envir;_@H/RESTART/@Y@m@d.@H0000.coupler.res {%- endif %} @@ -3249,6 +3268,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&POST_TN;_&TAG;{{ uscore_ensmem_name }}_f#fhr#_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&POST_TN;_&envir;_@H_f#fhr# PDY@Y@m@d CDATE@Y@m@d@H HOMErrfs&HOMErrfs; @@ -3303,6 +3323,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&POST_TN;_&TAG;{{ uscore_ensmem_name }}_f#fhr#_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&POST_TN;_&envir;_@H_f#fhr#_long PDY@Y@m@d CDATE@Y@m@d@H HOMErrfs&HOMErrfs; @@ -3357,6 +3378,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&PRDGEN_TN;_&TAG;{{ uscore_ensmem_name }}_f#fhr#_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&POST_TN;_&envir;_@H_f#fhr# PDY@Y@m@d CDATE@Y@m@d@H HOMErrfs&HOMErrfs; @@ -3407,6 +3429,7 @@ MODULES_RUN_TASK_FP script. &LOGDIR;/&PRDGEN_TN;_&TAG;{{ uscore_ensmem_name }}_f#fhr#_@Y@m@d@H.log GLOBAL_VAR_DEFNS_FP&GLOBAL_VAR_DEFNS_FP; + taskid&RUN;_&POST_TN;_&envir;_@H_f#fhr#_long PDY@Y@m@d CDATE@Y@m@d@H HOMErrfs&HOMErrfs; diff --git a/scripts/exrrfs_analysis_enkf.sh b/scripts/exrrfs_analysis_enkf.sh index faa594b69..30865439a 100755 --- a/scripts/exrrfs_analysis_enkf.sh +++ b/scripts/exrrfs_analysis_enkf.sh @@ -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_${memchar}_${envir}_${cyc}/INPUT + bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${memchar}_${cyc}/INPUT observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}_spinup/${memchar}/observer_gsi_spinup" else - bkpath=${DATAROOT}/${RUN}_forecast_${memchar}_${envir}_${cyc}/INPUT + bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_${memchar}_${cyc}/INPUT observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/${memchar}/observer_gsi" fi if [ "${imem}" = "ensmean" ]; then diff --git a/scripts/exrrfs_analysis_gsi.sh b/scripts/exrrfs_analysis_gsi.sh index 09b23fa7a..f845a0fd4 100755 --- a/scripts/exrrfs_analysis_gsi.sh +++ b/scripts/exrrfs_analysis_gsi.sh @@ -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_${mem_num}_${envir}_${cyc}/INPUT + bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${mem_num}_${cyc}/INPUT else bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_${cyc}/INPUT fi @@ -138,9 +138,9 @@ else bkpath=${DATAROOT}/${RUN}_calc_ensmean_${envir}_${cyc} else if [ "${DO_ENSEMBLE}" = "TRUE" ]; then - bkpath=${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}/INPUT + bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_${mem_num}_${cyc}/INPUT else - bkpath=${DATAROOT}/${RUN}_forecast_${envir}_${cyc}/INPUT + bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_${cyc}/INPUT fi fi fi diff --git a/scripts/exrrfs_calc_ensmean.sh b/scripts/exrrfs_calc_ensmean.sh index 6c924872c..ac07e9ace 100755 --- a/scripts/exrrfs_calc_ensmean.sh +++ b/scripts/exrrfs_calc_ensmean.sh @@ -121,9 +121,9 @@ for imem in $(seq 1 $nens) memberstring=$( printf "%03d" $imem ) if [ "${CYCLE_TYPE}" = "spinup" ]; then - bkpath=${DATAROOT}/${RUN}_forecast_spinup_m${ensmem}_${envir}_${cyc}/INPUT # cycling, use background from RESTART + bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_m${ensmem}_${cyc}/INPUT # cycling, use background from RESTART else - bkpath=${DATAROOT}/${RUN}_forecast_m${ensmem}_${envir}_${cyc}/INPUT # cycling, use background from RESTART + bkpath=${DATAROOT}/${RUN}_forecast_prod_${envir}_m${ensmem}_${cyc}/INPUT # cycling, use background from RESTART fi dynvarfile=${bkpath}/fv_core.res.tile1.nc diff --git a/scripts/exrrfs_make_ics.sh b/scripts/exrrfs_make_ics.sh index 01d4eba0b..9c63a0f16 100755 --- a/scripts/exrrfs_make_ics.sh +++ b/scripts/exrrfs_make_ics.sh @@ -412,6 +412,9 @@ fi #----------------------------------------------------------------------- # thomp_mp_climo_file="" +if [ "${SDF_USES_THOMPSON_MP}" = "TRUE" ]; then + thomp_mp_climo_file="${THOMPSON_MP_CLIMO_FP}" +fi # #----------------------------------------------------------------------- # diff --git a/scripts/exrrfs_make_lbcs.sh b/scripts/exrrfs_make_lbcs.sh index 17c191d5f..da532623f 100755 --- a/scripts/exrrfs_make_lbcs.sh +++ b/scripts/exrrfs_make_lbcs.sh @@ -436,6 +436,9 @@ tracers="\"\"" #----------------------------------------------------------------------- # thomp_mp_climo_file="" +if [ "${SDF_USES_THOMPSON_MP}" = "TRUE" ]; then + thomp_mp_climo_file="${THOMPSON_MP_CLIMO_FP}" +fi # #----------------------------------------------------------------------- # diff --git a/scripts/exrrfs_recenter.sh b/scripts/exrrfs_recenter.sh index 6f328da16..36d75eaad 100755 --- a/scripts/exrrfs_recenter.sh +++ b/scripts/exrrfs_recenter.sh @@ -117,9 +117,9 @@ for imem in $(seq 1 $nens) memberstring=$( printf "%03d" $imem ) if [ "${CYCLE_TYPE}" = "spinup" ]; then - bkpath=${DATAROOT}/${RUN}_forecast_spinup_m${ensmem}_${envir}_${cyc}/INPUT # cycling, use background from RESTART + bkpath=${DATAROOT}/${RUN}_forecast_spinup_${envir}_m${ensmem}_${cyc}/INPUT # cycling, use background from RESTART else - bkpath=${DATAROOT}/${RUN}_forecast_m${ensmem}_${envir}_${cyc}/INPUT # cycling, use background from RESTART + bkpath=${DATAROOT}/${RUN}_forecast_${envir}_m${ensmem}_${cyc}/INPUT # cycling, use background from RESTART fi dynvarfile=${bkpath}/fv_core.res.tile1.nc diff --git a/scripts/exrrfs_update_lbc_soil.sh b/scripts/exrrfs_update_lbc_soil.sh index 8bc3ba39b..5b0cb55ce 100755 --- a/scripts/exrrfs_update_lbc_soil.sh +++ b/scripts/exrrfs_update_lbc_soil.sh @@ -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}_${mem_num}_${envir}_${cyc}/INPUT + bkpath=${DATAROOT}/${RUN}_forecast${cycle_tag}_${envir}_${mem_num}_${cyc}/INPUT else bkpath=${DATAROOT}/${RUN}_forecast${cycle_tag}_${envir}_${cyc}/INPUT fi