diff --git a/experiment/eurocode_data/utils.py b/experiment/eurocode_data/utils.py index 7385d7ff77bc013a2d5707edc9669ecf6989a16e..7bc0287bcafc1da78d0d43918187d181bb015561 100644 --- a/experiment/eurocode_data/utils.py +++ b/experiment/eurocode_data/utils.py @@ -1,6 +1,6 @@ # Eurocode quantile str -EUROCODE_RETURN_LEVEL_STR = '50-year return level of SL (kN $m^-2$)' +EUROCODE_RETURN_LEVEL_STR = '50-year return level of GSL (kN $m^-2$)' # Eurocode quantile correspond to a 50 year return period EUROCODE_QUANTILE = 0.98 # Altitudes (between low and mid altitudes) < 2000m and should be > 200m diff --git a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py index 90dc5297f02a84635777438cac458500438565f2..4c0a1144bc8dc24677daa9775a806948d5e175fa 100644 --- a/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py +++ b/experiment/meteo_france_data/scm_models_data/visualization/study_visualization/study_visualizer.py @@ -639,7 +639,7 @@ class StudyVisualizer(VisualizationParameters): ax.tick_params(axis='both', which='major', labelsize=13) plot_name = 'Annual maxima of {} in {} at {}m'.format(snow_abbreviation, massif_name, altitude) self.plot_name = plot_name - ax.set_ylabel('{} (in {})'.format(snow_abbreviation, self.study.variable_unit), fontsize=15) + ax.set_ylabel('{} ({})'.format(snow_abbreviation, self.study.variable_unit), fontsize=15) ax.set_xlabel('years', fontsize=15) if label is None: ax.set_title('{} at {} m'.format(massif_name, altitude)) diff --git a/experiment/paper_past_snow_loads/data/main_eurocode_plot.py b/experiment/paper_past_snow_loads/data/main_eurocode_plot.py index 5aee137de3c019b0ff247cf468de5d82f2b56355..27094b077b90d57e980b9ffe6a83cbdaa801c266 100644 --- a/experiment/paper_past_snow_loads/data/main_eurocode_plot.py +++ b/experiment/paper_past_snow_loads/data/main_eurocode_plot.py @@ -1,4 +1,5 @@ import matplotlib.pyplot as plt +from copy import deepcopy, copy import numpy as np from experiment.eurocode_data.eurocode_region import C2, E, C1 @@ -16,16 +17,24 @@ def main_eurocode_norms(ax=None): altitudes = np.linspace(200, 2000) for region_class in [C1, C2, E][:]: region_object = region_class() - label = get_display_name_from_object_type(region_class) + ' Eurocode region' + label = get_display_name_from_object_type(region_class) + ' Eurocodes region' linestyle = '--' if region_class == C2 else '-' region_object.plot_eurocode_snow_load_on_ground_characteristic_value_variable_action(ax, altitudes, label=label, linestyle=linestyle) if region_class == E: - ax.legend() ax.xaxis.set_ticks([250 * i for i in range(1, 9)]) ax.tick_params(axis='both', which='major', labelsize=13) ax.set_ylabel(EUROCODE_RETURN_LEVEL_STR) ax.set_xlabel('Altitude (m)') - ax.set_ylim([0.0, 11.0]) + ax.set_ylim([0.0, 12.0]) + ax.set_yticks(list(range(0, 13, 2))) + ax.set_xlim([0, 2000]) + ax.set_xticks(list(range(0, 2001, 500))) + handles, labels = ax.get_legend_handles_labels() + # Copy the handle to not modify the original plot + handle1 = copy(handles[1]) + handle1.set_linestyle('-') + handles[1] = handle1 + ax.legend(handles, labels) ax.grid() plt.show() diff --git a/experiment/paper_past_snow_loads/data/main_example_swe_total_plot.py b/experiment/paper_past_snow_loads/data/main_example_swe_total_plot.py index 1038e7b05136b65c6f9107eee83127908906eead..934ec76bbeab4f050de1f801a5b9ee382e960036 100644 --- a/experiment/paper_past_snow_loads/data/main_example_swe_total_plot.py +++ b/experiment/paper_past_snow_loads/data/main_example_swe_total_plot.py @@ -21,6 +21,8 @@ def max_graph_annual_maxima_poster(): ('mediumpurple', 2700, 'Beaufortain'), ] ax = plt.gca() + ax.set_ylim([0, 20]) + ax.set_yticks(list(range(0, 21, 2))) for color, altitude, massif_name in marker_altitude_massif_name: for study in study_iterator_global([study_class], altitudes=[altitude]): study_visualizer = StudyVisualizer(study, save_to_file=save_to_file,