Create function for putting together METplus call

Refs: NOAA-EMC#1

Author: malloryprow

ush/global_det/global_det_atmos_stats_grid2grid_create_job_scripts.py

@@ -44,15 +44,6 @@
                    [VERIF_CASE_STEP_abbrev+'_precip_var_list'] \
                     .split(' '))
 
-# Set up METplus job command dictionary
-metplus_cmd_prefix = (
-    os.path.join(METPLUS_PATH, 'ush', 'run_metplus.py')
-    +' -c '+os.path.join(PARMevs, 'metplus_config', 'machine.conf')
-    +' -c '+os.path.join(PARMevs, 'metplus_config', COMPONENT,
-                         RUN+'_'+VERIF_CASE, STEP)
-    +'/'
-)
-
 VERIF_CASE_STEP = VERIF_CASE+'_'+STEP
 start_date_dt = datetime.datetime.strptime(start_date, '%Y%m%d')
 end_date_dt = datetime.datetime.strptime(end_date, '%Y%m%d')
@@ -64,8 +55,9 @@
     'means': {},
     'ozone': {},
     'precip': {'24hrCCPA': {'env': {},
-                            'commands': [metplus_cmd_prefix
-                                         +'PCPCombine_obs24hrCCPA.conf']}},
+                            'commands': [gda_util.metplus_command(
+                                             'PCPCombine_obs24hrCCPA.conf'
+                                         )]}},
     'sea_ice': {},
     'snow': {},
     'sst': {},
@@ -77,21 +69,25 @@
     '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_precip.conf']}},
+                                                        +'f{lead?fmt=%HHH}')
+                             },
+                             'commands': [gda_util.metplus_command(
+                                              'PCPCombine_fcstGLOBAL_DET_'
+                                              +'24hrAccum_precip.conf'
+                                          )]}},
     'sea_ice': {},
     'snow': {'24hrAccum_WaterEqv': {'env': {'valid_hr': '12',
                                             'MODEL_var': 'WEASD'},
-                                    'commands': [metplus_cmd_prefix
-                                                 +'PCPCombine_fcstGLOBAL_DET_'
-                                                 +'24hrAccum_snow.conf']},
+                                    'commands': [gda_util.metplus_command(
+                                                     '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']}},
+                                 'commands': [gda_util.metplus_command(
+                                                  'PCPCombine_fcstGLOBAL_'
+                                                  +'DET_24hrAccum_snow.conf'
+                                              )]}},
     'sst': {},
 }
 

ush/global_det/global_det_atmos_util.py

@@ -25,6 +25,27 @@ def run_shell_command(command):
         print("ERROR: "+' '.join(run_command.args)+" gave return code "
               +str(run_command.returncode))
 
+def metplus_command(conf_file_name):
+    """! Write out full call to METplus
+
+         Args:
+             conf_file_name - METplus conf file name (string)
+
+         Returns:
+             metplus_cmd - full call to METplus (string)
+
+    """
+    run_metplus = os.path.join(os.environ['METPLUS_PATH'], 'ush',
+                               'run_metplus.py')
+    machine_conf = os.path.join(os.environ['PARMevs'], 'metplus_config',
+                                'machine.conf')
+    conf_file = os.path.join(os.environ['PARMevs'], 'metplus_config',
+                             os.environ['COMPONENT'],
+                             os.environ['RUN']+'_'+os.environ['VERIF_CASE'],
+                             os.environ['STEP'], conf_file_name)
+    metplus_cmd = run_metplus+' -c '+machine_conf+' -c '+conf_file
+    return metplus_cmd
+
 def check_file_exists_size(file_name):
     """! Checks to see if file exists and has size greater than 0