all passes again yeah!

src/python/pcmdi/scripts/driver/dataset.py

@@ -70,9 +70,10 @@ def create_sftlf(parameter):
  sftlf = {}
 
  for test in parameter.test_data_set:
- sft = Base(parameter.test_data_path,
- getattr(parameter, "sftlf_filename_template",
- parameter.filename_template))
+ tmp_name = getattr(parameter, "sftlf_filename_template")
+ if tmp_name is None: # Not defined from commandline or param file
+ tmp_name = parameter.filename_template
+ sft = Base(parameter.test_data_path, tmp_name)
  sft.model_version = test
  sft.table = "fx"
  sft.realm = "atmos"

src/python/pcmdi/scripts/driver/pmp_parser.py

@@ -1,12 +1,12 @@
-import ast
 import cdp.cdp_parser
 import pcmdi_metrics.driver.pmp_parameter
 import os
 import sys
 
+
 class PMPParser(cdp.cdp_parser.CDPParser):
  def __init__(self, *args, **kwargs):
  super(PMPParser, self).__init__(pcmdi_metrics.driver.pmp_parameter.PMPParameter,
  os.path.join(sys.prefix, "share", "cia", "DefArgsCIA.json"), *args, **kwargs)
-
-
+ self.use("parameters")
+ self.use("diags")

src/python/pcmdi/scripts/pcmdi_metrics_driver.py

@@ -7,6 +7,7 @@
 import pcmdi_metrics.driver.dataset
 import pcmdi_metrics.driver.pmp_parser
 from pcmdi_metrics import LOG_LEVEL
+import ast
 
 
 class PMPDriver(object):
@@ -317,13 +318,6 @@ def determine_obs_or_model(self, is_obs, ref_or_test, data_path):
  'against the reference_data_set',
  required=False)
 
-parser.add_argument(
- '--model_tweaks',
- type=ast.literal_eval,
- dest='model_tweaks',
- help='Model specific tweaks',
- required=False)
-
 parser.add_argument(
  '--ext',
  dest='ext',
@@ -384,11 +378,6 @@ def determine_obs_or_model(self, is_obs, ref_or_test, data_path):
  'test climatologies',
  required=False)
 
-parser.add_argument(
- '--compute_custom_metrics',
- dest='compute_custom_metrics',
- help='Allows for user-defined metrics',
- required=False)
 
 parameter = parser.get_parameter()
 driver = PMPDriver(parameter)