From 13d37ae76dbd66f2692ac1b7294dc8e2f82113c4 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Thu, 18 Jul 2019 12:07:27 -0700 Subject: [PATCH] flake8 --- pcmdi_metrics/driver/outputmetrics.py | 1 - pcmdi_metrics/pcmdi/mean_climate_metrics_driver.py | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pcmdi_metrics/driver/outputmetrics.py b/pcmdi_metrics/driver/outputmetrics.py index b77c9d977..1206d54c4 100644 --- a/pcmdi_metrics/driver/outputmetrics.py +++ b/pcmdi_metrics/driver/outputmetrics.py @@ -302,4 +302,3 @@ def write_on_exit(self): indent=4, separators=(',', ': '), mode="r+") - #self.out_file.write(self.metrics_dictionary, type='txt') diff --git a/pcmdi_metrics/pcmdi/mean_climate_metrics_driver.py b/pcmdi_metrics/pcmdi/mean_climate_metrics_driver.py index aa86998b9..178ef9353 100644 --- a/pcmdi_metrics/pcmdi/mean_climate_metrics_driver.py +++ b/pcmdi_metrics/pcmdi/mean_climate_metrics_driver.py @@ -55,17 +55,9 @@ def run_diags(self): 'Variable %s not in obs_dict' % self.var) continue - for region in self.regions_dict[self.var]: logging.getLogger("pcmdi_metrics").info("REGION: {}".format(region)) self.region = self.create_region(region) - # Need to add the region to the output dict now b/c - # otherwise if done later, sometimes it's not added due to - # premature break in the for loops for reference and test. - # Runs obs vs obs, obs vs model, or model vs model - #self.output_metric = OutputMetrics(self.parameter, self.var_name_long, - # self.obs_dict, sftlf=self.sftlf) - #self.output_metric.add_region(self.region) self.run_reference_and_test_comparison() def load_obs_dict(self): @@ -180,7 +172,7 @@ def run_reference_and_test_comparison(self): for test in test_data_set: logging.getLogger("pcmdi_metrics").info("TEST DATA IS: {}".format(test)) self.output_metric = OutputMetrics(self.parameter, self.var_name_long, - self.obs_dict, sftlf=self.sftlf) + self.obs_dict, sftlf=self.sftlf) self.output_metric.add_region(self.region) try: tst = self.determine_obs_or_model(test_data_set_is_obs, @@ -194,7 +186,6 @@ def run_reference_and_test_comparison(self): logging.getLogger("pcmdi_metrics").info("Unexpected error:".format(err)) break - try: self.output_metric.calculate_and_output_metrics(ref, tst) except RuntimeError: