Merge branch 'main' into ao_sic_parallel

.all-contributorsrc

@@ -235,12 +235,40 @@
         "code",
         "research"
       ]
+    },
+    {
+      "login": "bosup",
+      "name": "Bo Dong",
+      "avatar_url": "https://avatars.githubusercontent.com/u/130708142?v=4",
+      "profile": "https://github.com/bosup",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "zhangshixuan1987",
+      "name": "Shixuan Zhang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33647254?v=4",
+      "profile": "https://github.com/zhangshixuan1987",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kristinchang3",
+      "name": "Kristin Chang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/143142064?v=4",
+      "profile": "https://kristinchang.github.io/portfolio/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
   "skipCi": true,
   "repoType": "github",
   "repoHost": "https://github.com",
   "projectName": "pcmdi_metrics",
-  "projectOwner": "PCMDI"
+  "projectOwner": "PCMDI",
+  "commitType": "docs"
 }

README.md

@@ -50,7 +50,7 @@ Documentation
 
 **Reference**
 
-Lee, J., P. J. Gleckler, M.-S. Ahn, A. Ordonez, P. Ullrich, K. R. Sperber, K. E. Taylor, Y. Y. Planton, E. Guilyardi, P. Durack, C. Bonfils, M. D. Zelinka, L.-W. Chao, B. Dong, C. Doutriaux, C. Zhang, T. Vo, J. Boutte, M. F. Wehner, A. G. Pendergrass, D. Kim, Z. Xue, A. T. Wittenberg, and J. Krasting, 2024: Systematic and Objective Evaluation of Earth System Models: PCMDI Metrics Package (PMP) version 3. Geoscientific Model Development (_accepted, publication in progress_) [[preprint](https://egusphere.copernicus.org/preprints/2023/egusphere-2023-2720/)]
+Lee, J., P. J. Gleckler, M.-S. Ahn, A. Ordonez, P. Ullrich, K. R. Sperber, K. E. Taylor, Y. Y. Planton, E. Guilyardi, P. Durack, C. Bonfils, M. D. Zelinka, L.-W. Chao, B. Dong, C. Doutriaux, C. Zhang, T. Vo, J. Boutte, M. F. Wehner, A. G. Pendergrass, D. Kim, Z. Xue, A. T. Wittenberg, and J. Krasting, 2024: Systematic and Objective Evaluation of Earth System Models: PCMDI Metrics Package (PMP) version 3. Geoscientific Model Development, 17, 3919–3948, doi: [10.5194/gmd-17-3919-2024](https://doi.org/10.5194/gmd-17-3919-2024)
 
 
 Contact
@@ -109,6 +109,9 @@ Release Notes and History
 
 | <div style="width:300%">[Versions]</div> | Update summary   |
 | ------------- | ------------------------------------- |
+| [v3.5.2]      | Technical update, QC tools, new modes for modes of variability metrics (PSA1, PSA2)
+| [v3.5.1]      | Technical update
+| [v3.5]        | Technical update: MJO and Monsoon Sperber [xCDAT](https://xcdat.readthedocs.io/en/latest/) conversion
 | [v3.4.1]      | Technical update
 | [v3.4]        | Technical update: Modes of variability [xCDAT](https://xcdat.readthedocs.io/en/latest/) conversion
 | [v3.3.4]      | Technical update
@@ -143,6 +146,9 @@ Release Notes and History
 
 
 [Versions]: https://github.com/PCMDI/pcmdi_metrics/releases
+[v3.5.2]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.5.2
+[v3.5.1]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.5.1
+[v3.5]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.5
 [v3.4.1]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.4.1
 [v3.4]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.4
 [v3.3.4]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v3.3.4
@@ -175,6 +181,15 @@ Release Notes and History
 [v1.1]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v1.1
 [v1.0]: https://github.com/PCMDI/pcmdi_metrics/releases/tag/v1.0
 
+Current Core Team Members at PCMDI/LLNL
+---------------------------------------
+* Jiwoo Lee
+* Ana Ordonez
+* Peter Gleckler
+* Paul Ullrich
+* Bo Dong
+* Kristin Chang
+
 
 Contributors
 ------------
@@ -215,6 +230,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://sites.google.com/uw.edu/kimresearchgroup"><img src="https://scholar.googleusercontent.com/citations?view_op=view_photo&user=3xLjsIsAAAAJ&citpid=3?s=100" width="100px;" alt="Daehyun Kim"/><br /><sub><b>Daehyun Kim</b></sub></a><br /><a href="https://github.com/PCMDI/pcmdi_metrics/commits?author=" title="Code">💻</a> <a href="#research" title="Research">🔬</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/bosup"><img src="https://avatars.githubusercontent.com/u/130708142?v=4?s=100" width="100px;" alt="Bo Dong"/><br /><sub><b>Bo Dong</b></sub></a><br /><a href="https://github.com/PCMDI/pcmdi_metrics/commits?author=bosup" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zhangshixuan1987"><img src="https://avatars.githubusercontent.com/u/33647254?v=4?s=100" width="100px;" alt="Shixuan Zhang"/><br /><sub><b>Shixuan Zhang</b></sub></a><br /><a href="https://github.com/PCMDI/pcmdi_metrics/commits?author=zhangshixuan1987" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://kristinchang.github.io/portfolio/"><img src="https://avatars.githubusercontent.com/u/143142064?v=4?s=100" width="100px;" alt="Kristin Chang"/><br /><sub><b>Kristin Chang</b></sub></a><br /><a href="https://github.com/PCMDI/pcmdi_metrics/commits?author=kristinchang3" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

conda-env/dev.yml

@@ -13,7 +13,6 @@ dependencies:
     - numpy=1.23.5
     - cartopy=0.22.0
     - matplotlib=3.7.1
-    - cdat_info=8.2.1
     - cdms2=3.1.5
     - genutil=8.2.1
     - cdutil=8.2.1
@@ -24,9 +23,9 @@ dependencies:
     - xcdat>=0.7.0
     - xmltodict=0.13.0
     - setuptools=67.7.2
-    - netcdf4=1.6.3
+    - netcdf4>=1.6.3
     - regionmask=0.9.0
-    - rasterio=1.3.6
+    - rasterio>=1.3.6
     - shapely=2.0.1
     - numdifftools
     - nc-time-axis
@@ -39,19 +38,18 @@ dependencies:
     # ==================
     # Developer Tools
     # ==================
-    - jupyterlab=3.6.3
-    - nb_conda=2.2.1
-    - nb_conda_kernels=2.3.1
+    - jupyterlab
+    - nb_conda
+    - nb_conda_kernels
     # ==================
     # Documentation
     # ==================
-    - sphinx=5.3.0
-    - sphinx-autosummary-accessors=2022.4.0
-    - sphinx-book-theme=1.0.1
-    - sphinx-copybutton=0.5.1
+    - sphinx
+    - sphinx-book-theme
+    - sphinx-copybutton
     - sphinx_rtd_theme
-    - nbsphinx=0.9.1
-    - pandoc=3.1.1
-    - ipython=8.11.0 # Required for nbsphinx syntax highlighting
+    - nbsphinx
+    - pandoc
+    - ipython # Required for nbsphinx syntax highlighting
 
 prefix: /opt/miniconda3/envs/pmcdi_metrics_dev

conda-env/readthedocs.yml

@@ -12,7 +12,6 @@ dependencies:
     - numpy=1.23.5
     - cartopy=0.21.1
     - matplotlib=3.7.1
-    - cdat_info=8.2.1
     - cdms2=3.1.5
     - genutil=8.2.1
     - cdutil=8.2.1