Compatible with v1.3.2 of cdp.

PCMDI · Apr 19, 2018 · eb4d089 · eb4d089
1 parent ff94dde
commit eb4d089
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/recipes/pcmdi_metrics/meta.yaml b/recipes/pcmdi_metrics/meta.yaml
@@ -22,7 +22,7 @@ requirements:
  - cdms2 >=2.10
  - genutil >=2.10
  - cdutil >=2.10
- - cdp
+ - cdp >=1.3.2
  - matplotlib
  - numpy
  - cia

diff --git a/recipes/pcmdi_metrics/meta.yaml.in b/recipes/pcmdi_metrics/meta.yaml.in
@@ -22,7 +22,7 @@ requirements:
  - cdms2 >=2.10
  - genutil >=2.10
  - cdutil >=2.10
- - cdp
+ - cdp >=1.3.2
  - matplotlib
  - numpy
  - cia

diff --git a/src/python/pcmdi/scripts/driver/pmp_parameter.py b/src/python/pcmdi/scripts/driver/pmp_parameter.py
@@ -34,6 +34,7 @@ def __init__(self):
  self.custom_keys = {}
 
  self.filename_template = ''
+ self.sftlf_filename_template = ''
  self.surface_type_land_fraction_filename_template = ''
  self.generate_surface_type_land_fraction = None
 

diff --git a/src/python/pcmdi/scripts/pcmdi_metrics_driver.py b/src/python/pcmdi/scripts/pcmdi_metrics_driver.py
@@ -380,6 +380,6 @@ def determine_obs_or_model(self, is_obs, ref_or_test, data_path):
  required=False)
 
 
-parameter = parser.get_parameter()
+parameter = parser.get_parameter(cmd_default_vars=False)
 driver = PMPDriver(parameter)
 driver.run_diags()