Add reformat step for models

Refs: NOAA-EMC#1

Author: malloryprow

parm/metplus_config/global_det/atmos_grid2grid/stats/PCPCombine_fcstGLOBAL_DET_24hrAccum.conf parm/metplus_config/global_det/atmos_grid2grid/stats/PCPCombine_fcstGLOBAL_DET_24hrAccum_precip.conf

@@ -44,5 +44,5 @@ FCST_PCP_COMBINE_TIMES_PER_FILE =
 FCST_PCP_COMBINE_OUTPUT_NAME = APCP_A24
 FCST_PCP_COMBINE_STAT_LIST =
 FCST_PCP_COMBINE_DERIVE_LOOKBACK =
-FCST_PCP_COMBINE_BUCKET_INTERVAL =
+FCST_PCP_COMBINE_BUCKET_INTERVAL = {ENV[MODEL_accum]}H
 FCST_PCP_COMBINE_CONSTANT_INIT = True

parm/metplus_config/global_det/atmos_grid2grid/stats/PCPCombine_fcstGLOBAL_DET_24hrAccum_snow.conf

@@ -0,0 +1,48 @@
+[config]
+#### Input
+INPUT_BASE = {ENV[DATA]}/{ENV[VERIF_CASE]}_{ENV[STEP]}/data
+FCST_PCP_COMBINE_RUN = True
+FCST_PCP_COMBINE_INPUT_DIR = {INPUT_BASE}/{MODEL}
+FCST_PCP_COMBINE_INPUT_TEMPLATE = {MODEL}.{init?fmt=%Y%m%d%H}.f{lead?fmt=%HHH}
+FCST_PCP_COMBINE_INPUT_DATATYPE = GRIB
+FCST_IS_PROB = False
+OBS_PCP_COMBINE_RUN = False
+#### Output
+OUTPUT_BASE = {ENV[DATA]}/{ENV[VERIF_CASE]}_{ENV[STEP]}/METplus_output
+LOG_DIR = {OUTPUT_BASE}/logs
+TMP_DIR = {ENV[MET_TMP_DIR]}
+FCST_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}
+FCST_PCP_COMBINE_OUTPUT_TEMPLATE = {ENV[RUN]}.{valid?fmt=%Y%m%d}/{MODEL}/{ENV[VERIF_CASE]}/{ENV[VERIF_TYPE]}.{ENV[job_name]}.{init?fmt=%Y%m%d%H}.f{lead?fmt=%HHH}.nc
+LOG_METPLUS = {LOG_DIR}/{ENV[JOB_GROUP]}_PCPCombine_model{MODEL}_{ENV[VERIF_CASE]}_{ENV[STEP]}_{ENV[VERIF_TYPE]}_{ENV[job_name]}_for{ENV[DATE]}_runon{CLOCK_TIME}.log
+METPLUS_CONF = {OUTPUT_BASE}/confs/{ENV[JOB_GROUP]}_PCPCombine_model{MODEL}_{ENV[VERIF_CASE]}_{ENV[STEP]}_{ENV[VERIF_TYPE]}_{ENV[job_name]}_for{ENV[DATE]}_runon{CLOCK_TIME}.conf
+#### METplus application
+LOOP_ORDER = times
+PROCESS_LIST = PCPCombine
+##### Dates
+LOOP_BY = VALID
+VALID_TIME_FMT = %Y%m%d%H
+VALID_BEG = {ENV[DATE]}{ENV[valid_hr]}
+VALID_END = {ENV[DATE]}{ENV[valid_hr]}
+VALID_INCREMENT = 24H
+#### Lead
+LEAD_SEQ = begin_end_incr({ENV[fhr_start]},{ENV[fhr_end]},{ENV[fhr_inc]})
+##### Variables
+#### PCPCombine
+PCP_COMBINE_SKIP_IF_OUTPUT_EXISTS = FALSE
+MODEL = {ENV[MODEL]}
+FCST_PCP_COMBINE_METHOD = SUBTRACT
+FCST_PCP_COMBINE_INPUT_NAMES = {ENV[MODEL_var]} 
+FCST_PCP_COMBINE_INPUT_ACCUMS =
+FCST_PCP_COMBINE_INPUT_LEVELS = Z0
+FCST_PCP_COMBINE_IS_DAILY_FILE = False
+FCST_PCP_COMBINE_OUTPUT_ACCUM = 24H
+FCST_PCP_COMBINE_MIN_FORECAST = {ENV[fhr_start]}
+FCST_PCP_COMBINE_MAX_FORECAST = {ENV[fhr_end]}
+FCST_PCP_COMBINE_USE_ZERO_ACCUM = False
+FCST_PCP_COMBINE_DATA_INTERVAL = 24
+FCST_PCP_COMBINE_TIMES_PER_FILE =
+FCST_PCP_COMBINE_OUTPUT_NAME = {FCST_PCP_COMBINE_INPUT_NAMES}_A24
+FCST_PCP_COMBINE_STAT_LIST =
+FCST_PCP_COMBINE_DERIVE_LOOKBACK =
+FCST_PCP_COMBINE_BUCKET_INTERVAL = 24H
+FCST_PCP_COMBINE_CONSTANT_INIT = True

scripts/global_det/stats/exevs_global_det_atmos_grid2grid_stats.sh

@@ -82,10 +82,18 @@ done
 
 # Copy files to desired location
 if [ $SENDCOM = YES ]; then
-    cp -r $DATA/${VERIF_CASE}_${STEP}/METplus_output/$RUN.* $COMROOT/$NET/$evs_ver/$STEP/$COMPONENT/.
-    for model in $model_list; do
-        cp -r $DATA/${VERIF_CASE}_${STEP}/METplus_output/$model.* $COMROOT/$NET/$evs_ver/$STEP/$COMPONENT/.
+    DATE=${start_date}
+    while [ $DATE -le ${end_date} ] ; do
+        ls $DATA/${VERIF_CASE}_${STEP}/METplus_output/$RUN.$DATE
+        for MODEL in $model_list; do
+            ls $DATA/${VERIF_CASE}_${STEP}/METplus_output/$MODEL.$DATE
+        done
+        DATE=$(echo $($NDATE +24 ${DATE}00 ) |cut -c 1-8 )
     done
+    #cp -r $DATA/${VERIF_CASE}_${STEP}/METplus_output/$RUN.* $COMROOT/$NET/$evs_ver/$STEP/$COMPONENT/.
+    #for model in $model_list; do
+    #    cp -r $DATA/${VERIF_CASE}_${STEP}/METplus_output/$model.* $COMROOT/$NET/$evs_ver/$STEP/$COMPONENT/.
+    #done
 fi
 
 # Send data to METviewer AWS server

ush/global_det/global_det_atmos_stats_grid2grid_create_job_scripts.py

@@ -74,12 +74,24 @@
     'pres_levs': {},
     'means': {},
     'ozone': {},
-    'precip': {'24hrAccum': {'env': {'valid_hr': '12'},
+    'precip': {'24hrAccum': {'env': {'valid_hr': '12',
+                                     'MODEL_template': ('{MODEL}.precip.'
+                                                        +'{init?fmt=%Y%m%d%H}.'
+                                                        +'f{lead?fmt=%HHH}')},
                              'commands': [metplus_cmd_prefix
                                           +'PCPCombine_fcstGLOBAL_DET_'
-                                          +'24hrAccum.conf']}},
+                                          +'24hrAccum_precip.conf']}},
     'sea_ice': {},
-    'snow': {},
+    'snow': {'24hrAccum_WaterEqv': {'env': {'valid_hr': '12',
+                                            'MODEL_var': 'WEASD'},
+                                    'commands': [metplus_cmd_prefix
+                                                 +'PCPCombine_fcstGLOBAL_DET_'
+                                                 +'24hrAccum_snow.conf']},
+             '24hrAccum_Depth': {'env': {'valid_hr': '12',
+                                         'MODEL_var': 'SNOD'},
+                                 'commands': [metplus_cmd_prefix
+                                              +'PCPCombine_fcstGLOBAL_DET_'
+                                              +'24hrAccum_snow.conf']}},
     'sst': {},
 }