From 8d3c6bc7bae78d6cdab79f05fdd2fee4e6501ef9 Mon Sep 17 00:00:00 2001 From: Le Roux Erwan <erwan.le-roux@irstea.fr> Date: Thu, 25 Feb 2021 12:48:20 +0100 Subject: [PATCH] [refactor] rename folders for the two first articles --- .../scm_models_data/visualization/main_study_visualizer.py | 2 +- .../study_visualizer_for_non_stationary_trends.py | 2 +- .../__init__.py | 0 .../checks/__init__.py | 0 .../checks/mixed_distribution/mixed_distribution_impact.py | 0 .../checks/qqplot}/__init__.py | 0 .../checks/qqplot/main_qqplot_for_big_shapes.py | 0 .../checks/qqplot/plot_qqplot.py | 2 +- .../checks/uncertainty_interval_size.py | 0 .../checks/without_maximum}/__init__.py | 0 .../checks/without_maximum/main_fit_without_maximum.py | 2 +- .../study_visualizer_for_fit_witout_maximum.py | 0 .../presentation}/__init__.py | 0 .../presentation/accumulation_in_winter.py | 0 .../presentation/main_example_snow_depth_total_plot.py | 2 +- .../presentation/statistical_model.py | 0 .../section_data}/__init__.py | 0 .../section_data/main_eurocode_plot.py | 3 +-- .../section_data/main_example_swe_total_plot.py | 2 +- .../section_discussion}/__init__.py | 0 .../crocus_study_comparison_with_eurocode.py | 0 .../main_comparison_with_eurocode_examples.py | 4 ++-- .../main_comparison_with_eurocode_global.py | 4 ++-- .../main_spatio_temporal_density_wrt_altitude.py | 4 ++-- .../section_results}/__init__.py | 0 .../section_results/main_result_trends_and_return_levels.py | 6 +++--- .../section_results/main_shape_repartition.py | 0 .../section_results/plot_diagnosis_risk.py | 0 .../section_results/plot_selection_curves.py | 2 +- .../section_results/plot_trend_curves.py | 2 +- .../section_results/plot_uncertainty_curves.py | 2 +- .../section_results/plot_uncertainty_histogram.py | 2 +- .../utils.py | 0 .../__init__.py | 0 .../checks}/__init__.py | 0 .../checks/verification_return_level.py | 0 .../section_data_and_results}/__init__.py | 0 .../section_data_and_results}/main_altitudes_studies.py | 0 .../section_data_and_results}/preliminary_analysis.py | 0 .../checks => projected_extreme_snowfall}/__init__.py | 0 .../checks}/__init__.py | 0 .../checks/main_inquiry_weird_pattern.py | 0 .../evaluation}/__init__.py | 0 .../evaluation/comparison_historical_visualizer.py | 0 .../evaluation/comparison_plot.py | 2 +- .../evaluation/main_comparison_on_quantile_period.py | 0 .../evaluation/main_comparison_reanalysis.py | 0 .../main_elevation_temporal_for_projections_ensemble.py | 0 .../projected_extreme_snowfall/section_data}/__init__.py | 0 .../section_data/main_data.py | 2 +- test/test_extreme_trend/test_trend_test.py | 2 +- .../test_past_extreme_ground_snow_loads/__init__.py | 0 .../test_results.py | 0 53 files changed, 23 insertions(+), 24 deletions(-) rename projects/{altitude_spatial_model => past_extreme_ground_snow_loads}/__init__.py (100%) rename projects/{altitude_spatial_model => past_extreme_ground_snow_loads}/checks/__init__.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/checks/mixed_distribution/mixed_distribution_impact.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads/checks/qqplot}/__init__.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/checks/qqplot/main_qqplot_for_big_shapes.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/checks/qqplot/plot_qqplot.py (98%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/checks/uncertainty_interval_size.py (100%) rename projects/{exceeding_snow_loads/checks => past_extreme_ground_snow_loads/checks/without_maximum}/__init__.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/checks/without_maximum/main_fit_without_maximum.py (85%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py (100%) rename projects/{exceeding_snow_loads/checks/qqplot => past_extreme_ground_snow_loads/presentation}/__init__.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/presentation/accumulation_in_winter.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/presentation/main_example_snow_depth_total_plot.py (97%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/presentation/statistical_model.py (100%) rename projects/{exceeding_snow_loads/checks/without_maximum => past_extreme_ground_snow_loads/section_data}/__init__.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_data/main_eurocode_plot.py (95%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_data/main_example_swe_total_plot.py (97%) rename projects/{exceeding_snow_loads/presentation => past_extreme_ground_snow_loads/section_discussion}/__init__.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_discussion/crocus_study_comparison_with_eurocode.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_discussion/main_comparison_with_eurocode_examples.py (94%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_discussion/main_comparison_with_eurocode_global.py (95%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_discussion/main_spatio_temporal_density_wrt_altitude.py (94%) rename projects/{exceeding_snow_loads/section_data => past_extreme_ground_snow_loads/section_results}/__init__.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_results/main_result_trends_and_return_levels.py (93%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_results/main_shape_repartition.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_results/plot_diagnosis_risk.py (100%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_results/plot_selection_curves.py (98%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_results/plot_trend_curves.py (98%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_results/plot_uncertainty_curves.py (99%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/section_results/plot_uncertainty_histogram.py (98%) rename projects/{exceeding_snow_loads => past_extreme_ground_snow_loads}/utils.py (100%) rename projects/{exceeding_snow_loads/section_discussion => past_extreme_snowfall}/__init__.py (100%) rename projects/{exceeding_snow_loads/section_results => past_extreme_snowfall/checks}/__init__.py (100%) rename projects/{altitude_spatial_model => past_extreme_snowfall}/checks/verification_return_level.py (100%) rename projects/{projected_snowfall => past_extreme_snowfall/section_data_and_results}/__init__.py (100%) rename projects/{altitude_spatial_model => past_extreme_snowfall/section_data_and_results}/main_altitudes_studies.py (100%) rename projects/{altitude_spatial_model => past_extreme_snowfall/section_data_and_results}/preliminary_analysis.py (100%) rename projects/{projected_snowfall/checks => projected_extreme_snowfall}/__init__.py (100%) rename projects/{projected_snowfall/evaluation => projected_extreme_snowfall/checks}/__init__.py (100%) rename projects/{projected_snowfall => projected_extreme_snowfall}/checks/main_inquiry_weird_pattern.py (100%) rename projects/{projected_snowfall/section_data => projected_extreme_snowfall/evaluation}/__init__.py (100%) rename projects/{projected_snowfall => projected_extreme_snowfall}/evaluation/comparison_historical_visualizer.py (100%) rename projects/{projected_snowfall => projected_extreme_snowfall}/evaluation/comparison_plot.py (98%) rename projects/{projected_snowfall => projected_extreme_snowfall}/evaluation/main_comparison_on_quantile_period.py (100%) rename projects/{projected_snowfall => projected_extreme_snowfall}/evaluation/main_comparison_reanalysis.py (100%) rename projects/{projected_snowfall => projected_extreme_snowfall}/main_elevation_temporal_for_projections_ensemble.py (100%) rename {test/test_projects/test_exceeding_snow_loads => projects/projected_extreme_snowfall/section_data}/__init__.py (100%) rename projects/{projected_snowfall => projected_extreme_snowfall}/section_data/main_data.py (95%) create mode 100644 test/test_projects/test_past_extreme_ground_snow_loads/__init__.py rename test/test_projects/{test_exceeding_snow_loads => test_past_extreme_ground_snow_loads}/test_results.py (100%) diff --git a/extreme_data/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py b/extreme_data/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py index 9130c65c..c6899e4d 100644 --- a/extreme_data/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py +++ b/extreme_data/meteo_france_data/scm_models_data/visualization/main_study_visualizer.py @@ -25,7 +25,7 @@ from extreme_data.meteo_france_data.scm_models_data.safran.safran_max_snowf impo from extreme_data.meteo_france_data.scm_models_data.safran.safran_variable import SafranSnowfallVariableCenterOnDay from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer -from projects.exceeding_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \ +from projects.past_extreme_ground_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \ CrocusDifferenceSnowLoad, \ CrocusSnowDensityAtMaxofSwe, CrocusDifferenceSnowLoadRescaledAndEurocodeToSeeSynchronization, \ CrocusSnowDepthDifference, CrocusSnowDepthAtMaxofSwe diff --git a/extreme_trend/trend_test/visualizers/study_visualizer_for_non_stationary_trends.py b/extreme_trend/trend_test/visualizers/study_visualizer_for_non_stationary_trends.py index 0222959b..431d78a5 100644 --- a/extreme_trend/trend_test/visualizers/study_visualizer_for_non_stationary_trends.py +++ b/extreme_trend/trend_test/visualizers/study_visualizer_for_non_stationary_trends.py @@ -17,7 +17,7 @@ from extreme_data.meteo_france_data.scm_models_data.abstract_extended_study impo from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer -from projects.exceeding_snow_loads.utils import NON_STATIONARY_TREND_TEST_PAPER_1, ALTITUDE_TO_GREY_MASSIF +from projects.past_extreme_ground_snow_loads.utils import NON_STATIONARY_TREND_TEST_PAPER_1, ALTITUDE_TO_GREY_MASSIF from extreme_trend.trend_test.abstract_gev_trend_test import AbstractGevTrendTest from extreme_fit.model.margin_model.utils import \ MarginFitMethod diff --git a/projects/altitude_spatial_model/__init__.py b/projects/past_extreme_ground_snow_loads/__init__.py similarity index 100% rename from projects/altitude_spatial_model/__init__.py rename to projects/past_extreme_ground_snow_loads/__init__.py diff --git a/projects/altitude_spatial_model/checks/__init__.py b/projects/past_extreme_ground_snow_loads/checks/__init__.py similarity index 100% rename from projects/altitude_spatial_model/checks/__init__.py rename to projects/past_extreme_ground_snow_loads/checks/__init__.py diff --git a/projects/exceeding_snow_loads/checks/mixed_distribution/mixed_distribution_impact.py b/projects/past_extreme_ground_snow_loads/checks/mixed_distribution/mixed_distribution_impact.py similarity index 100% rename from projects/exceeding_snow_loads/checks/mixed_distribution/mixed_distribution_impact.py rename to projects/past_extreme_ground_snow_loads/checks/mixed_distribution/mixed_distribution_impact.py diff --git a/projects/exceeding_snow_loads/__init__.py b/projects/past_extreme_ground_snow_loads/checks/qqplot/__init__.py similarity index 100% rename from projects/exceeding_snow_loads/__init__.py rename to projects/past_extreme_ground_snow_loads/checks/qqplot/__init__.py diff --git a/projects/exceeding_snow_loads/checks/qqplot/main_qqplot_for_big_shapes.py b/projects/past_extreme_ground_snow_loads/checks/qqplot/main_qqplot_for_big_shapes.py similarity index 100% rename from projects/exceeding_snow_loads/checks/qqplot/main_qqplot_for_big_shapes.py rename to projects/past_extreme_ground_snow_loads/checks/qqplot/main_qqplot_for_big_shapes.py diff --git a/projects/exceeding_snow_loads/checks/qqplot/plot_qqplot.py b/projects/past_extreme_ground_snow_loads/checks/qqplot/plot_qqplot.py similarity index 98% rename from projects/exceeding_snow_loads/checks/qqplot/plot_qqplot.py rename to projects/past_extreme_ground_snow_loads/checks/qqplot/plot_qqplot.py index 0d5edcd0..8b828184 100644 --- a/projects/exceeding_snow_loads/checks/qqplot/plot_qqplot.py +++ b/projects/past_extreme_ground_snow_loads/checks/qqplot/plot_qqplot.py @@ -14,7 +14,7 @@ from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extra from extreme_trend.trend_test.visualizers import \ StudyVisualizerForNonStationaryTrends from extreme_fit.distribution.gev.gev_params import GevParams -from projects.exceeding_snow_loads.section_data.main_example_swe_total_plot import tuples_for_examples_paper1 +from projects.past_extreme_ground_snow_loads.section_data.main_example_swe_total_plot import tuples_for_examples_paper1 def extract_time_serimes_with_worst_number_of_zeros(altitude_to_visualizer, nb_worst_examples): diff --git a/projects/exceeding_snow_loads/checks/uncertainty_interval_size.py b/projects/past_extreme_ground_snow_loads/checks/uncertainty_interval_size.py similarity index 100% rename from projects/exceeding_snow_loads/checks/uncertainty_interval_size.py rename to projects/past_extreme_ground_snow_loads/checks/uncertainty_interval_size.py diff --git a/projects/exceeding_snow_loads/checks/__init__.py b/projects/past_extreme_ground_snow_loads/checks/without_maximum/__init__.py similarity index 100% rename from projects/exceeding_snow_loads/checks/__init__.py rename to projects/past_extreme_ground_snow_loads/checks/without_maximum/__init__.py diff --git a/projects/exceeding_snow_loads/checks/without_maximum/main_fit_without_maximum.py b/projects/past_extreme_ground_snow_loads/checks/without_maximum/main_fit_without_maximum.py similarity index 85% rename from projects/exceeding_snow_loads/checks/without_maximum/main_fit_without_maximum.py rename to projects/past_extreme_ground_snow_loads/checks/without_maximum/main_fit_without_maximum.py index 7de55d1b..b80b9246 100644 --- a/projects/exceeding_snow_loads/checks/without_maximum/main_fit_without_maximum.py +++ b/projects/past_extreme_ground_snow_loads/checks/without_maximum/main_fit_without_maximum.py @@ -3,7 +3,7 @@ from typing import Dict from extreme_data.meteo_france_data.scm_models_data.crocus.crocus import CrocusSnowLoadTotal from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_visualizer import \ ALL_ALTITUDES_WITHOUT_NAN -from projects.exceeding_snow_loads.check_mle_convergence_for_trends.without_maximum.study_visualizer_for_fit_witout_maximum import \ +from projects.past_extreme_ground_snow_loads.check_mle_convergence_for_trends.without_maximum.study_visualizer_for_fit_witout_maximum import \ StudyVisualizerForFitWithoutMaximum diff --git a/projects/exceeding_snow_loads/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py b/projects/past_extreme_ground_snow_loads/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py similarity index 100% rename from projects/exceeding_snow_loads/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py rename to projects/past_extreme_ground_snow_loads/checks/without_maximum/study_visualizer_for_fit_witout_maximum.py diff --git a/projects/exceeding_snow_loads/checks/qqplot/__init__.py b/projects/past_extreme_ground_snow_loads/presentation/__init__.py similarity index 100% rename from projects/exceeding_snow_loads/checks/qqplot/__init__.py rename to projects/past_extreme_ground_snow_loads/presentation/__init__.py diff --git a/projects/exceeding_snow_loads/presentation/accumulation_in_winter.py b/projects/past_extreme_ground_snow_loads/presentation/accumulation_in_winter.py similarity index 100% rename from projects/exceeding_snow_loads/presentation/accumulation_in_winter.py rename to projects/past_extreme_ground_snow_loads/presentation/accumulation_in_winter.py diff --git a/projects/exceeding_snow_loads/presentation/main_example_snow_depth_total_plot.py b/projects/past_extreme_ground_snow_loads/presentation/main_example_snow_depth_total_plot.py similarity index 97% rename from projects/exceeding_snow_loads/presentation/main_example_snow_depth_total_plot.py rename to projects/past_extreme_ground_snow_loads/presentation/main_example_snow_depth_total_plot.py index 35391836..e585e44f 100644 --- a/projects/exceeding_snow_loads/presentation/main_example_snow_depth_total_plot.py +++ b/projects/past_extreme_ground_snow_loads/presentation/main_example_snow_depth_total_plot.py @@ -5,7 +5,7 @@ from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_vis study_iterator_global, SCM_STUDY_CLASS_TO_ABBREVIATION from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer -from projects.exceeding_snow_loads.utils import dpi_paper1_figure +from projects.past_extreme_ground_snow_loads.utils import dpi_paper1_figure def tuples_for_examples_paper1(examples_for_the_paper=True): diff --git a/projects/exceeding_snow_loads/presentation/statistical_model.py b/projects/past_extreme_ground_snow_loads/presentation/statistical_model.py similarity index 100% rename from projects/exceeding_snow_loads/presentation/statistical_model.py rename to projects/past_extreme_ground_snow_loads/presentation/statistical_model.py diff --git a/projects/exceeding_snow_loads/checks/without_maximum/__init__.py b/projects/past_extreme_ground_snow_loads/section_data/__init__.py similarity index 100% rename from projects/exceeding_snow_loads/checks/without_maximum/__init__.py rename to projects/past_extreme_ground_snow_loads/section_data/__init__.py diff --git a/projects/exceeding_snow_loads/section_data/main_eurocode_plot.py b/projects/past_extreme_ground_snow_loads/section_data/main_eurocode_plot.py similarity index 95% rename from projects/exceeding_snow_loads/section_data/main_eurocode_plot.py rename to projects/past_extreme_ground_snow_loads/section_data/main_eurocode_plot.py index 850d0915..48495071 100644 --- a/projects/exceeding_snow_loads/section_data/main_eurocode_plot.py +++ b/projects/past_extreme_ground_snow_loads/section_data/main_eurocode_plot.py @@ -1,8 +1,7 @@ import matplotlib.pyplot as plt -from copy import deepcopy, copy import numpy as np -from extreme_data.eurocode_data.eurocode_region import C2, E, C1, C +from extreme_data.eurocode_data.eurocode_region import E, C from extreme_data.eurocode_data.massif_name_to_departement import massif_name_to_eurocode_region from extreme_data.eurocode_data.utils import EUROCODE_RETURN_LEVEL_STR from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy diff --git a/projects/exceeding_snow_loads/section_data/main_example_swe_total_plot.py b/projects/past_extreme_ground_snow_loads/section_data/main_example_swe_total_plot.py similarity index 97% rename from projects/exceeding_snow_loads/section_data/main_example_swe_total_plot.py rename to projects/past_extreme_ground_snow_loads/section_data/main_example_swe_total_plot.py index 4f9760fc..b788dc35 100644 --- a/projects/exceeding_snow_loads/section_data/main_example_swe_total_plot.py +++ b/projects/past_extreme_ground_snow_loads/section_data/main_example_swe_total_plot.py @@ -5,7 +5,7 @@ from extreme_data.meteo_france_data.scm_models_data.visualization.main_study_vis study_iterator_global, SCM_STUDY_CLASS_TO_ABBREVIATION from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualizer import \ StudyVisualizer -from projects.exceeding_snow_loads.utils import dpi_paper1_figure +from projects.past_extreme_ground_snow_loads.utils import dpi_paper1_figure def tuples_for_examples_paper1(examples_for_the_paper=True): diff --git a/projects/exceeding_snow_loads/presentation/__init__.py b/projects/past_extreme_ground_snow_loads/section_discussion/__init__.py similarity index 100% rename from projects/exceeding_snow_loads/presentation/__init__.py rename to projects/past_extreme_ground_snow_loads/section_discussion/__init__.py diff --git a/projects/exceeding_snow_loads/section_discussion/crocus_study_comparison_with_eurocode.py b/projects/past_extreme_ground_snow_loads/section_discussion/crocus_study_comparison_with_eurocode.py similarity index 100% rename from projects/exceeding_snow_loads/section_discussion/crocus_study_comparison_with_eurocode.py rename to projects/past_extreme_ground_snow_loads/section_discussion/crocus_study_comparison_with_eurocode.py diff --git a/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py b/projects/past_extreme_ground_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py similarity index 94% rename from projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py rename to projects/past_extreme_ground_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py index c8ec04ef..de8281f1 100644 --- a/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py +++ b/projects/past_extreme_ground_snow_loads/section_discussion/main_comparison_with_eurocode_examples.py @@ -7,10 +7,10 @@ from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualiz StudyVisualizer import matplotlib.pyplot as plt -from projects.exceeding_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \ +from projects.past_extreme_ground_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \ CrocusDifferenceSnowLoad, \ CrocusSnowDensityAtMaxofSwe, CrocusSnowDepthDifference -from projects.exceeding_snow_loads.utils import dpi_paper1_figure +from projects.past_extreme_ground_snow_loads.utils import dpi_paper1_figure def max_graph_annual_maxima_comparison(): diff --git a/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_global.py b/projects/past_extreme_ground_snow_loads/section_discussion/main_comparison_with_eurocode_global.py similarity index 95% rename from projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_global.py rename to projects/past_extreme_ground_snow_loads/section_discussion/main_comparison_with_eurocode_global.py index 1d09d8ef..9ee50a2d 100644 --- a/projects/exceeding_snow_loads/section_discussion/main_comparison_with_eurocode_global.py +++ b/projects/past_extreme_ground_snow_loads/section_discussion/main_comparison_with_eurocode_global.py @@ -4,10 +4,10 @@ from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualiz StudyVisualizer import matplotlib.pyplot as plt -from projects.exceeding_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \ +from projects.past_extreme_ground_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \ CrocusDifferenceSnowLoad, \ CrocusSnowDensityAtMaxofSwe, CrocusSnowDepthDifference -from projects.exceeding_snow_loads.utils import dpi_paper1_figure +from projects.past_extreme_ground_snow_loads.utils import dpi_paper1_figure def max_graph_annual_maxima_comparison(): diff --git a/projects/exceeding_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py b/projects/past_extreme_ground_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py similarity index 94% rename from projects/exceeding_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py rename to projects/past_extreme_ground_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py index 975a9e68..b04b299a 100644 --- a/projects/exceeding_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py +++ b/projects/past_extreme_ground_snow_loads/section_discussion/main_spatio_temporal_density_wrt_altitude.py @@ -4,9 +4,9 @@ from extreme_data.meteo_france_data.scm_models_data.visualization.study_visualiz StudyVisualizer import matplotlib.pyplot as plt -from projects.exceeding_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \ +from projects.past_extreme_ground_snow_loads.section_discussion.crocus_study_comparison_with_eurocode import \ CrocusSnowDensityAtMaxofSwe -from projects.exceeding_snow_loads.utils import dpi_paper1_figure +from projects.past_extreme_ground_snow_loads.utils import dpi_paper1_figure def density_wrt_altitude(): diff --git a/projects/exceeding_snow_loads/section_data/__init__.py b/projects/past_extreme_ground_snow_loads/section_results/__init__.py similarity index 100% rename from projects/exceeding_snow_loads/section_data/__init__.py rename to projects/past_extreme_ground_snow_loads/section_results/__init__.py diff --git a/projects/exceeding_snow_loads/section_results/main_result_trends_and_return_levels.py b/projects/past_extreme_ground_snow_loads/section_results/main_result_trends_and_return_levels.py similarity index 93% rename from projects/exceeding_snow_loads/section_results/main_result_trends_and_return_levels.py rename to projects/past_extreme_ground_snow_loads/section_results/main_result_trends_and_return_levels.py index 74e3698c..4d6a17ef 100644 --- a/projects/exceeding_snow_loads/section_results/main_result_trends_and_return_levels.py +++ b/projects/past_extreme_ground_snow_loads/section_results/main_result_trends_and_return_levels.py @@ -2,8 +2,8 @@ from multiprocessing.pool import Pool import matplotlib as mpl -from projects.exceeding_snow_loads.section_results.plot_trend_curves import plot_trend_map, plot_trend_curves -from projects.exceeding_snow_loads.section_results.plot_uncertainty_histogram import plot_uncertainty_histogram +from projects.past_extreme_ground_snow_loads.section_results.plot_trend_curves import plot_trend_map, plot_trend_curves +from projects.past_extreme_ground_snow_loads.section_results.plot_uncertainty_histogram import plot_uncertainty_histogram mpl.rcParams['text.usetex'] = True mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}'] @@ -14,7 +14,7 @@ from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_int from extreme_trend.trend_test.visualizers import \ StudyVisualizerForNonStationaryTrends, ModelSubsetForUncertainty from extreme_trend.trend_test.visualizers import load_altitude_to_visualizer -from projects.exceeding_snow_loads.utils import paper_study_classes, paper_altitudes +from projects.past_extreme_ground_snow_loads.utils import paper_study_classes, paper_altitudes from root_utils import NB_CORES diff --git a/projects/exceeding_snow_loads/section_results/main_shape_repartition.py b/projects/past_extreme_ground_snow_loads/section_results/main_shape_repartition.py similarity index 100% rename from projects/exceeding_snow_loads/section_results/main_shape_repartition.py rename to projects/past_extreme_ground_snow_loads/section_results/main_shape_repartition.py diff --git a/projects/exceeding_snow_loads/section_results/plot_diagnosis_risk.py b/projects/past_extreme_ground_snow_loads/section_results/plot_diagnosis_risk.py similarity index 100% rename from projects/exceeding_snow_loads/section_results/plot_diagnosis_risk.py rename to projects/past_extreme_ground_snow_loads/section_results/plot_diagnosis_risk.py diff --git a/projects/exceeding_snow_loads/section_results/plot_selection_curves.py b/projects/past_extreme_ground_snow_loads/section_results/plot_selection_curves.py similarity index 98% rename from projects/exceeding_snow_loads/section_results/plot_selection_curves.py rename to projects/past_extreme_ground_snow_loads/section_results/plot_selection_curves.py index 7800af22..9439f2ab 100644 --- a/projects/exceeding_snow_loads/section_results/plot_selection_curves.py +++ b/projects/past_extreme_ground_snow_loads/section_results/plot_selection_curves.py @@ -2,7 +2,7 @@ from typing import Dict import matplotlib.pyplot as plt from extreme_data.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes -from projects.exceeding_snow_loads.utils import dpi_paper1_figure, get_trend_test_name +from projects.past_extreme_ground_snow_loads.utils import dpi_paper1_figure, get_trend_test_name from extreme_trend.trend_test.visualizers import StudyVisualizerForNonStationaryTrends diff --git a/projects/exceeding_snow_loads/section_results/plot_trend_curves.py b/projects/past_extreme_ground_snow_loads/section_results/plot_trend_curves.py similarity index 98% rename from projects/exceeding_snow_loads/section_results/plot_trend_curves.py rename to projects/past_extreme_ground_snow_loads/section_results/plot_trend_curves.py index d205aff0..9411932b 100644 --- a/projects/exceeding_snow_loads/section_results/plot_trend_curves.py +++ b/projects/past_extreme_ground_snow_loads/section_results/plot_trend_curves.py @@ -3,7 +3,7 @@ import matplotlib.pyplot as plt from extreme_data.meteo_france_data.scm_models_data.abstract_extended_study import AbstractExtendedStudy from extreme_data.meteo_france_data.scm_models_data.visualization.utils import create_adjusted_axes -from projects.exceeding_snow_loads.utils import dpi_paper1_figure +from projects.past_extreme_ground_snow_loads.utils import dpi_paper1_figure from extreme_trend.trend_test.visualizers import \ StudyVisualizerForNonStationaryTrends diff --git a/projects/exceeding_snow_loads/section_results/plot_uncertainty_curves.py b/projects/past_extreme_ground_snow_loads/section_results/plot_uncertainty_curves.py similarity index 99% rename from projects/exceeding_snow_loads/section_results/plot_uncertainty_curves.py rename to projects/past_extreme_ground_snow_loads/section_results/plot_uncertainty_curves.py index 66677150..07ea40a3 100644 --- a/projects/exceeding_snow_loads/section_results/plot_uncertainty_curves.py +++ b/projects/past_extreme_ground_snow_loads/section_results/plot_uncertainty_curves.py @@ -11,7 +11,7 @@ import numpy as np from extreme_data.eurocode_data.utils import EUROCODE_RETURN_LEVEL_STR, EUROCODE_ALTITUDES, \ YEAR_OF_INTEREST_FOR_RETURN_LEVEL from extreme_data.meteo_france_data.scm_models_data.abstract_study import AbstractStudy -from projects.exceeding_snow_loads.utils import dpi_paper1_figure +from projects.past_extreme_ground_snow_loads.utils import dpi_paper1_figure from extreme_trend.trend_test.visualizers import \ StudyVisualizerForNonStationaryTrends, ModelSubsetForUncertainty from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \ diff --git a/projects/exceeding_snow_loads/section_results/plot_uncertainty_histogram.py b/projects/past_extreme_ground_snow_loads/section_results/plot_uncertainty_histogram.py similarity index 98% rename from projects/exceeding_snow_loads/section_results/plot_uncertainty_histogram.py rename to projects/past_extreme_ground_snow_loads/section_results/plot_uncertainty_histogram.py index 4dd896b3..1e173a92 100644 --- a/projects/exceeding_snow_loads/section_results/plot_uncertainty_histogram.py +++ b/projects/past_extreme_ground_snow_loads/section_results/plot_uncertainty_histogram.py @@ -5,7 +5,7 @@ import numpy as np from extreme_data.eurocode_data.utils import EUROCODE_ALTITUDES from extreme_fit.model.result_from_model_fit.result_from_extremes.abstract_extract_eurocode_return_level import \ AbstractExtractEurocodeReturnLevel -from projects.exceeding_snow_loads.utils import dpi_paper1_figure +from projects.past_extreme_ground_snow_loads.utils import dpi_paper1_figure from extreme_trend.trend_test.visualizers import \ StudyVisualizerForNonStationaryTrends from extreme_fit.model.result_from_model_fit.result_from_extremes.confidence_interval_method import ci_method_to_color, \ diff --git a/projects/exceeding_snow_loads/utils.py b/projects/past_extreme_ground_snow_loads/utils.py similarity index 100% rename from projects/exceeding_snow_loads/utils.py rename to projects/past_extreme_ground_snow_loads/utils.py diff --git a/projects/exceeding_snow_loads/section_discussion/__init__.py b/projects/past_extreme_snowfall/__init__.py similarity index 100% rename from projects/exceeding_snow_loads/section_discussion/__init__.py rename to projects/past_extreme_snowfall/__init__.py diff --git a/projects/exceeding_snow_loads/section_results/__init__.py b/projects/past_extreme_snowfall/checks/__init__.py similarity index 100% rename from projects/exceeding_snow_loads/section_results/__init__.py rename to projects/past_extreme_snowfall/checks/__init__.py diff --git a/projects/altitude_spatial_model/checks/verification_return_level.py b/projects/past_extreme_snowfall/checks/verification_return_level.py similarity index 100% rename from projects/altitude_spatial_model/checks/verification_return_level.py rename to projects/past_extreme_snowfall/checks/verification_return_level.py diff --git a/projects/projected_snowfall/__init__.py b/projects/past_extreme_snowfall/section_data_and_results/__init__.py similarity index 100% rename from projects/projected_snowfall/__init__.py rename to projects/past_extreme_snowfall/section_data_and_results/__init__.py diff --git a/projects/altitude_spatial_model/main_altitudes_studies.py b/projects/past_extreme_snowfall/section_data_and_results/main_altitudes_studies.py similarity index 100% rename from projects/altitude_spatial_model/main_altitudes_studies.py rename to projects/past_extreme_snowfall/section_data_and_results/main_altitudes_studies.py diff --git a/projects/altitude_spatial_model/preliminary_analysis.py b/projects/past_extreme_snowfall/section_data_and_results/preliminary_analysis.py similarity index 100% rename from projects/altitude_spatial_model/preliminary_analysis.py rename to projects/past_extreme_snowfall/section_data_and_results/preliminary_analysis.py diff --git a/projects/projected_snowfall/checks/__init__.py b/projects/projected_extreme_snowfall/__init__.py similarity index 100% rename from projects/projected_snowfall/checks/__init__.py rename to projects/projected_extreme_snowfall/__init__.py diff --git a/projects/projected_snowfall/evaluation/__init__.py b/projects/projected_extreme_snowfall/checks/__init__.py similarity index 100% rename from projects/projected_snowfall/evaluation/__init__.py rename to projects/projected_extreme_snowfall/checks/__init__.py diff --git a/projects/projected_snowfall/checks/main_inquiry_weird_pattern.py b/projects/projected_extreme_snowfall/checks/main_inquiry_weird_pattern.py similarity index 100% rename from projects/projected_snowfall/checks/main_inquiry_weird_pattern.py rename to projects/projected_extreme_snowfall/checks/main_inquiry_weird_pattern.py diff --git a/projects/projected_snowfall/section_data/__init__.py b/projects/projected_extreme_snowfall/evaluation/__init__.py similarity index 100% rename from projects/projected_snowfall/section_data/__init__.py rename to projects/projected_extreme_snowfall/evaluation/__init__.py diff --git a/projects/projected_snowfall/evaluation/comparison_historical_visualizer.py b/projects/projected_extreme_snowfall/evaluation/comparison_historical_visualizer.py similarity index 100% rename from projects/projected_snowfall/evaluation/comparison_historical_visualizer.py rename to projects/projected_extreme_snowfall/evaluation/comparison_historical_visualizer.py diff --git a/projects/projected_snowfall/evaluation/comparison_plot.py b/projects/projected_extreme_snowfall/evaluation/comparison_plot.py similarity index 98% rename from projects/projected_snowfall/evaluation/comparison_plot.py rename to projects/projected_extreme_snowfall/evaluation/comparison_plot.py index 7572e4b9..afce2c2e 100644 --- a/projects/projected_snowfall/evaluation/comparison_plot.py +++ b/projects/projected_extreme_snowfall/evaluation/comparison_plot.py @@ -9,7 +9,7 @@ from matplotlib.lines import Line2D from extreme_data.meteo_france_data.adamont_data.adamont_gcm_rcm_couples import gcm_rcm_couple_to_color from extreme_data.meteo_france_data.adamont_data.adamont_scenario import gcm_rcm_couple_to_str, \ scenario_to_str -from projects.projected_snowfall.evaluation.comparison_historical_visualizer import \ +from projects.projected_extreme_snowfall.evaluation.comparison_historical_visualizer import \ ComparisonHistoricalVisualizer diff --git a/projects/projected_snowfall/evaluation/main_comparison_on_quantile_period.py b/projects/projected_extreme_snowfall/evaluation/main_comparison_on_quantile_period.py similarity index 100% rename from projects/projected_snowfall/evaluation/main_comparison_on_quantile_period.py rename to projects/projected_extreme_snowfall/evaluation/main_comparison_on_quantile_period.py diff --git a/projects/projected_snowfall/evaluation/main_comparison_reanalysis.py b/projects/projected_extreme_snowfall/evaluation/main_comparison_reanalysis.py similarity index 100% rename from projects/projected_snowfall/evaluation/main_comparison_reanalysis.py rename to projects/projected_extreme_snowfall/evaluation/main_comparison_reanalysis.py diff --git a/projects/projected_snowfall/main_elevation_temporal_for_projections_ensemble.py b/projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py similarity index 100% rename from projects/projected_snowfall/main_elevation_temporal_for_projections_ensemble.py rename to projects/projected_extreme_snowfall/main_elevation_temporal_for_projections_ensemble.py diff --git a/test/test_projects/test_exceeding_snow_loads/__init__.py b/projects/projected_extreme_snowfall/section_data/__init__.py similarity index 100% rename from test/test_projects/test_exceeding_snow_loads/__init__.py rename to projects/projected_extreme_snowfall/section_data/__init__.py diff --git a/projects/projected_snowfall/section_data/main_data.py b/projects/projected_extreme_snowfall/section_data/main_data.py similarity index 95% rename from projects/projected_snowfall/section_data/main_data.py rename to projects/projected_extreme_snowfall/section_data/main_data.py index a2fd78cd..4bb24359 100644 --- a/projects/projected_snowfall/section_data/main_data.py +++ b/projects/projected_extreme_snowfall/section_data/main_data.py @@ -7,7 +7,7 @@ mpl.rcParams['text.usetex'] = True mpl.rcParams['text.latex.preamble'] = [r'\usepackage{amsmath}'] import matplotlib.pyplot as plt -from projects.projected_snowfall.evaluation.comparison_plot import individual_plot +from projects.projected_extreme_snowfall.evaluation.comparison_plot import individual_plot from extreme_data.meteo_france_data.adamont_data.adamont.adamont_snowfall import AdamontSnowfall from extreme_data.meteo_france_data.adamont_data.adamont_scenario import AdamontScenario, get_gcm_rcm_couples, \ diff --git a/test/test_extreme_trend/test_trend_test.py b/test/test_extreme_trend/test_trend_test.py index adcd8ca9..e04f5228 100644 --- a/test/test_extreme_trend/test_trend_test.py +++ b/test/test_extreme_trend/test_trend_test.py @@ -2,7 +2,7 @@ import unittest from extreme_fit.distribution.gev.gev_params import GevParams from extreme_trend.trend_test.trend_test_one_parameter.gumbel_trend_test_one_parameter import GumbelVersusGumbel -from projects.exceeding_snow_loads.utils import NON_STATIONARY_TREND_TEST_PAPER_1 +from projects.past_extreme_ground_snow_loads.utils import NON_STATIONARY_TREND_TEST_PAPER_1 class TestTrendAnalysis(unittest.TestCase): diff --git a/test/test_projects/test_past_extreme_ground_snow_loads/__init__.py b/test/test_projects/test_past_extreme_ground_snow_loads/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/test/test_projects/test_exceeding_snow_loads/test_results.py b/test/test_projects/test_past_extreme_ground_snow_loads/test_results.py similarity index 100% rename from test/test_projects/test_exceeding_snow_loads/test_results.py rename to test/test_projects/test_past_extreme_ground_snow_loads/test_results.py -- GitLab