From b6f24b3f2a3981ee3f2c9cf1c3fffb6981dc6a66 Mon Sep 17 00:00:00 2001
From: Le Roux Erwan <erwan.le-roux@irstea.fr>
Date: Fri, 8 Mar 2019 15:37:52 +0100
Subject: [PATCH] [SCM] validate the Graph from Gaume paper.
---
experiment/meteo_france_SCM_study/crocus/crocus.py | 4 ++--
experiment/meteo_france_SCM_study/safran/safran.py | 4 ++++
.../studies_visualization/main_studies_visualizer.py | 7 ++++---
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/experiment/meteo_france_SCM_study/crocus/crocus.py b/experiment/meteo_france_SCM_study/crocus/crocus.py
index 3b887146..0390e08d 100644
--- a/experiment/meteo_france_SCM_study/crocus/crocus.py
+++ b/experiment/meteo_france_SCM_study/crocus/crocus.py
@@ -20,8 +20,8 @@ class Crocus(AbstractStudy):
suffix = '' if self.altitude == 2400 else ' average of data observed every 6 hours'
return super().variable_name + suffix
- def annual_aggregation_function(self):
- return np.mean
+ def annual_aggregation_function(self, *args, **kwargs):
+ return np.mean(*args, **kwargs)
class CrocusSwe(Crocus):
diff --git a/experiment/meteo_france_SCM_study/safran/safran.py b/experiment/meteo_france_SCM_study/safran/safran.py
index 2cbca4fd..a5c1b30d 100644
--- a/experiment/meteo_france_SCM_study/safran/safran.py
+++ b/experiment/meteo_france_SCM_study/safran/safran.py
@@ -55,6 +55,10 @@ class SafranTotalPrecip(SafranFrequency):
super().__init__(SafranTotalPrecipVariable, *args, **kwargs)
+class ExtendedSafranTotalPrecip(AbstractExtendedStudy, SafranTotalPrecip):
+ pass
+
+
class SafranTemperature(Safran):
def __init__(self, *args, **kwargs):
diff --git a/experiment/meteo_france_SCM_study/visualization/studies_visualization/main_studies_visualizer.py b/experiment/meteo_france_SCM_study/visualization/studies_visualization/main_studies_visualizer.py
index 08f36347..861cf404 100644
--- a/experiment/meteo_france_SCM_study/visualization/studies_visualization/main_studies_visualizer.py
+++ b/experiment/meteo_france_SCM_study/visualization/studies_visualization/main_studies_visualizer.py
@@ -1,7 +1,8 @@
from experiment.meteo_france_SCM_study.abstract_study import AbstractStudy
from experiment.meteo_france_SCM_study.crocus.crocus import CrocusDepth, CrocusSwe, ExtendedCrocusDepth, \
ExtendedCrocusSwe
-from experiment.meteo_france_SCM_study.safran.safran import SafranSnowfall, ExtendedSafranSnowfall
+from experiment.meteo_france_SCM_study.safran.safran import SafranSnowfall, ExtendedSafranSnowfall, \
+ ExtendedSafranTotalPrecip
from experiment.meteo_france_SCM_study.visualization.studies_visualization.studies import Studies
from experiment.meteo_france_SCM_study.visualization.studies_visualization.studies_visualizer import StudiesVisualizer
@@ -9,12 +10,12 @@ from experiment.meteo_france_SCM_study.visualization.study_visualization.study_v
from collections import OrderedDict
SCM_STUDIES = [SafranSnowfall, CrocusSwe, CrocusDepth]
-SCM_EXTENDED_STUDIES = [ExtendedSafranSnowfall, ExtendedCrocusSwe, ExtendedCrocusDepth]
+SCM_EXTENDED_STUDIES = [ExtendedSafranTotalPrecip, ExtendedSafranSnowfall, ExtendedCrocusSwe, ExtendedCrocusDepth]
SCM_STUDY_TO_EXTENDED_STUDY = OrderedDict(zip(SCM_STUDIES, SCM_EXTENDED_STUDIES))
def normal_visualization():
- for study_type in SCM_EXTENDED_STUDIES[1:2]:
+ for study_type in SCM_EXTENDED_STUDIES[:1]:
extended_studies = Studies(study_type)
studies_visualizer = StudiesVisualizer(extended_studies)
studies_visualizer.mean_as_a_function_of_altitude(region_only=True)
--
GitLab