diff --git a/experiment/meteo_france_SCM_study/crocus/crocus.py b/experiment/meteo_france_SCM_study/crocus/crocus.py index dc0338c9fcd1457f034659c0e4db151fc8f3e371..98084eca108ef31cd95b3f816783a0dc0c233c73 100644 --- a/experiment/meteo_france_SCM_study/crocus/crocus.py +++ b/experiment/meteo_france_SCM_study/crocus/crocus.py @@ -17,7 +17,7 @@ class Crocus(AbstractStudy): @property def variable_name(self): - suffix = '' if self.altitude == 2400 else ' instantaneous data observed sampled every 24 hours' + suffix = '' if self.altitude == 2400 else ' sampled every 24 hours' return super().variable_name + suffix def annual_aggregation_function(self, *args, **kwargs): diff --git a/experiment/meteo_france_SCM_study/visualization/study_visualization/main_study_visualizer.py b/experiment/meteo_france_SCM_study/visualization/study_visualization/main_study_visualizer.py index 422e05bf9d156f9f99dfa541e5348084b2e4fc90..eaf5c6578fb91eec75cb080fae47396e77ef9159 100644 --- a/experiment/meteo_france_SCM_study/visualization/study_visualization/main_study_visualizer.py +++ b/experiment/meteo_france_SCM_study/visualization/study_visualization/main_study_visualizer.py @@ -72,12 +72,12 @@ def normal_visualization(temporal_non_stationarity=False): save_to_file = False only_first_one = True # for study_class in SCM_STUDIES[:1]: - for study_class in [SafranSnowfall, SafranRainfall, SafranTemperature][:1]: + for study_class in [CrocusDepth, SafranSnowfall, SafranRainfall, SafranTemperature][:1]: for study in study_iterator(study_class, only_first_one=only_first_one): study_visualizer = StudyVisualizer(study, save_to_file=save_to_file, temporal_non_stationarity=temporal_non_stationarity) # study_visualizer.visualize_independent_margin_fits(threshold=[None, 20, 40, 60][0]) # study_visualizer.visualize_annual_mean_values() - study_visualizer.visualize_linear_margin_fit(only_first_max_stable=True) + study_visualizer.visualize_linear_margin_fit(only_first_max_stable=None) def complete_analysis(only_first_one=False): @@ -97,7 +97,7 @@ def complete_analysis(only_first_one=False): if __name__ == '__main__': # annual_mean_vizu_compare_durand_study(safran=True, take_mean_value=True, altitude=2400) - normal_visualization(temporal_non_stationarity=False) + # normal_visualization(temporal_non_stationarity=False) # max_stable_process_vizu_compare_gaume_study(altitude=1800, nb_days=1) - # extended_visualization() + extended_visualization() # complete_analysis() diff --git a/experiment/meteo_france_SCM_study/visualization/study_visualization/study_visualizer.py b/experiment/meteo_france_SCM_study/visualization/study_visualization/study_visualizer.py index 67f11692293372a6ff6fa5d163d13c88de1c7ca1..d07642b7bbe13d5286f92204810efe9f24c64e9c 100644 --- a/experiment/meteo_france_SCM_study/visualization/study_visualization/study_visualizer.py +++ b/experiment/meteo_france_SCM_study/visualization/study_visualization/study_visualizer.py @@ -126,8 +126,8 @@ class StudyVisualizer(object): def visualize_all_experimental_law(self): self.visualize_massif_graphs(self.visualize_experimental_law) - self.plot_name = ' Empirical distribution ' - self.plot_name += 'with all available data' if self.year_for_kde_plot is None else \ + self.plot_name = ' Empirical distribution \n' + self.plot_name += 'with data from the 23 mountain chains of the French Alps ' if self.year_for_kde_plot is None else \ 'for the year {}'.format(self.year_for_kde_plot) self.show_or_save_to_file() @@ -194,7 +194,7 @@ class StudyVisualizer(object): # extraticks = [float(float_to_str_with_only_some_significant_digits(x, nb_digits=2)) # for x in sorted_x_levels] # Display only some specific ticks - extraticks_names = ['mean', AbstractParams.QUANTILE_100] + extraticks_names = ['mean', AbstractParams.QUANTILE_10, AbstractParams.QUANTILE_100, 'maxima'] if self.plot_block_maxima_quantiles: extraticks_names += [name for name in name_to_xlevel_and_color.keys() if BLOCK_MAXIMA_DISPLAY_NAME in name] extraticks = [name_to_xlevel_and_color[name][0] for name in extraticks_names]