Merge branch 'main' into ejh_100824_4

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
 

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}

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}

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

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

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

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

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
 #
 #-----------------------------------------------------------------------
 #

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
 #
 #-----------------------------------------------------------------------
 #

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

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