diff --git a/lib/EnsoPlotLib.py b/lib/EnsoPlotLib.py index 00066e5..d611674 100644 --- a/lib/EnsoPlotLib.py +++ b/lib/EnsoPlotLib.py @@ -364,9 +364,9 @@ "varpattern": "diagnostic", "yname": "normalized dSSToce", "method": "1) Detect El Nino and La Nina\n (5-m. tri. ave. Dec. N3.4 SSTA > 0.75 STD)\n" + - "2) dSST = REGION1 SSTA Dec. - Jul.\n3) REGION1 THFA summed from Jul. to Dec.\n" + - "4) dSST = dSST/dSST and dSSTthf = dSSTthf/dSST\n" + - "5) dSSToce = dSST - dSSTthf\n6) Mean dSSToce both El Nino and La Nina\n\n" + + "2) dSST = REGION1 SSTA Dec. - Jul.\n3) REGION1 NHFA summed from Jul. to Dec.\n" + + "4) dSST = dSST/dSST and dSSTnhf = dSSTnhf/dSST\n" + + "5) dSSToce = dSST - dSSTnhf\n6) Mean dSSToce both El Nino and La Nina\n\n" + "Metric: abs((dSSToce$_{mod}$-dSSToce$_{ref}$)/dSSToce$_{ref}$)*100", }, "dive_down01": { @@ -376,15 +376,15 @@ "varpattern": ["dSST_ts__", "dSSTthf_ts__", "dSSToce_ts__"], "colors": {"model": ["black", "red", "blue"], "reference": ["black", "red", "blue"]}, "linestyles": {"model": ["-", "-", "-"], "reference": ["-.", "-.", "-."]}, - "legend": ["dSST", "dSSTthf", "dSSToce"], + "legend": ["dSST", "dSSTnhf", "dSSToce"], "xname": "months", "yname": "normalized dSST", "method": "1) Detect El Nino and La Nina\n (5-m. tri. ave. Dec. N3.4 SSTA > 0.75 STD)\n" + "2) dSST$_i$ = REGION1 SSTA M$_i$ - M$_{i-1}$\n" + - "3) dSSTthf$_i$ = REGION1 THFA summed from M$_0$ to M$_i$\n" + + "3) dSSTnhf$_i$ = REGION1 NHFA summed from M$_0$ to M$_i$\n" + "4) dt = dSST$_{dec}$-dSST$_{jul}$,\n dSST$_i$ = dSST$_i$/dt,\n " + - "dSSTthf$_i$ = dSSTthf$_i$/dt\n" + - "5) dSSToce$_i$ = dSST$_i$ - dSSTthf$_i$\n6) Mean dSSToce both El Nino and La Nina", + "dSSTnhf$_i$ = dSSTnhf$_i$/dt\n" + + "5) dSSToce$_i$ = dSST$_i$ - dSSTnhf$_i$\n6) Mean dSSToce both El Nino and La Nina", }, "dive_down02": { "plot_type": "curve", @@ -393,13 +393,13 @@ "varpattern": ["dSSTthf_lon__", "dSSToce_lon__"], "colors": {"model": ["red", "blue"], "reference": ["red", "blue"]}, "linestyles": {"model": ["-", "-"], "reference": ["-.", "-."]}, - "legend": ["dSSTthf", "dSSToce"], + "legend": ["dSSTnhf", "dSSToce"], "xname": "longitude", "yname": "normalized dSST", "method": "1) Detect El Nino and La Nina\n (5-m. tri. ave. Dec. N3.4 SSTA > 0.75 STD)\n" + - "2) dSST = REGION1 SSTA Dec. - Jul.\n3) REGION1 THFA summed from Jul. to Dec.\n" + - "4) dSST = dSST/dSST and dSSTthf = dSSTthf/dSST\n" + - "5) dSSToce = dSST - dSSTthf\n6) Mean dSSToce both El Nino and La Nina", + "2) dSST = REGION1 SSTA Dec. - Jul.\n3) REGION1 NHFA summed from Jul. to Dec.\n" + + "4) dSST = dSST/dSST and dSSTnhf = dSSTnhf/dSST\n" + + "5) dSSToce = dSST - dSSTnhf\n6) Mean dSSToce both El Nino and La Nina", }, "dive_down03": { "plot_type": "hovmoeller", @@ -413,10 +413,10 @@ "zname": "normalized dSST", "method": "1) Detect El Nino and La Nina\n (5-m. tri. ave. Dec. N3.4 SSTA > 0.75 STD)\n" + "2) dSST$_i$ = REGION1 SSTA M$_i$ - M$_{i-1}$\n" + - "3) dSSTthf$_i$ = REGION1 THFA summed from M$_0$ to M$_i$\n" + + "3) dSSTnhf$_i$ = REGION1 NHFA summed from M$_0$ to M$_i$\n" + "4) dt = dSST$_{dec}$-dSST$_{jul}$,\n dSST$_i$ = dSST$_i$/dt,\n " + - "dSSTthf$_i$ = dSSTthf$_i$/dt\n" + - "5) dSSToce$_i$ = dSST$_i$ - dSSTthf$_i$\n6) Mean dSSToce both El Nino and La Nina", + "dSSTnhf$_i$ = dSSTnhf$_i$/dt\n" + + "5) dSSToce$_i$ = dSST$_i$ - dSSTnhf$_i$\n6) Mean dSSToce both El Nino and La Nina", }, }, @@ -788,9 +788,9 @@ "title": "Net heat flux feedback", "varpattern": ["sst__", "thf__"], "xname": "SSTA", - "yname": "THFA", + "yname": "NHFA", "method": "1) Seasonal cycle removed\n2) Linearly detrended\n3) REGION1 averaged\n" + - "4) REGION1 SSTA regressed onto REGION1 THFA\n\n" + + "4) REGION1 SSTA regressed onto REGION1 NHFA\n\n" + "Metric: abs((Slope$_{mod}$-Slope$_{ref}$)/Slope$_{ref}$)*100", }, "dive_down01": { @@ -799,9 +799,9 @@ "title": "nonlinarity", "varpattern": ["sst__", "thf__"], "xname": "SSTA", - "yname": "THFA", + "yname": "NHFA", "method": "1) Seasonal cycle removed\n2) Linearly detrended\n3) REGION1 averaged\n" + - "4) REGION1 SSTA>0 (SSTA<0) regressed onto REGION1 THFA", + "4) REGION1 SSTA>0 (SSTA<0) regressed onto REGION1 NHFA", }, "dive_down02": { "plot_type": "curve", @@ -813,16 +813,16 @@ "linestyles": {"model": ["-", "-", "-"], "reference": ["-.", "-.", "-."]}, "legend": ["All", "SSTA>0", "SSTA<0"], "xname": "longitude", - "yname": "reg(SSTA, THFA)", + "yname": "reg(SSTA, NHFA)", "method": "1) Seasonal cycle removed\n2) Linearly detrended\n3) 5S-5N meridional averaged\n" + - "4) 30° zonal running ave.\n5) SSTA or SSTA>0 or SSTA<0 regressed onto THFA", + "4) 30° zonal running ave.\n5) SSTA or SSTA>0 or SSTA<0 regressed onto NHFA", }, "dive_down03": { "plot_type": "hovmoeller", "nbr_panel": 6, "colorbar": dict_colorbar["anomalies"], "label": dict_label["REG50"], - "title": ["reg(SSTA, THFA)", "reg(SSTA>0, THFA)", "reg(SSTA<0, THFA)"], + "title": ["reg(SSTA, NHFA)", "reg(SSTA>0, NHFA)", "reg(SSTA<0, NHFA)"], #"varpattern": ["sst_over_thf_hov__", "sstPOS_over_thf_hov__", "sstNEG_over_thf_hov__"], "varpattern": ["reg_thf_over_sst_hov__", "reg_thf_over_POSsst_hov__", "reg_thf_over_NEGsst_hov__"], "xname": "longitude", @@ -830,7 +830,7 @@ "zname": "regression", "method": "1) Seasonal cycle removed\n2) Linearly detrended\n3) 5S-5N meridional averaged\n" + "4) 30° zonal running ave.\n" + - "5) For each calendar month:\n SSTA or SSTA>0 or SSTA<0 regressed onto THFA", + "5) For each calendar month:\n SSTA or SSTA>0 or SSTA<0 regressed onto NHFA", }, }, "EnsoFbTauxSsh": { diff --git a/lib/version.py b/lib/version.py index e5bc2dc..59bda46 100644 --- a/lib/version.py +++ b/lib/version.py @@ -1,3 +1,3 @@ -__version__ = 'v0.1' -__git_tag_describe__ = 'v0.1-423-g7723f20' -__git_sha1__ = '7723f20c075032b3d1cc01c0bf5feaabbf4d561e' +__version__ = 'v1.0' +__git_tag_describe__ = 'v1.0-167-gd304653' +__git_sha1__ = 'd3046535f54947f2c5d9dac02a073e2e5a1f4f0b' diff --git a/misc/cmip5_historical_ENSO_perf_CNRM-CM5_r1i1p1_EnsoSeasonality_diagnostic_divedown04.png b/misc/cmip5_historical_ENSO_perf_CNRM-CM5_r1i1p1_EnsoSeasonality_diagnostic_divedown04.png old mode 100755 new mode 100644 index b673747..b5dac5d Binary files a/misc/cmip5_historical_ENSO_perf_CNRM-CM5_r1i1p1_EnsoSeasonality_diagnostic_divedown04.png and b/misc/cmip5_historical_ENSO_perf_CNRM-CM5_r1i1p1_EnsoSeasonality_diagnostic_divedown04.png differ diff --git a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown01_v2.png b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown01_v2.png old mode 100755 new mode 100644 index c92e9a4..04b6cdb Binary files a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown01_v2.png and b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown01_v2.png differ diff --git a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown02.png b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown02.png index dd53f40..06bd509 100644 Binary files a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown02.png and b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown02.png differ diff --git a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown03.png b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown03.png index 7687c2a..eba821f 100644 Binary files a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown03.png and b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown03.png differ diff --git a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown04.png b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown04.png index 999e1fc..7affb42 100644 Binary files a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown04.png and b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsoFbSstThf_diagnostic_divedown04.png differ diff --git a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsodSstOce_2_diagnostic_divedown02.png b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsodSstOce_2_diagnostic_divedown02.png old mode 100755 new mode 100644 index 19220a3..9f7b8a7 Binary files a/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsodSstOce_2_diagnostic_divedown02.png and b/misc/cmip5_historical_ENSO_proc_CNRM-CM5_r1i1p1_EnsodSstOce_2_diagnostic_divedown02.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown01_v2.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown01_v2.png index 9771978..cbb5d77 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown01_v2.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown01_v2.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown03.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown03.png index 81f0e29..cd2bdd5 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown03.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown03.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown04.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown04.png index f6b6c6a..1d24b38 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown04.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown04.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown05.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown05.png index 6c601ce..4450633 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown05.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown05.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown06.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown06.png index 43c1267..341eef8 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown06.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown06.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown07.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown07.png index 8a8340c..c3f46c1 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown07.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapDjf_diagnostic_divedown07.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown01_v2.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown01_v2.png index ba24bab..50757ea 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown01_v2.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown01_v2.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown03.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown03.png index 4d0ebfc..3f70eb7 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown03.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown03.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown04.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown04.png index 931a253..89a4783 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown04.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown04.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown05.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown05.png index f3ab35f..5f8c88e 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown05.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown05.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown06.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown06.png index 2e8167b..3a3f566 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown06.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown06.png differ diff --git a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown07.png b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown07.png index 7cba5f5..f7fddb6 100644 Binary files a/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown07.png and b/misc/cmip5_historical_ENSO_tel_CNRM-CM5_r1i1p1_EnsoSstMapJja_diagnostic_divedown07.png differ diff --git a/plots/driver_plot.py b/plots/driver_plot.py index e6a85b9..aeae776 100644 --- a/plots/driver_plot.py +++ b/plots/driver_plot.py @@ -57,7 +57,7 @@ metrics = [met for met in metrics if met in data_json["value"].keys() or ("Map" in met and (met + "Corr" in data_json["value"].keys() or met + "Rmse" in data_json["value"].keys() or met + "Std" in data_json["value"].keys()))] -for met in ["EnsoSstDiversity_2"]:#metrics: +for met in metrics: print(met) # get NetCDF file name # path_nc = OSpath__join(path_in, project + "/" + experiment + "/" + metric_collection)