Update jobid definition for all J-jobs (#535)

NOAA-EMC · Oct 21, 2024 · acea734 · acea734
1 parent b1d8db6
commit acea734
Show file tree

Hide file tree

Showing 25 changed files with 107 additions and 140 deletions.
diff --git a/jobs/JRRFS_ANALYSIS_ENKF b/jobs/JRRFS_ANALYSIS_ENKF
@@ -61,13 +61,13 @@ specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  export jobid=${RUN}_enkfupdt_${OB_TYPE}_spinup_${envir}_${cyc}
   export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc}_spinup)}
 else
-  export jobid=${RUN}_enkfupdt_${OB_TYPE}_${envir}_${cyc}
   export COMOUT=${COMOUT:-$(compath.py -o ${NET}/${rrfs_ver}/${RUN}.${PDY}/${cyc})}
 fi
 

diff --git a/jobs/JRRFS_ANALYSIS_GSI b/jobs/JRRFS_ANALYSIS_GSI
@@ -62,6 +62,8 @@ for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
@@ -77,19 +79,14 @@ fi
 if [[ ! -v OB_TYPE ]]; then
   OB_TYPE="conv"
 fi
-if [ "${GSI_TYPE}" = "OBSERVER" ]; then
-  if [ "${MEM_TYPE}" = "MEAN" ]; then
-    export jobid=${RUN}_observer_${workname}_ensmean_${envir}_${cyc}
-    observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/ensmean/observer_${workname}"
-  else
+
+if [ "${MEM_TYPE}" = "MEAN" ]; then
+  observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/ensmean/observer_${workname}"
+else
 # GSI_TYPE = OBSERVER is only for EnKF (ensemble forecasts do not have ANALYSIS tasks)
-    export jobid=${RUN}_observer_${workname}_${mem_num}_${envir}_${cyc}
-    observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/observer_${workname}"
-  fi
-  mkdir -p ${observer_nwges_dir}
-else	# For control member, GSI_TYPE is always ANALYSIS
-  export jobid=${RUN}_analysis_${OB_TYPE}_${workname}_${envir}_${cyc}
+  observer_nwges_dir="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/observer_${workname}"
 fi
+mkdir -p ${observer_nwges_dir}
 
 export DATA=${DATAROOT}/${jobid}
 rm -fr ${DATA}

diff --git a/jobs/JRRFS_ANALYSIS_GSIDIAG b/jobs/JRRFS_ANALYSIS_GSIDIAG
@@ -61,16 +61,11 @@ the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 
-if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  workname="gsi_spinup"
-else
-  workname="gsi"
-fi
-
-export jobid=${RUN}_analysis_conv_dbz_${workname}_${envir}_${cyc}
 export DATA="${DATAROOT}/${jobid}"
 if [ ! -d "${DATA}" ]; then
   echo "WARNING: ${DATA} does not exist" 

diff --git a/jobs/JRRFS_ANALYSIS_NONVARCLD b/jobs/JRRFS_ANALYSIS_NONVARCLD
@@ -61,24 +61,11 @@ analysis with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
-if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  export workname="nonvar_cldanl_spinup"
-else
-  export workname="nonvar_cldanl"
-fi
-if [ ${MEM_TYPE} = "MEAN" ]; then
-  export jobid=${RUN}_${workname}_ensmean_${envir}_${cyc}
-else
-  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-    export jobid=${RUN}_${workname}_${mem_num}_${envir}_${cyc}
-  else
-    export jobid=${RUN}_${workname}_${envir}_${cyc}
-  fi
-fi
-
 export DATA=${DATAROOT}/${jobid}
 rm -fr ${DATA}
 mkdir -p ${DATA}

diff --git a/jobs/JRRFS_BLEND_ICS b/jobs/JRRFS_BLEND_ICS
@@ -59,6 +59,7 @@ on the RRFS initial conditions.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")

diff --git a/jobs/JRRFS_BUFRSND b/jobs/JRRFS_BUFRSND
@@ -62,6 +62,8 @@ on the output files corresponding to a specified forecast hour.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export fhr=01
 export tmmark=tm00
@@ -72,11 +74,9 @@ CYCLE_TYPE=${CYCLE_TYPE:-prod}
 if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
   export INPUT_DATA="${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}"
   export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast"
-  export jobid=${RUN}_bufrsnd_${mem_num}_${envir}_${cyc}
 else
   export INPUT_DATA="${DATAROOT}/${RUN}_forecast_${envir}_${cyc}"
   export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/forecast"
-  export jobid=${RUN}_bufrsnd_${envir}_${cyc}
 fi
 
 mkdir -p "${NWGES_DIR}/RESTART"

diff --git a/jobs/JRRFS_CALC_ENSMEAN b/jobs/JRRFS_CALC_ENSMEAN
@@ -59,15 +59,12 @@ RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 #export mem_num=m$(echo "${ENSMEM_INDX}")
 
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
-if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  export jobid=${RUN}_calc_ensmean_spinup_${envir}_${cyc}
-else
-  export jobid=${RUN}_calc_ensmean_${envir}_${cyc}
-fi
 
 export DATA=${DATAROOT}/${jobid}
 rm -fr ${DATA}

diff --git a/jobs/JRRFS_FORECAST b/jobs/JRRFS_FORECAST
@@ -64,6 +64,7 @@ the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")

diff --git a/jobs/JRRFS_MAKE_GRID b/jobs/JRRFS_MAKE_GRID
@@ -61,6 +61,7 @@ This is the J-job script for the task that generates grid files.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export DATA=${DATAROOT}/${jobid}

diff --git a/jobs/JRRFS_MAKE_ICS b/jobs/JRRFS_MAKE_ICS
@@ -134,6 +134,7 @@ extrn_mdl_fns_on_disk_str="( "$( printf "\"%s\" " "${fns_on_disk[@]}" )")"
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")

diff --git a/jobs/JRRFS_MAKE_LBCS b/jobs/JRRFS_MAKE_LBCS
@@ -173,6 +173,7 @@ extrn_mdl_fns_on_disk_str2="( "$( printf "\"%s\" " "${fns_on_disk2[@]}" )")"
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")

diff --git a/jobs/JRRFS_MAKE_OROG b/jobs/JRRFS_MAKE_OROG
@@ -61,6 +61,7 @@ This is the J-job script for the task that generates orography files.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export DATA=${DATAROOT}/${jobid}

diff --git a/jobs/JRRFS_MAKE_SFC_CLIMO b/jobs/JRRFS_MAKE_SFC_CLIMO
@@ -61,6 +61,7 @@ climatology.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export DATA=${DATAROOT}/${jobid}

diff --git a/jobs/JRRFS_POST b/jobs/JRRFS_POST
@@ -62,6 +62,7 @@ on the output files corresponding to a specified forecast hour.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")

diff --git a/jobs/JRRFS_PRDGEN b/jobs/JRRFS_PRDGEN
@@ -62,6 +62,7 @@ files corresponding to a specified forecast hour.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")

diff --git a/jobs/JRRFS_PREP_CYC b/jobs/JRRFS_PREP_CYC
@@ -62,6 +62,7 @@ This is the J-job script for the prep_cyc tasks for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")

diff --git a/jobs/JRRFS_PROCESS_BUFR b/jobs/JRRFS_PROCESS_BUFR
@@ -61,18 +61,8 @@ the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-
-if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  export jobid=${RUN}_process_bufr_spinup_${envir}_${cyc}
-  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-    export jobid=${RUN}_process_bufr_spinup_enkf_${envir}_${cyc}
-  fi
-else
-  export jobid=${RUN}_process_bufr_${envir}_${cyc}
-  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-    export jobid=${RUN}_process_bufr_enkf_${envir}_${cyc}
-  fi
-fi
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export DATA=${DATAROOT}/${jobid}
 mkdir -p ${DATA}

diff --git a/jobs/JRRFS_PROCESS_LIGHTNING b/jobs/JRRFS_PROCESS_LIGHTNING
@@ -58,20 +58,8 @@ preprocess with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-
-if [ ${CYCLE_TYPE} == "spinup" ]; then
-  if [ ${DO_ENSEMBLE} = TRUE ]; then
-    export jobid=${RUN}_process_lightning_enkf_spinup_${envir}_${cyc}
-  else
-    export jobid=${RUN}_process_lightning_spinup_${envir}_${cyc}
-  fi
-else
-  if [ ${DO_ENSEMBLE} = TRUE ]; then
-    export jobid=${RUN}_process_lightning_enkf_${envir}_${cyc}
-  else
-    export jobid=${RUN}_process_lightning_${envir}_${cyc}
-  fi
-fi
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export DATA=${DATAROOT}/${jobid}
 mkdir -p ${DATA}

diff --git a/jobs/JRRFS_PROCESS_RADAR b/jobs/JRRFS_PROCESS_RADAR
@@ -61,18 +61,8 @@ preprocessing with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-
-if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  export jobid=${RUN}_process_radar_spinup_${envir}_${cyc}
-  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-    export jobid=${RUN}_process_radar_spinup_enkf_${envir}_${cyc}
-  fi
-else
-  export jobid=${RUN}_process_radar_${envir}_${cyc}
-  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-    export jobid=${RUN}_process_radar_enkf_${envir}_${cyc}
-  fi
-fi
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export DATA=${DATAROOT}/${jobid}
 mkdir -p ${DATA}

diff --git a/jobs/JRRFS_PROCESS_SMOKE b/jobs/JRRFS_PROCESS_SMOKE
@@ -61,12 +61,8 @@ for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
-
-if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  export jobid=${RUN}_process_smoke_spinup_${envir}_${cyc}
-else
-  export jobid=${RUN}_process_smoke_${envir}_${cyc}
-fi
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export DATA=${DATAROOT}/${jobid}
 mkdir -p ${DATA}

diff --git a/jobs/JRRFS_RECENTER b/jobs/JRRFS_RECENTER
@@ -59,15 +59,11 @@ with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 #export mem_num=m$(echo "${ENSMEM_INDX}")
-
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
-if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  export jobid=${RUN}_recenter_spinup_${envir}_${cyc}
-else
-  export jobid=${RUN}_recenter_${envir}_${cyc}
-fi
 
 export DATA=${DATAROOT}/${jobid}
 rm -fr ${DATA}

diff --git a/jobs/JRRFS_SAVE_DA_OUTPUT b/jobs/JRRFS_SAVE_DA_OUTPUT
@@ -58,6 +58,8 @@ This is the J-job script for the task that saves DA analysis files to nwges.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
 
@@ -66,15 +68,15 @@ export mem_num=m$(echo "${ENSMEM_INDX}")
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 if [ "${CYCLE_TYPE}" = "prod" ]; then
   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
 if [ ${CYCLE_TYPE} == "enfcst" ]; then
-  export DATA="${DATAROOT}/${RUN}_forecast_${mem_num}_${envir}_${cyc}"
+  export DATA="${DATAROOT}/${jobid}"
   export NWGES_DIR="${GESROOT}/${RUN}.${PDY}/${cyc}/${mem_num}/forecast_enfcst"
 fi
 

diff --git 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=${jobid:-${taskid}}
 export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")

diff --git a/jobs/JRRFS_UPDATE_LBC_SOIL b/jobs/JRRFS_UPDATE_LBC_SOIL
@@ -61,29 +61,12 @@ analysis with RRFS for the specified cycle.
 
 export pid=${pid:-$$}
 export RUN=${RUN:-rrfs}
+#export jobid=${jobid:-${taskid}}
+export jobid=${taskid}
 
 export mem_num=m$(echo "${ENSMEM_INDX}")
 export CYCLE_TYPE=${CYCLE_TYPE:-prod}
 
-if [ "${CYCLE_TYPE}" = "spinup" ]; then
-  workname="gsi_spinup"
-else
-  workname="gsi"
-fi
-
-if [[ ! -v OB_TYPE ]]; then
-  OB_TYPE="conv"
-fi
-if [ "${GSI_TYPE}" = "OBSERVER" ]; then
-  if [ "${MEM_TYPE}" = "MEAN" ]; then
-    export jobid=${RUN}_observer_${workname}_ensmean_${envir}_${cyc}
-  else
-    export jobid=${RUN}_observer_${workname}_${mem_num}_${envir}_${cyc}
-  fi
-else
-  export jobid=${RUN}_analysis_${OB_TYPE}_${workname}_${envir}_${cyc}
-fi
-
 export DATA=${DATAROOT}/${jobid}
 
 if [[ ! -d ${DATA} ]]; then