diff --git a/experiment/paper_past_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py b/experiment/paper_past_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py index f86d97aac1770497c5eb409030435ed2565d9bc6..93bd053fe876feb362072c5a425fa8d37c7ef2a1 100644 --- a/experiment/paper_past_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py +++ b/experiment/paper_past_snow_loads/result_trends_and_return_levels/main_result_trends_and_return_levels.py @@ -1,6 +1,8 @@ import matplotlib as mpl import matplotlib.pyplot as plt +from experiment.meteo_france_data.scm_models_data.visualization.study_visualization.main_study_visualizer import \ + ALL_ALTITUDES_WITHOUT_NAN from experiment.paper_past_snow_loads.paper_utils import paper_study_classes, paper_altitudes, \ load_altitude_to_visualizer from experiment.paper_past_snow_loads.result_trends_and_return_levels.eurocode_visualizer import \ @@ -17,9 +19,10 @@ mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}'] def minor_result(altitude): """Plot trends for a single altitude to be fast""" - visualizer = StudyVisualizerForNonStationaryTrends(CrocusSnowLoadTotal(altitude=altitude), multiprocessing=True) + visualizer = StudyVisualizerForNonStationaryTrends(CrocusSnowLoadTotal(altitude=altitude), multiprocessing=True, + ) visualizer.plot_trends() - plt.show() + # plt.show() def intermediate_result(altitudes, massif_names=None, @@ -59,8 +62,9 @@ def major_result(): if __name__ == '__main__': # major_result() - # intermediate_result(paper_altitudes) - minor_result(altitude=600) + # intermediate_result(ALL_ALTITUDES_WITHOUT_NAN) + intermediate_result(paper_altitudes) + # minor_result(altitude=600) # intermediate_result(altitudes=[1500, 1800], massif_names=['Chartreuse'], # uncertainty_methods=[ConfidenceIntervalMethodFromExtremes.ci_mle, # ConfidenceIntervalMethodFromExtremes.ci_bayes], diff --git a/experiment/paper_past_snow_loads/study_visualizer_for_non_stationary_trends.py b/experiment/paper_past_snow_loads/study_visualizer_for_non_stationary_trends.py index 57d8456a3704339e7c14511eb55bd8a3c2ce93c5..39bc7ca2d726b0283c84e9556d69cfc626c1ba79 100644 --- a/experiment/paper_past_snow_loads/study_visualizer_for_non_stationary_trends.py +++ b/experiment/paper_past_snow_loads/study_visualizer_for_non_stationary_trends.py @@ -116,17 +116,22 @@ class StudyVisualizerForNonStationaryTrends(StudyVisualizer): def plot_trends(self, max_abs_tdrl=None): if max_abs_tdrl is not None: self.global_max_abs_tdrl = max_abs_tdrl - self.study.visualize_study(massif_name_to_value=self.massif_name_to_tdrl_value, - replace_blue_by_white=False, axis_off=False, show_label=False, + ax = self.study.visualize_study(massif_name_to_value=self.massif_name_to_tdrl_value, + replace_blue_by_white=False, + axis_off=False, show_label=False, add_colorbar=True, massif_name_to_marker_style=self.massif_name_to_marker_style, massif_name_to_color=self.massif_name_to_tdrl_color, cmap=self.cmap, - show=self.show, + show=False, ticks_values_and_labels=self.ticks_values_and_labels, label=self.label_tdrl_bar + ' for {}'.format(EUROCODE_RETURN_LEVEL_STR)) + ax.get_xaxis().set_visible(True) + ax.set_xticks([]) + ax.set_xlabel('Altitude = {}m'.format(self.study.altitude), fontsize=12) + self.plot_name = 'tdlr_trends' - self.show_or_save_to_file(add_classic_title=False, tight_layout=False, no_title=True) + self.show_or_save_to_file(add_classic_title=False, tight_layout=True, no_title=True) plt.close() @property