diff --git a/extreme_data/meteo_france_data/adamont_data/adamont_studies.py b/extreme_data/meteo_france_data/adamont_data/adamont_studies.py index 12364ab333e490ec51330b1afdc07f03ad5732b0..fab2b67b73442cf331b6e6b12539b2483bc4d557 100644 --- a/extreme_data/meteo_france_data/adamont_data/adamont_studies.py +++ b/extreme_data/meteo_france_data/adamont_data/adamont_studies.py @@ -7,8 +7,7 @@ from cached_property import cached_property from extreme_data.meteo_france_data.adamont_data.abstract_adamont_study import AbstractAdamontStudy from extreme_data.meteo_france_data.adamont_data.adamont_gcm_rcm_couples import get_gcm_rcm_couple_adamont_to_full_name -from extreme_data.meteo_france_data.adamont_data.adamont_scenario import gcm_rcm_couple_to_full_name, \ - gcm_rcm_couple_to_str, get_color_from_gcm_rcm_couple +from extreme_data.meteo_france_data.adamont_data.adamont_scenario import gcm_rcm_couple_to_str, get_color_from_gcm_rcm_couple from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ SCM_STUDY_CLASS_TO_ABBREVIATION, ADAMONT_STUDY_CLASS_TO_ABBREVIATION diff --git a/projects/projected_snowfall/projected_data/main_projection.py b/projects/projected_snowfall/projected_data/main_projection.py index 14f1a8f1b25961ab9c1fb644accca42c7683cc54..e27dccd6a442a49ceaf4874ef90d195bffeddf95 100644 --- a/projects/projected_snowfall/projected_data/main_projection.py +++ b/projects/projected_snowfall/projected_data/main_projection.py @@ -18,11 +18,11 @@ from projects.projected_snowfall.comparison_with_scm.comparison_historical_visua def main(): - fast = True - adamont_scenario = [AdamontScenario.histo, AdamontScenario.rcp85_extended][0] + fast = None + adamont_scenario = [AdamontScenario.histo, AdamontScenario.rcp85_extended][1] year_min = 1982 if adamont_scenario is AdamontScenario.rcp85_extended else 2006 # Set the year_min and year_max for the comparison - if fast is None: + if fast is True: year_max = [2030][0] massif_names = ['Vanoise'] altitudes = [1800]