fixed merge conflicts

src/python/pcmdi/scripts/pcmdi_metrics_driver.py

@@ -405,7 +405,12 @@ def applyCustomKeys(O, custom_dict, var):
  else:
  do = OBS.get(var,region=region)
  except Exception as err:
- dup('failed reading OBS', var, ref, err)
+ dup.tb = args.traceback
+ if level is not None:
+ dup('failed opening 4D OBS', var, ref, err)
+ else:
+ dup('failed opening 3D OBS', var, ref, err)
+ dup.tb = False
  continue
  grd["GridResolution"] = do.shape[1:]
  metrics_dictionary["GridInfo"] = grd
@@ -556,8 +561,8 @@ def applyCustomKeys(O, custom_dict, var):
  #
  # METRICS CALCULATIONS
  #
- metrics_dictionary[model_version] = \
- metrics_dictionary.get(
+ metrics_dictionary["RESULTS"][model_version] = \
+ metrics_dictionary["RESULTS"].get(
  model_version,
  {})
  # Stores model's simul description
@@ -641,57 +646,57 @@ def applyCustomKeys(O, custom_dict, var):
  parameters.realization,
  {})
  if not args.dry_run:
- pr_rgn = pcmdi_metrics.pcmdi.compute_metrics(
+ pr_rgn = pcmdi_metrics.pcmdi.compute_metrics(
+ Var,
+ dm,
+ do)
+ # Calling compute metrics with None for model and
+ # obs, triggers it to send back the defs.
+ metrics_def_dictionary.update(
+ pcmdi_metrics.pcmdi.compute_metrics(
  Var,
- dm,
- do)
- # Calling compute metrics with None for model and
- # obs, triggers it to send back the defs.
- metrics_def_dictionary.update(
- pcmdi_metrics.pcmdi.compute_metrics(
+ None,
+ None))
+ #
+ # The follwoing allow users to plug in a set of
+ # custom metrics
+ # Function needs to take in var name,
+ # model clim, obs clim
+ #
+ if hasattr(parameters, "compute_custom_metrics"):
+ pr_rgn.update(
+ parameters.compute_custom_metrics(
  Var,
- None,
- None))
- #
- # The follwoing allow users to plug in a set of
- # custom metrics
- # Function needs to take in var name,
- # model clim, obs clim
- #
- if hasattr(parameters, "compute_custom_metrics"):
- pr_rgn.update(
+ dm,
+ do))
+ # Calling compute metrics with None
+ # for model and
+ # obs, triggers it to send back the defs.
+ # But we are wrapping this in an except/try in
+ # case user did not implement
+ try:
+ metrics_def_dictionary.update(
  parameters.compute_custom_metrics(
  Var,
- dm,
- do))
- # Calling compute metrics with None
- # for model and
- # obs, triggers it to send back the defs.
- # But we are wrapping this in an except/try in
- # case user did not implement
- try:
- metrics_def_dictionary.update(
- parameters.compute_custom_metrics(
- Var,
- None,
- None))
- except:
- # Better than nothing we will use the doc
- # string
- metrics_def_dictionary.update(
- {"custom": parameters.
- compute_custom_metrics.__doc__})
- pr[region_name] = collections.OrderedDict(
- (k,
- pr_rgn[k]) for k in sorted(
- pr_rgn.keys()))
+ None,
+ None))
+ except:
+ # Better than nothing we will use the doc
+ # string
+ metrics_def_dictionary.update(
+ {"custom": parameters.
+ compute_custom_metrics.__doc__})
+ pr[region_name] = collections.OrderedDict(
+ (k,
+ pr_rgn[k]) for k in sorted(
+ pr_rgn.keys()))
  metrics_dictionary["RESULTS"][model_version][refabbv][
  parameters.realization] = pr
 
  # OUTPUT INTERPOLATED MODEL CLIMATOLOGIES
  # Only the first time thru an obs set (always the
  # same after)
- if not args.dry_run and parameters.save_mod_clims and ref == refs[0]:
+ if not args.dry_run and hasattr(parameters,"save_mod_clims") and parameters.save_mod_clims is True  and ref == refs[0]:
  CLIM = pcmdi_metrics.io.base.Base(
  os.path.join(parameters.
  model_clims_interpolated_output,region_name),
@@ -739,5 +744,5 @@ def applyCustomKeys(O, custom_dict, var):
  except Exception as err:
  dup.tb = args.traceback
  dup("Error while processing variable %s:\n\t%s" % (var, err))
-
-print "Done. Check log at: ", Efile.name
+ dup.tb = False
+dup("Done. Check log at: %s"% Efile.name)