From 77732327c6d10dd019204bfc82af0f54b3b863de Mon Sep 17 00:00:00 2001 From: benjamin blake Date: Tue, 17 Dec 2024 13:16:54 +0000 Subject: [PATCH] Change r_path to runcyc_path in ex-scripts --- scripts/exrrfs_forecast.sh | 8 ++++---- scripts/exrrfs_prep_cyc.sh | 14 +++++++------- scripts/exrrfs_save_restart.sh | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/exrrfs_forecast.sh b/scripts/exrrfs_forecast.sh index 79653d64c..7f8475f12 100755 --- a/scripts/exrrfs_forecast.sh +++ b/scripts/exrrfs_forecast.sh @@ -53,13 +53,13 @@ specified cycle. #----------------------------------------------------------------------- # if [ "${DO_ENSEMBLE}" = "TRUE" ]; then - r_path=${RUN}.${PDY}/${cyc}/${mem_num} + runcyc_path=${RUN}.${PDY}/${cyc}/${mem_num} else - r_path=${RUN}.${PDY}/${cyc} + runcyc_path=${RUN}.${PDY}/${cyc} fi -run_blending=${GESROOT}/${r_path}/run_blending -run_ensinit=${GESROOT}/${r_path}/run_ensinit +run_blending=${GESROOT}/${runcyc_path}/run_blending +run_ensinit=${GESROOT}/${runcyc_path}/run_ensinit if [[ ${CYCLE_SUBTYPE} == "ensinit" && -e $run_blending && ! -e $run_ensinit ]]; then echo "clean exit ensinit, blending used instead of ensinit." exit 0 diff --git a/scripts/exrrfs_prep_cyc.sh b/scripts/exrrfs_prep_cyc.sh index c8e2d24a9..d30aba23d 100755 --- a/scripts/exrrfs_prep_cyc.sh +++ b/scripts/exrrfs_prep_cyc.sh @@ -125,9 +125,9 @@ YYJJJ2200000000=`date +"%y%j2200000000" -d "${START_DATE} 1 day ago"` # if [ "${DO_ENSEMBLE}" = "TRUE" ]; then - r_path=${RUN}.${PDY}/${cyc}/${mem_num} + runcyc_path=${RUN}.${PDY}/${cyc}/${mem_num} else - r_path=${RUN}.${PDY}/${cyc} + runcyc_path=${RUN}.${PDY}/${cyc} fi #----------------------------------------------------------------------- @@ -136,8 +136,8 @@ fi # #----------------------------------------------------------------------- # -run_blending=${GESROOT}/${r_path}/run_blending -run_ensinit=${GESROOT}/${r_path}/run_ensinit +run_blending=${GESROOT}/${runcyc_path}/run_blending +run_ensinit=${GESROOT}/${runcyc_path}/run_ensinit if [[ $CYCLE_SUBTYPE == "ensinit" && -e $run_blending && ! -e $run_ensinit ]]; then echo "clean exit ensinit, blending used instead of ensinit." exit 0 @@ -350,8 +350,8 @@ else if [ "${CYCLE_SUBTYPE}" = "spinup" ] ; then # point to the 0-h cycle for the warm start from the 1 timestep restart files fg_restart_dirname=forecast_ensinit - bkpath=${FG_ROOT}/${r_path}/${fg_restart_dirname}/RESTART # cycling, use background from RESTART - ctrl_bkpath=${FG_ROOT}/${r_path}/forecast_spinup/INPUT + bkpath=${FG_ROOT}/${runcyc_path}/${fg_restart_dirname}/RESTART # cycling, use background from RESTART + ctrl_bkpath=${FG_ROOT}/${runcyc_path}/forecast_spinup/INPUT else YYYYMMDDHHmInterv=$( date +%Y%m%d%H -d "${START_DATE} ${DA_CYCLE_INTERV} hours ago" ) YYYYMMDDInterv=`echo ${YYYYMMDDHHmInterv} | cut -c1-8` @@ -452,7 +452,7 @@ else done fi if [ "${CYCLE_SUBTYPE}" = "spinup" ] ; then - cpreq -p ${FG_ROOT}/${r_path}/${fg_restart_dirname}/INPUT/gfs_ctrl.nc gfs_ctrl.nc + cpreq -p ${FG_ROOT}/${runcyc_path}/${fg_restart_dirname}/INPUT/gfs_ctrl.nc gfs_ctrl.nc else if [ "${DO_ENSEMBLE}" = "TRUE" ]; then cpreq -p ${FG_ROOT}/${RUN}.${YYYYMMDDInterv}/${HHInterv}/${mem_num}/${fg_restart_dirname}/INPUT/gfs_ctrl.nc gfs_ctrl.nc diff --git a/scripts/exrrfs_save_restart.sh b/scripts/exrrfs_save_restart.sh index 4bd25fbaf..6ff987269 100755 --- a/scripts/exrrfs_save_restart.sh +++ b/scripts/exrrfs_save_restart.sh @@ -71,13 +71,13 @@ save_hh=${save_time:8:2} # if [ "${DO_ENSEMBLE}" = "TRUE" ]; then - r_path=${RUN}.${PDY}/${cyc}/${mem_num} + runcyc_path=${RUN}.${PDY}/${cyc}/${mem_num} else - r_path=${RUN}.${PDY}/${cyc} + runcyc_path=${RUN}.${PDY}/${cyc} fi -run_blending=${GESROOT}/${r_path}/run_blending -run_ensinit=${GESROOT}/${r_path}/run_ensinit +run_blending=${GESROOT}/${runcyc_path}/run_blending +run_ensinit=${GESROOT}/${runcyc_path}/run_ensinit if [[ ${CYCLE_SUBTYPE} == "ensinit" && -e $run_blending ]]; then echo "clean exit ensinit, blending used instead of ensinit." exit 0