From 6c3001d19064abea7c3498172c7ffdc5fb4fe7d5 Mon Sep 17 00:00:00 2001 From: Javier Vegas-Regidor Date: Mon, 9 Jan 2017 10:06:29 +0100 Subject: [PATCH] Fixed configuration reading on MaxMoc. Fixes #18 --- earthdiagnostics/ocean/maxmoc.py | 4 ++-- test/unit/test_maxmoc.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/earthdiagnostics/ocean/maxmoc.py b/earthdiagnostics/ocean/maxmoc.py index 1051d158..18f27417 100644 --- a/earthdiagnostics/ocean/maxmoc.py +++ b/earthdiagnostics/ocean/maxmoc.py @@ -80,8 +80,8 @@ class MaxMoc(Diagnostic): box.max_depth = options['max_depth'] job_list = list() - for startdate in diags.startdates: - for member in diags.members: + for startdate in diags.config.experiment.startdates: + for member in diags.config.experiment.members: years = diags.config.experiment.get_full_years(startdate) if len(years) == 0: Log.user_warning('No complete years are available with the given configuration. ' diff --git a/test/unit/test_maxmoc.py b/test/unit/test_maxmoc.py index f31c5822..99c2fca6 100644 --- a/test/unit/test_maxmoc.py +++ b/test/unit/test_maxmoc.py @@ -23,8 +23,8 @@ class TestMaxMoc(TestCase): def test_generate_jobs(self): self.diags = Mock() self.diags.model_version = 'model_version' - self.diags.startdates = ('20010101',) - self.diags.members = (0,) + self.diags.config.experiment.startdates = ('20010101',) + self.diags.config.experiment.members = (0,) self.diags.config.experiment.get_full_years.return_value = (2000, 2001) jobs = MaxMoc.generate_jobs(self.diags, ['psi', '0', '0', '0', '0']) -- GitLab