diff --git a/README.md b/README.md index f129cb543..8114f82be 100755 --- a/README.md +++ b/README.md @@ -107,21 +107,22 @@ Release Notes and History [Released versions](https://github.com/PCMDI/pcmdi_metrics/releases) -- [v3.0.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.0.0) - New metric added: Cloud feedback by @mzelinka. [xCDAT](https://xcdat.readthedocs.io/en/latest/) implemented for mean climate metrics +- [v3.0.1](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.0.1) - Minor technical patch +- [v3.0.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.0.0) - New metric added: **Cloud feedback metric** by @mzelinka. [**xCDAT**](https://xcdat.readthedocs.io/en/latest/) implemented for mean climate metrics - [v2.5.1](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.5.1) - Technical update -- [v2.5.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.5.0) - New metric added: Precipitation Benchmarking -- distribution. Graphics updated -- [v2.4.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.4.0) - New metric added: AMO in variability modes +- [v2.5.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.5.0) - New metric added: **Precipitation Benchmarking -- distribution**. Graphics updated +- [v2.4.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.4.0) - New metric added: **AMO** in variability modes - [v2.3.2](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.3.2) - CMEC interface updates - [v2.3.1](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.3.1) - Technical update - [v2.3](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.3) - New graphics using [archived PMP results](https://github.com/PCMDI/pcmdi_metrics_results_archive) - [v2.2.2](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.2.2) - Technical update - [v2.2.1](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.2.1) - Minor update -- [v2.2](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.2) - New metric implemented: precipitation variability across time scale +- [v2.2](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.2) - New metric implemented: **precipitation variability across time scale** - [v2.1.2](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.1.2) - Minor update - [v2.1.1](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.1.1) - Simplified dependent libraries and CI process -- [v2.1.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.1.0) - CMEC driver interfaced added. -- [v2.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.0) - New capabilities: ENSO metrics, demos, and documentations. +- [v2.1.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.1.0) - [**CMEC**](https://cmec.llnl.gov/) driver interfaced added. +- [v2.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v2.0) - New capabilities: **ENSO** metrics, demos, and documentations. - [v1.2](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v1.2) - Tied to CDAT 8.0. Now includes extensive regression testing. New metrics: Diurnal cycle and intermittency of precipitation, sample monsoon metrics. - [v1.1.2](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v1.1.2) - Now managed through Anaconda, and tied to UV-CDAT 2.10. Weights on bias statistic added. Extensive provenance information incorporated into json files. -- [v1.1](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v1.1) - First public release, emphasizing climatological statistics, with development branches for ENSO and regional monsoon precipitation indices. +- [v1.1](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v1.1) - First public release, emphasizing **climatological statistics**, with development branches for ENSO and regional monsoon precipitation indices. - [v1.0](https://github.com/PCMDI/pcmdi_metrics/releases/tag/v1.0) - Prototype version of the PMP. diff --git a/pcmdi_metrics/monsoon_sperber/scripts/driver_monsoon_sperber.py b/pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py similarity index 99% rename from pcmdi_metrics/monsoon_sperber/scripts/driver_monsoon_sperber.py rename to pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py index 1e8c91cc3..a92302d2f 100644 --- a/pcmdi_metrics/monsoon_sperber/scripts/driver_monsoon_sperber.py +++ b/pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py @@ -56,6 +56,7 @@ import pcmdi_metrics from pcmdi_metrics import resources +from pcmdi_metrics.mean_climate.lib import pmp_parser from pcmdi_metrics.monsoon_sperber.lib import ( AddParserArgument, YearCheck, @@ -82,7 +83,7 @@ def tree(): # ================================================= # Collect user defined options # ------------------------------------------------- -P = pcmdi_metrics.driver.pmp_parser.PMPParser( +P = pmp_parser.PMPParser( description="Runs PCMDI Monsoon Sperber Computations", formatter_class=RawTextHelpFormatter, ) diff --git a/pcmdi_metrics/monsoon_wang/scripts/bar_chart_monsoon_precip_index.py b/pcmdi_metrics/monsoon_wang/scripts/bar_chart_monsoon_precip_index.py index 957be058b..4e5e02b48 100644 --- a/pcmdi_metrics/monsoon_wang/scripts/bar_chart_monsoon_precip_index.py +++ b/pcmdi_metrics/monsoon_wang/scripts/bar_chart_monsoon_precip_index.py @@ -6,8 +6,8 @@ import MV2 from SeabarChart_mpl import BarChart -from pcmdi_metrics.driver import pmp_parser -from pcmdi_metrics.pcmdi.io import JSONs +from pcmdi_metrics.mean_climate.lib import pmp_parser +from pcmdi_metrics.io.base import JSONs test = False # test = True diff --git a/setup.py b/setup.py index 4a1979815..b711d7d81 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ "pcmdi_metrics/mean_climate/pcmdi_compute_climatologies.py", "pcmdi_metrics/mean_climate/mean_climate_driver.py", "pcmdi_metrics/monsoon_wang/scripts/mpindex_compute.py", - "pcmdi_metrics/monsoon_sperber/scripts/driver_monsoon_sperber.py", + "pcmdi_metrics/monsoon_sperber/driver_monsoon_sperber.py", "pcmdi_metrics/mjo/mjo_metrics_driver.py", "pcmdi_metrics/variability_mode/variability_modes_driver.py", "pcmdi_metrics/enso/enso_driver.py",