[develop] Reorganize verification tasks (rename tasks and files; spli…

…t tasks into two) (#618)

1. Rename verification tasks and corresponding j-jobs, ex-scripts, and log files as described in issue #619.

2. Separate combined METplus vx tasks for surface and upper air into separate tasks. This is so that there is only one call to a METplus tool per ROCOTO task and helps simplify the workflow and debugging.

3. Ensure that each vx task has a separate section in config_defaults.yaml with its own resource variables (WTIME_..., PPN_..., etc).

jobs/JREGIONAL_RUN_VX_ENSGRID → jobs/JREGIONAL_RUN_MET_ENSEMBLESTAT_VX_GRID

@@ -63,7 +63,7 @@ on gridded fields by initialization time for all forecast hours.
 #
 #-----------------------------------------------------------------------
 #
-$SCRIPTSdir/exregional_run_vx_ensgrid.sh || \
+$SCRIPTSdir/exregional_run_met_ensemblestat_vx_grid.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

jobs/JREGIONAL_RUN_VX_ENSPOINT → jobs/JREGIONAL_RUN_MET_ENSEMBLESTAT_VX_POINT

@@ -54,7 +54,7 @@ by initialitation time for all forecast hours.
 #
 #-----------------------------------------------------------------------
 #
-$SCRIPTSdir/exregional_run_vx_enspoint.sh || \
+$SCRIPTSdir/exregional_run_met_ensemblestat_vx_point.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

jobs/JREGIONAL_RUN_VX_GRIDSTAT → jobs/JREGIONAL_RUN_MET_GRIDSTAT_VX

@@ -63,7 +63,7 @@ by initialization time for all forecast hours.
 #
 #-----------------------------------------------------------------------
 #
-$SCRIPTSdir/exregional_run_vx_gridstat.sh || \
+$SCRIPTSdir/exregional_run_met_gridstat_vx.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

jobs/JREGIONAL_RUN_VX_ENSGRID_MEAN → jobs/JREGIONAL_RUN_MET_GRIDSTAT_VX_ENSMEAN

@@ -63,7 +63,7 @@ on gridded fields by initialization time for all forecast hours.
 #
 #-----------------------------------------------------------------------
 #
-$SCRIPTSdir/exregional_run_vx_ensgrid_mean.sh || \
+$SCRIPTSdir/exregional_run_met_gridstat_vx_ensmean.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

jobs/JREGIONAL_RUN_VX_ENSGRID_PROB → jobs/JREGIONAL_RUN_MET_GRIDSTAT_VX_ENSPROB

@@ -63,7 +63,7 @@ on gridded fields by initialization time for all forecast hours.
 #
 #-----------------------------------------------------------------------
 #
-$SCRIPTSdir/exregional_run_vx_ensgrid_prob.sh || \
+$SCRIPTSdir/exregional_run_met_gridstat_vx_ensprob.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

jobs/JREGIONAL_RUN_VX_POINTSTAT → jobs/JREGIONAL_RUN_MET_POINTSTAT_VX

@@ -54,7 +54,7 @@ by initialitation time for all forecast hours.
 #
 #-----------------------------------------------------------------------
 #
-$SCRIPTSdir/exregional_run_vx_pointstat.sh || \
+$SCRIPTSdir/exregional_run_met_pointstat_vx.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

jobs/JREGIONAL_RUN_VX_ENSPOINT_MEAN → jobs/JREGIONAL_RUN_MET_POINTSTAT_VX_ENSMEAN

@@ -54,7 +54,7 @@ by initialitation time for all forecast hours.
 #
 #-----------------------------------------------------------------------
 #
-$SCRIPTSdir/exregional_run_vx_enspoint_mean.sh || \
+$SCRIPTSdir/exregional_run_met_pointstat_vx_ensmean.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

jobs/JREGIONAL_RUN_VX_ENSPOINT_PROB → jobs/JREGIONAL_RUN_MET_POINTSTAT_VX_ENSPROB

@@ -54,7 +54,7 @@ by initialitation time for all forecast hours.
 #
 #-----------------------------------------------------------------------
 #
-$SCRIPTSdir/exregional_run_vx_enspoint_prob.sh || \
+$SCRIPTSdir/exregional_run_met_pointstat_vx_ensprob.sh || \
 print_err_msg_exit "\
 Call to ex-script corresponding to J-job \"${scrfunc_fn}\" failed."
 #

parm/metplus/EnsembleStat_conus_sfc.conf → parm/metplus/EnsembleStat_SFC.conf

@@ -347,7 +347,7 @@ ENSEMBLE_STAT_CLIMO_STDEV_INPUT_TEMPLATE =
 ENSEMBLE_STAT_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d%H}/metprd/ensemble_stat
 
 # Specify the name of the metplus.log file
-LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_sfc
+LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_SFC_{ENV[CDATE]}
 
 # Specify where the location and name of the final metplus_final.conf
 METPLUS_CONF={OUTPUT_BASE}/{ENV[CDATE]}/metprd/ensemble_stat/metplus_final.conus_surface.conf

parm/metplus/EnsembleStat_upper_air.conf → parm/metplus/EnsembleStat_UPA.conf

@@ -417,7 +417,7 @@ ENSEMBLE_STAT_CLIMO_STDEV_INPUT_TEMPLATE =
 ENSEMBLE_STAT_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d%H}/metprd/ensemble_stat
 
 # Specify the name of the metplus.log file
-LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_upa
+LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_UPA_{ENV[CDATE]}
 
 # Specify where the location and name of the final metplus_final.conf
 METPLUS_CONF={OUTPUT_BASE}/{ENV[CDATE]}/metprd/ensemble_stat/metplus_final.upper_air.conf

parm/metplus/PointStat_conus_sfc.conf → parm/metplus/PointStat_SFC.conf

@@ -292,7 +292,7 @@ POINT_STAT_CLIMO_STDEV_INPUT_TEMPLATE =
 POINT_STAT_OUTPUT_TEMPLATE = metprd/point_stat
 
 # Specify the name of the metplus.log file
-LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_sfc
+LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_SFC{ENV[USCORE_ENSMEM_NAME_OR_NULL]}_{ENV[CDATE]}
 
 # Specify where the location and name of the final metplus_final.conf
 METPLUS_CONF={OUTPUT_BASE}/metprd/point_stat/metplus_final.conus_surface{ENV[DOT_ENSMEM]}.conf

parm/metplus/PointStat_upper_air.conf → parm/metplus/PointStat_UPA.conf

@@ -298,7 +298,7 @@ POINT_STAT_CLIMO_STDEV_INPUT_TEMPLATE =
 POINT_STAT_OUTPUT_TEMPLATE = metprd/point_stat
 
 # Specify the name of the metplus.log file
-LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_upa
+LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_UPA{ENV[USCORE_ENSMEM_NAME_OR_NULL]}_{ENV[CDATE]}
 
 # Specify where the location and name of the final metplus_final.conf
 METPLUS_CONF={OUTPUT_BASE}/metprd/point_stat/metplus_final.upper_air{ENV[DOT_ENSMEM]}.conf

parm/metplus/PointStat_conus_sfc_mean.conf → parm/metplus/PointStat_ensmean_SFC.conf

@@ -263,7 +263,7 @@ POINT_STAT_CLIMO_STDEV_INPUT_TEMPLATE =
 POINT_STAT_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d%H}/metprd/ensemble_stat_mean
 
 # Specify the name of the metplus.log file
-LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_sfc
+LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_ensmean_SFC_{ENV[CDATE]}
 
 # Specify where the location and name of the final metplus_final.conf
 METPLUS_CONF={OUTPUT_BASE}/{ENV[CDATE]}/metprd/ensemble_stat_mean/metplus_final.conus_surface.conf

parm/metplus/PointStat_upper_air_mean.conf → parm/metplus/PointStat_ensmean_UPA.conf

@@ -339,7 +339,7 @@ POINT_STAT_CLIMO_STDEV_INPUT_TEMPLATE =
 POINT_STAT_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d%H}/metprd/ensemble_stat_mean
 
 # Specify the name of the metplus.log file
-LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_upa
+LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_ensmean_UPA_{ENV[CDATE]}
 
 # Specify where the location and name of the final metplus_final.conf
 METPLUS_CONF={OUTPUT_BASE}/{ENV[CDATE]}/metprd/ensemble_stat_mean/metplus_final.upper_air.conf

parm/metplus/PointStat_conus_sfc_prob.conf → parm/metplus/PointStat_ensprob_SFC.conf

@@ -439,7 +439,7 @@ POINT_STAT_CLIMO_STDEV_INPUT_TEMPLATE =
 POINT_STAT_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d%H}/metprd/ensemble_stat_prob
 
 # Specify the name of the metplus.log file
-LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_sfc
+LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_ensprob_SFC_{ENV[CDATE]}
 
 # Specify where the location and name of the final metplus_final.conf
 METPLUS_CONF={OUTPUT_BASE}/{ENV[CDATE]}/metprd/ensemble_stat_prob/metplus_final.conus_surface.conf

parm/metplus/PointStat_upper_air_prob.conf → parm/metplus/PointStat_ensprob_UPA.conf

@@ -563,7 +563,7 @@ POINT_STAT_CLIMO_STDEV_INPUT_TEMPLATE =
 POINT_STAT_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d%H}/metprd/ensemble_stat_prob
 
 # Specify the name of the metplus.log file
-LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_upa
+LOG_METPLUS = {LOG_DIR}/metplus.log.{ENV[LOG_SUFFIX]}_ensprob_UPA_{ENV[CDATE]}
 
 # Specify where the location and name of the final metplus_final.conf
 METPLUS_CONF={OUTPUT_BASE}/{ENV[CDATE]}/metprd/ensemble_stat_prob/metplus_final.upper_air.conf

scripts/exregional_run_vx_ensgrid.sh → scripts/exregional_run_met_ensemblestat_vx_grid.sh

@@ -117,9 +117,9 @@ export DOT_ENSMEM=${dot_ensmem}
 #
 
 if [ ${VAR} == "APCP" ]; then
-  LOG_SUFFIX=ensgrid_${CDATE}_${VAR}_${ACCUM}h
+  LOG_SUFFIX=EnsembleStat_${VAR}${ACCUM}h_${CDATE}
 else
-  LOG_SUFFIX=ensgrid_${CDATE}_${VAR}
+  LOG_SUFFIX=EnsembleStat_${VAR}_${CDATE}
 fi
 
 #

scripts/exregional_run_vx_enspoint.sh → scripts/exregional_run_met_ensemblestat_vx_point.sh

@@ -111,7 +111,7 @@ export DOT_ENSMEM=${dot_ensmem}
 #
 #-----------------------------------------------------------------------
 #
-LOG_SUFFIX=enspoint_${CDATE}
+LOG_SUFFIX="EnsembleStat"
 
 #
 #-----------------------------------------------------------------------
@@ -145,11 +145,7 @@ export NUM_ENS_MEMBERS
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \
-  -c ${METPLUS_CONF}/EnsembleStat_conus_sfc.conf
-
-${METPLUS_PATH}/ush/run_metplus.py \
-  -c ${METPLUS_CONF}/common.conf \
-  -c ${METPLUS_CONF}/EnsembleStat_upper_air.conf
+  -c ${METPLUS_CONF}/EnsembleStat_${VAR}.conf
 
 #
 #-----------------------------------------------------------------------

scripts/exregional_run_vx_gridstat.sh → scripts/exregional_run_met_gridstat_vx.sh

@@ -88,8 +88,8 @@ else
       export INPUT_BASE=${VX_FCST_INPUT_BASEDIR}/${CDATE}/postprd
       export OUTPUT_BASE=${EXPTDIR}/${CDATE}
     else
-      export INPUT_BASE=${VX_FCST_INPUT_BASEDIR}/${CDATE}/${SLASH_ENSMEM_SUBDIR}/postprd
-      export OUTPUT_BASE=${EXPTDIR}/${CDATE}/${SLASH_ENSMEM_SUBDIR}
+      export INPUT_BASE=${VX_FCST_INPUT_BASEDIR}/${CDATE}${SLASH_ENSMEM_SUBDIR}/postprd
+      export OUTPUT_BASE=${EXPTDIR}/${CDATE}${SLASH_ENSMEM_SUBDIR}
     fi
     export MEM_BASE=$EXPTDIR/$CDATE
     export LOG_DIR=${EXPTDIR}/log
@@ -108,20 +108,15 @@ export DOT_ENSMEM=${dot_ensmem}
 #
 #-----------------------------------------------------------------------
 #
-if [[ ${DO_ENSEMBLE} == "FALSE" ]]; then
-  if [ ${VAR} == "APCP" ]; then
-    LOG_SUFFIX=gridstat_${CDATE}_${VAR}_${ACCUM}h
-  else
-    LOG_SUFFIX=gridstat_${CDATE}_${VAR}
-  fi
-elif [[ ${DO_ENSEMBLE} == "TRUE" ]]; then
+if [ ${VAR} == "APCP" ]; then
+  LOG_SUFFIX=GridStat_${VAR}${ACCUM}h${USCORE_ENSMEM_NAME_OR_NULL}_${CDATE}
+else
+  LOG_SUFFIX=GridStat_${VAR}${USCORE_ENSMEM_NAME_OR_NULL}_${CDATE}
+fi
+
+if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then
   ENSMEM=`echo ${SLASH_ENSMEM_SUBDIR} | cut -d"/" -f2`
   VX_FCST_MODEL_NAME=${VX_FCST_MODEL_NAME}_${ENSMEM}
-  if [ ${VAR} == "APCP" ]; then
-    LOG_SUFFIX=gridstat_${CDATE}_${ENSMEM}_${VAR}_${ACCUM}h
-  else
-    LOG_SUFFIX=gridstat_${CDATE}_${ENSMEM}_${VAR}
-  fi
 fi
 
 #

scripts/exregional_run_vx_ensgrid_mean.sh → scripts/exregional_run_met_gridstat_vx_ensmean.sh

@@ -114,9 +114,9 @@ export DOT_ENSMEM=${dot_ensmem}
 #
 
 if [ ${VAR} == "APCP" ]; then
-  LOG_SUFFIX=ensgrid_mean_${CDATE}_${VAR}_${ACCUM}h
+  LOG_SUFFIX=GridStat_ensmean_${VAR}${ACCUM}h_${CDATE}
 else
-  LOG_SUFFIX=ensgrid_mean_${CDATE}_${VAR}
+  LOG_SUFFIX=GridStat_ensmean_${VAR}_${CDATE}
 fi
 
 #
@@ -159,11 +159,11 @@ if [ ${VAR} == "APCP" ]; then
   export acc="${ACCUM}h"
   ${METPLUS_PATH}/ush/run_metplus.py \
     -c ${METPLUS_CONF}/common.conf \
-    -c ${METPLUS_CONF}/GridStat_${VAR}${acc}_mean.conf
+    -c ${METPLUS_CONF}/GridStat_ensmean_${VAR}${acc}.conf
 else
   ${METPLUS_PATH}/ush/run_metplus.py \
     -c ${METPLUS_CONF}/common.conf \
-    -c ${METPLUS_CONF}/GridStat_${VAR}_mean.conf
+    -c ${METPLUS_CONF}/GridStat_ensmean_${VAR}.conf
 fi
 
 #

scripts/exregional_run_vx_ensgrid_prob.sh → scripts/exregional_run_met_gridstat_vx_ensprob.sh

@@ -114,9 +114,9 @@ export DOT_ENSMEM=${dot_ensmem}
 #
 
 if [ ${VAR} == "APCP" ]; then
-  LOG_SUFFIX=ensgrid_prob_${CDATE}_${VAR}_${ACCUM}h
+  LOG_SUFFIX=GridStat_ensprob_${VAR}${ACCUM}h_${CDATE}
 else
-  LOG_SUFFIX=ensgrid_prob_${CDATE}_${VAR}
+  LOG_SUFFIX=GridStat_ensprob_${VAR}_${CDATE}
 fi
 
 #
@@ -159,11 +159,11 @@ if [ ${VAR} == "APCP" ]; then
   export acc="${ACCUM}h"
   ${METPLUS_PATH}/ush/run_metplus.py \
     -c ${METPLUS_CONF}/common.conf \
-    -c ${METPLUS_CONF}/GridStat_${VAR}${acc}_prob.conf
+    -c ${METPLUS_CONF}/GridStat_ensprob_${VAR}${acc}.conf
 else
   ${METPLUS_PATH}/ush/run_metplus.py \
     -c ${METPLUS_CONF}/common.conf \
-    -c ${METPLUS_CONF}/GridStat_${VAR}_prob.conf
+    -c ${METPLUS_CONF}/GridStat_ensprob_${VAR}.conf
 fi
 
 #

scripts/exregional_run_vx_pointstat.sh → scripts/exregional_run_met_pointstat_vx.sh

@@ -88,8 +88,8 @@ else
       export INPUT_BASE=${VX_FCST_INPUT_BASEDIR}/${CDATE}/postprd
       export OUTPUT_BASE=${EXPTDIR}/${CDATE}
     else
-      export INPUT_BASE=${VX_FCST_INPUT_BASEDIR}/${CDATE}/${SLASH_ENSMEM_SUBDIR}/postprd
-      export OUTPUT_BASE=${EXPTDIR}/${CDATE}/${SLASH_ENSMEM_SUBDIR}
+      export INPUT_BASE=${VX_FCST_INPUT_BASEDIR}/${CDATE}${SLASH_ENSMEM_SUBDIR}/postprd
+      export OUTPUT_BASE=${EXPTDIR}/${CDATE}${SLASH_ENSMEM_SUBDIR}
     fi
     export MEM_BASE=$EXPTDIR/$CDATE
     export LOG_DIR=${EXPTDIR}/log
@@ -108,12 +108,10 @@ export DOT_ENSMEM=${dot_ensmem}
 #
 #-----------------------------------------------------------------------
 #
-if [[ ${DO_ENSEMBLE} == "FALSE" ]]; then
-  LOG_SUFFIX=pointstat_${CDATE}
-elif [[ ${DO_ENSEMBLE} == "TRUE" ]]; then
+LOG_SUFFIX="PointStat"
+if [[ ${DO_ENSEMBLE} == "TRUE" ]]; then
   ENSMEM=`echo ${SLASH_ENSMEM_SUBDIR} | cut -d"/" -f2`
   VX_FCST_MODEL_NAME=${VX_FCST_MODEL_NAME}_${ENSMEM}
-  LOG_SUFFIX=pointstat_${CDATE}_${ENSMEM}
 fi
 
 #
@@ -147,11 +145,7 @@ export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \
-  -c ${METPLUS_CONF}/PointStat_conus_sfc.conf
-
-${METPLUS_PATH}/ush/run_metplus.py \
-  -c ${METPLUS_CONF}/common.conf \
-  -c ${METPLUS_CONF}/PointStat_upper_air.conf
+  -c ${METPLUS_CONF}/PointStat_${VAR}.conf
 
 #
 #-----------------------------------------------------------------------

scripts/exregional_run_vx_enspoint_mean.sh → scripts/exregional_run_met_pointstat_vx_ensmean.sh

@@ -112,7 +112,7 @@ export DOT_ENSMEM=${dot_ensmem}
 #
 #-----------------------------------------------------------------------
 #
-LOG_SUFFIX=enspoint_mean_${CDATE}
+LOG_SUFFIX="PointStat"
 
 #
 #-----------------------------------------------------------------------
@@ -145,11 +145,7 @@ export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \
-  -c ${METPLUS_CONF}/PointStat_conus_sfc_mean.conf
-
-${METPLUS_PATH}/ush/run_metplus.py \
-  -c ${METPLUS_CONF}/common.conf \
-  -c ${METPLUS_CONF}/PointStat_upper_air_mean.conf
+  -c ${METPLUS_CONF}/PointStat_ensmean_${VAR}.conf
 #
 #-----------------------------------------------------------------------
 #

scripts/exregional_run_vx_enspoint_prob.sh → scripts/exregional_run_met_pointstat_vx_ensprob.sh

@@ -112,8 +112,7 @@ export DOT_ENSMEM=${dot_ensmem}
 #
 #-----------------------------------------------------------------------
 #
-LOG_SUFFIX=enspoint_prob_${CDATE}
-
+LOG_SUFFIX="PointStat"
 #
 #-----------------------------------------------------------------------
 #
@@ -145,11 +144,7 @@ export POST_OUTPUT_DOMAIN_NAME
 
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \
-  -c ${METPLUS_CONF}/PointStat_conus_sfc_prob.conf
-
-${METPLUS_PATH}/ush/run_metplus.py \
-  -c ${METPLUS_CONF}/common.conf \
-  -c ${METPLUS_CONF}/PointStat_upper_air_prob.conf
+  -c ${METPLUS_CONF}/PointStat_ensprob_${VAR}.conf
 #
 #-----------------------------------------------------------------------
 #