diff --git a/experiment/meteo_france_SCM_study/crocus/crocus.py b/experiment/meteo_france_SCM_study/crocus/crocus.py index 3b8871460943792b2ef2591747102c602570f73d..0390e08d951fa2814f95973fa702c43d7f73e38e 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 2cbca4fda4931aa0d2976c70d64a47e414222e77..a5c1b30d77fb3aa10e8b2e359f69380e3702f7f8 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 08f3634712843270e5667d81e2c55aad38aa02c7..861cf404a73730de86007663a833035a662915dc 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)