Skip to content

Commit 8045270

Browse files
yyplantonyyplanton
committed
obs2obs updated
1 parent 6103794 commit 8045270

10 files changed

+55
-52
lines changed

‎scripts/driver_plot_correlation.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,26 @@
4444
# If set to False, all members will be used and the metric values computed for all members of each model will be
4545
# averaged
4646
first_member = True # False #
47-
# computation version, 'v20200427' is provided with the package
48-
version = "v20200427"
47+
# computation version, 'v20200427' for models and 'v20201231' for obs are provided with the package
48+
version_mod = "v20200427"
49+
version_obs = "v20201231"
4950
# json files
5051
dict_json = {
5152
"CMIP5": {
52-
"ENSO_perf": "share/EnsoMetrics/cmip5_historical_ENSO_perf_" + version + "_allModels_allRuns.json",
53-
"ENSO_proc": "share/EnsoMetrics/cmip5_historical_ENSO_proc_" + version + "_allModels_allRuns.json",
54-
"ENSO_tel": "share/EnsoMetrics/cmip5_historical_ENSO_tel_" + version + "_allModels_allRuns.json"},
53+
"ENSO_perf": "share/EnsoMetrics/cmip5_historical_ENSO_perf_" + version_mod + "_allModels_allRuns.json",
54+
"ENSO_proc": "share/EnsoMetrics/cmip5_historical_ENSO_proc_" + version_mod + "_allModels_allRuns.json",
55+
"ENSO_tel": "share/EnsoMetrics/cmip5_historical_ENSO_tel_" + version_mod + "_allModels_allRuns.json"},
5556
"CMIP6": {
56-
"ENSO_perf": "share/EnsoMetrics/cmip6_historical_ENSO_perf_" + version + "_allModels_allRuns.json",
57-
"ENSO_proc": "share/EnsoMetrics/cmip6_historical_ENSO_proc_" + version + "_allModels_allRuns.json",
58-
"ENSO_tel": "share/EnsoMetrics/cmip6_historical_ENSO_tel_" + version + "_allModels_allRuns.json"},
57+
"ENSO_perf": "share/EnsoMetrics/cmip6_historical_ENSO_perf_" + version_mod + "_allModels_allRuns.json",
58+
"ENSO_proc": "share/EnsoMetrics/cmip6_historical_ENSO_proc_" + version_mod + "_allModels_allRuns.json",
59+
"ENSO_tel": "share/EnsoMetrics/cmip6_historical_ENSO_tel_" + version_mod + "_allModels_allRuns.json"},
5960
"obs2obs": {
60-
"ENSO_perf": "share/EnsoMetrics/obs2obs_ENSO_perf_" + version + ".json",
61-
"ENSO_proc": "share/EnsoMetrics/obs2obs_ENSO_proc_" + version + ".json",
62-
"ENSO_tel": "share/EnsoMetrics/obs2obs_ENSO_tel_" + version + ".json"}}
61+
"ENSO_perf": "share/EnsoMetrics/obs2obs_historical_ENSO_perf_" + version_obs + "_allObservations.json",
62+
"ENSO_proc": "share/EnsoMetrics/obs2obs_historical_ENSO_proc_" + version_obs + "_allObservations.json",
63+
"ENSO_tel": "share/EnsoMetrics/obs2obs_historical_ENSO_tel_" + version_obs + "_allObservations.json"}}
6364
# figure name
6465
path_out = ""
65-
figure_name = "metrics_correlations_" + str(len(list_metric_collections)) + "metric_collections_" + version
66+
figure_name = "metrics_correlations_" + str(len(list_metric_collections)) + "metric_collections_" + version_mod
6667
if len(list_projects) == 1:
6768
figure_name += "_" + str(list_projects[0])
6869
else:

‎scripts/driver_plot_divedowns.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@
3535
# True to use the set of metric in the BAMS paper
3636
# More metric have been computed and tested but not kept
3737
reduced_set = True # False #
38-
# computation version, 'v20200427' is provided with the package
39-
version = "v20200427"
38+
# computation version, 'v20200427' for models and 'v20201231' for obs are provided with the package
39+
version_mod = "v20200427"
40+
version_obs = "v20201231"
4041
# json files
4142
dict_json = {
4243
"CMIP5": {
43-
"ENSO_perf": "share/EnsoMetrics/cmip5_historical_ENSO_perf_" + version + "_allModels_allRuns.json",
44-
"ENSO_proc": "share/EnsoMetrics/cmip5_historical_ENSO_proc_" + version + "_allModels_allRuns.json",
45-
"ENSO_tel": "share/EnsoMetrics/cmip5_historical_ENSO_tel_" + version + "_allModels_allRuns.json"},
44+
"ENSO_perf": "share/EnsoMetrics/cmip5_historical_ENSO_perf_" + version_mod + "_allModels_allRuns.json",
45+
"ENSO_proc": "share/EnsoMetrics/cmip5_historical_ENSO_proc_" + version_mod + "_allModels_allRuns.json",
46+
"ENSO_tel": "share/EnsoMetrics/cmip5_historical_ENSO_tel_" + version_mod + "_allModels_allRuns.json"},
4647
"CMIP6": {
47-
"ENSO_perf": "share/EnsoMetrics/cmip6_historical_ENSO_perf_" + version + "_allModels_allRuns.json",
48-
"ENSO_proc": "share/EnsoMetrics/cmip6_historical_ENSO_proc_" + version + "_allModels_allRuns.json",
49-
"ENSO_tel": "share/EnsoMetrics/cmip6_historical_ENSO_tel_" + version + "_allModels_allRuns.json"},
48+
"ENSO_perf": "share/EnsoMetrics/cmip6_historical_ENSO_perf_" + version_mod + "_allModels_allRuns.json",
49+
"ENSO_proc": "share/EnsoMetrics/cmip6_historical_ENSO_proc_" + version_mod + "_allModels_allRuns.json",
50+
"ENSO_tel": "share/EnsoMetrics/cmip6_historical_ENSO_tel_" + version_mod + "_allModels_allRuns.json"},
5051
"obs2obs": {
51-
"ENSO_perf": "share/EnsoMetrics/obs2obs_ENSO_perf_" + version + ".json",
52-
"ENSO_proc": "share/EnsoMetrics/obs2obs_ENSO_proc_" + version + ".json",
53-
"ENSO_tel": "share/EnsoMetrics/obs2obs_ENSO_tel_" + version + ".json"}}
54-
52+
"ENSO_perf": "share/EnsoMetrics/obs2obs_historical_ENSO_perf_" + version_obs + "_allObservations.json",
53+
"ENSO_proc": "share/EnsoMetrics/obs2obs_historical_ENSO_proc_" + version_obs + "_allObservations.json",
54+
"ENSO_tel": "share/EnsoMetrics/obs2obs_historical_ENSO_tel_" + version_obs + "_allObservations.json"}}
5555
path_main = "/Users/yannplanton/Documents/Yann/Fac/2016_2018_postdoc_LOCEAN/2018_06_ENSO_metrics/2020_05_report"
5656
path_nc = OSpath__join(path_main, "Data/" + project.lower() + "/" + experiment + "/" + metric_collection)
5757
# figure name
@@ -74,7 +74,7 @@
7474
if reduced_set is True:
7575
metrics = remove_metrics(list_metrics, metric_collection, reduced_set=reduced_set)
7676
# pattern of netCDF files
77-
pattern = project.lower() + "_" + experiment + "_" + metric_collection + "_" + version + "_" + dataname
77+
pattern = project.lower() + "_" + experiment + "_" + metric_collection + "_" + version_mod + "_" + dataname
7878
#
7979
# Loop on metrics
8080
#

‎scripts/driver_plot_metric_comparison.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,26 @@
6767
# List of additional observations
6868
# the reading part is very 'ad hoc', do not change the obs!
6969
list_obs = ["20CRv2", "NCEP2", "ERA-Interim"]
70-
# computation version, 'v20200427' is provided with the package
71-
version = "v20200427"
70+
# computation version, 'v20200427' for models and 'v20201231' for obs are provided with the package
71+
version_mod = "v20200427"
72+
version_obs = "v20201231"
7273
# json files
7374
dict_json = {
7475
"CMIP5": {
75-
"ENSO_perf": "share/EnsoMetrics/cmip5_historical_ENSO_perf_" + version + "_allModels_allRuns.json",
76-
"ENSO_proc": "share/EnsoMetrics/cmip5_historical_ENSO_proc_" + version + "_allModels_allRuns.json",
77-
"ENSO_tel": "share/EnsoMetrics/cmip5_historical_ENSO_tel_" + version + "_allModels_allRuns.json"},
76+
"ENSO_perf": "share/EnsoMetrics/cmip5_historical_ENSO_perf_" + version_mod + "_allModels_allRuns.json",
77+
"ENSO_proc": "share/EnsoMetrics/cmip5_historical_ENSO_proc_" + version_mod + "_allModels_allRuns.json",
78+
"ENSO_tel": "share/EnsoMetrics/cmip5_historical_ENSO_tel_" + version_mod + "_allModels_allRuns.json"},
7879
"CMIP6": {
79-
"ENSO_perf": "share/EnsoMetrics/cmip6_historical_ENSO_perf_" + version + "_allModels_allRuns.json",
80-
"ENSO_proc": "share/EnsoMetrics/cmip6_historical_ENSO_proc_" + version + "_allModels_allRuns.json",
81-
"ENSO_tel": "share/EnsoMetrics/cmip6_historical_ENSO_tel_" + version + "_allModels_allRuns.json"},
80+
"ENSO_perf": "share/EnsoMetrics/cmip6_historical_ENSO_perf_" + version_mod + "_allModels_allRuns.json",
81+
"ENSO_proc": "share/EnsoMetrics/cmip6_historical_ENSO_proc_" + version_mod + "_allModels_allRuns.json",
82+
"ENSO_tel": "share/EnsoMetrics/cmip6_historical_ENSO_tel_" + version_mod + "_allModels_allRuns.json"},
8283
"obs2obs": {
83-
"ENSO_perf": "share/EnsoMetrics/obs2obs_ENSO_perf_" + version + ".json",
84-
"ENSO_proc": "share/EnsoMetrics/obs2obs_ENSO_proc_" + version + ".json",
85-
"ENSO_tel": "share/EnsoMetrics/obs2obs_ENSO_tel_" + version + ".json"}}
84+
"ENSO_perf": "share/EnsoMetrics/obs2obs_historical_ENSO_perf_" + version_obs + "_allObservations.json",
85+
"ENSO_proc": "share/EnsoMetrics/obs2obs_historical_ENSO_proc_" + version_obs + "_allObservations.json",
86+
"ENSO_tel": "share/EnsoMetrics/obs2obs_historical_ENSO_tel_" + version_obs + "_allObservations.json"}}
8687
# figure name
8788
path_out = ""
88-
figure_name = "metrics_intercomparison_" + str(len(list_metric_collections)) + "metric_collections_" + version
89+
figure_name = "metrics_intercomparison_" + str(len(list_metric_collections)) + "metric_collections_" + version_mod
8990
if len(list_projects) == 1:
9091
figure_name += "_" + str(list_projects[0])
9192
else:

‎scripts/driver_plot_portraitplot.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,26 @@
5050
# If set to False, all members will be used and the metric values computed for all members of each model will be
5151
# averaged
5252
first_member = True # False #
53-
# computation version, 'v20200427' is provided with the package
54-
version = "v20200427"
53+
# computation version, 'v20200427' for models and 'v20201231' for obs are provided with the package
54+
version_mod = "v20200427"
55+
version_obs = "v20201231"
5556
# json files
5657
dict_json = {
5758
"CMIP5": {
58-
"ENSO_perf": "share/EnsoMetrics/cmip5_historical_ENSO_perf_" + version + "_allModels_allRuns.json",
59-
"ENSO_proc": "share/EnsoMetrics/cmip5_historical_ENSO_proc_" + version + "_allModels_allRuns.json",
60-
"ENSO_tel": "share/EnsoMetrics/cmip5_historical_ENSO_tel_" + version + "_allModels_allRuns.json"},
59+
"ENSO_perf": "share/EnsoMetrics/cmip5_historical_ENSO_perf_" + version_mod + "_allModels_allRuns.json",
60+
"ENSO_proc": "share/EnsoMetrics/cmip5_historical_ENSO_proc_" + version_mod + "_allModels_allRuns.json",
61+
"ENSO_tel": "share/EnsoMetrics/cmip5_historical_ENSO_tel_" + version_mod + "_allModels_allRuns.json"},
6162
"CMIP6": {
62-
"ENSO_perf": "share/EnsoMetrics/cmip6_historical_ENSO_perf_" + version + "_allModels_allRuns.json",
63-
"ENSO_proc": "share/EnsoMetrics/cmip6_historical_ENSO_proc_" + version + "_allModels_allRuns.json",
64-
"ENSO_tel": "share/EnsoMetrics/cmip6_historical_ENSO_tel_" + version + "_allModels_allRuns.json"},
63+
"ENSO_perf": "share/EnsoMetrics/cmip6_historical_ENSO_perf_" + version_mod + "_allModels_allRuns.json",
64+
"ENSO_proc": "share/EnsoMetrics/cmip6_historical_ENSO_proc_" + version_mod + "_allModels_allRuns.json",
65+
"ENSO_tel": "share/EnsoMetrics/cmip6_historical_ENSO_tel_" + version_mod + "_allModels_allRuns.json"},
6566
"obs2obs": {
66-
"ENSO_perf": "share/EnsoMetrics/obs2obs_ENSO_perf_" + version + ".json",
67-
"ENSO_proc": "share/EnsoMetrics/obs2obs_ENSO_proc_" + version + ".json",
68-
"ENSO_tel": "share/EnsoMetrics/obs2obs_ENSO_tel_" + version + ".json"}}
67+
"ENSO_perf": "share/EnsoMetrics/obs2obs_historical_ENSO_perf_" + version_obs + "_allObservations.json",
68+
"ENSO_proc": "share/EnsoMetrics/obs2obs_historical_ENSO_proc_" + version_obs + "_allObservations.json",
69+
"ENSO_tel": "share/EnsoMetrics/obs2obs_historical_ENSO_tel_" + version_obs + "_allObservations.json"}}
6970
# figure name
7071
path_out = ""
71-
figure_name = "portraitplot_" + str(len(list_metric_collections)) + "metric_collections_" + version
72+
figure_name = "portraitplot_" + str(len(list_metric_collections)) + "metric_collections_" + version_mod
7273
if len(list_projects) == 1:
7374
figure_name += "_" + str(list_projects[0])
7475
else:

‎share/EnsoMetrics/obs2obs_ENSO_perf_v20200427.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/EnsoMetrics/obs2obs_ENSO_proc_v20200427.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/EnsoMetrics/obs2obs_ENSO_tel_v20200427.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎share/EnsoMetrics/obs2obs_historical_ENSO_perf_v20201231_allObservations.json‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎share/EnsoMetrics/obs2obs_historical_ENSO_proc_v20201231_allObservations.json‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎share/EnsoMetrics/obs2obs_historical_ENSO_tel_v20201231_allObservations.json‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)