Merge branch 'main' into ao_seaice_file_sft

PCMDI · Sep 23, 2024 · 712fa7b · 712fa7b
2 parents 7d1182d + ebbc2fe
commit 712fa7b
Show file tree

Hide file tree

Showing 27 changed files with 687 additions and 124 deletions.
diff --git a/.all-contributorsrc b/.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"
 }
diff --git a/README.md b/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,8 @@ 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
@@ -144,6 +146,8 @@ 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
@@ -177,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
 ------------
@@ -217,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>

diff --git a/conda-env/dev.yml b/conda-env/dev.yml
@@ -38,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
diff --git a/doc/jupyter/Demo/basic_mov_param.py.in b/doc/jupyter/Demo/basic_mov_param.py.in
@@ -23,7 +23,6 @@ varModel = 'psl'
 ModUnitsAdjust = (True, 'divide', 100.0)  # Pa to hPa
 msyear = 1900
 meyear = 2005
-eofn_mod = 1
 
 # OBSERVATIONS SETTINGS
 reference_data_path = '$INPUT_DIR$/obs4MIPs_PCMDI_monthly/NOAA-ESRL-PSD/20CR/mon/psl/gn/v20210727/psl_mon_20CR_PCMDI_gn_187101-201212.nc'
@@ -32,7 +31,6 @@ varOBS = 'psl'
 ObsUnitsAdjust = (True, 'divide', 100.0)  # Pa to hPa; or (False, 0, 0)
 osyear = 1900
 oeyear = 2005
-eofn_obs = 1
 
 # DIRECTORY WHERE TO PUT RESULTS
 results_dir = os.path.join(

diff --git a/doc/jupyter/Demo/basic_mov_param_sst.py.in b/doc/jupyter/Demo/basic_mov_param_sst.py.in
@@ -25,7 +25,6 @@ varModel = 'ts'
 ModUnitsAdjust = (True, "subtract", 273.15)  # degK to degC
 msyear = 1900
 meyear = 2005
-eofn_mod = 1
 
 # OBSERVATIONS SETTINGS
 reference_data_path = '$INPUT_DIR$/obs4MIPs_PCMDI_monthly/MOHC/HadISST-1-1/mon/ts/gn/v20210727/ts_mon_HadISST-1-1_PCMDI_gn_187001-201907.nc'
@@ -34,7 +33,6 @@ varOBS = 'ts'
 ObsUnitsAdjust = (True, "subtract", 273.15)  # degK to degC
 osyear = 1900
 oeyear = 2005
-eofn_obs = 1
 
 # DIRECTORY WHERE TO PUT RESULTS
 results_dir = os.path.join(

diff --git a/docs/conf.py b/docs/conf.py
@@ -9,33 +9,67 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
+import sys
+import os
+sys.path.insert(0, os.path.abspath('../pcmdi_metrics/utils'))
 
-#import sphinx_autosummary_accessors
+# import sphinx_autosummary_accessors
 
 # -- Project information -----------------------------------------------------
 
 project = 'PCMDI Metrics Package'
-copyright = '2023 PCMDI'
+copyright = '2024 PCMDI'
 author = 'PCMDI'
 
-# The full version, including alpha/beta/rc tags
-# release = '1.2.1'
-
+# The version info for the project you're documenting, acts as replacement
+# for |version| and |release|, also used in various other places throughout
+# the built documents.
+#
+# The short X.Y version.
+# import pcmdi_metrics
+# version = pcmdi_metrics.__version__
+# The full version, including alpha/beta/rc tags.
+# release = pcmdi_metrics.__version__
 
 # -- General configuration ---------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinx_rtd_theme']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinx_rtd_theme', 'sphinx.ext.napoleon']
+
+# autosummary and autodoc configurations
+# autosummary_generate = True
+"""
+autodoc_member_order = "bysource"
+autodoc_default_options = {
+    "members": True,
+    "undoc-members": True,
+    "private-members": True,
+}
+autodoc_typehints = "none"
+"""
+
+# Napoleon configurations
+napoleon_google_docstring = False
+napoleon_numpy_docstring = True
+napoleon_use_param = False
+napoleon_use_rtype = False
+napoleon_preprocess_types = True
 
 # Add any paths that contain templates here, relative to this directory.
+# templates_path = ['_templates', sphinx_autosummary_accessors.templates_path]
 templates_path = ['_templates']
 
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+#
+# source_suffix = ['.rst', '.md']
+source_suffix = ".rst"
+
+# The master toctree document.
+master_doc = "index"
+
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #

diff --git a/docs/resources.rst b/docs/resources.rst
@@ -7,7 +7,5 @@ Resources
 .. toctree::
    :maxdepth: 1
 
-   pmp-using-cdp-guide
-   pmpparser
-
-
+   utils
+   resources_legacy
diff --git a/docs/resources_legacy.rst b/docs/resources_legacy.rst
@@ -0,0 +1,11 @@
+.. _resources:
+
+**************
+Legacy archive
+**************
+
+.. toctree::
+   :maxdepth: 1
+
+   pmp-using-cdp-guide
+   pmpparser
diff --git a/docs/utils.rst b/docs/utils.rst
@@ -0,0 +1,9 @@
+*****
+Utils
+*****
+
+
+.. automodule:: pcmdi_metrics.utils
+   :members: check_daily_time_axis, check_monthly_time_axis, create_land_sea_mask, apply_landmask, apply_oceanmask, regrid
+   :undoc-members:
+   :show-inheritance:
diff --git a/pcmdi_metrics/cloud_feedback/cloud_feedback_driver.py b/pcmdi_metrics/cloud_feedback/cloud_feedback_driver.py
@@ -113,7 +113,7 @@
         json.dump(filenames, f, sort_keys=True, indent=4)
 
 # calculate all feedback components and Klein et al (2013) error metrics:
-fbk_dict, obsc_fbk_dict, err_dict = CloudRadKernel(filenames)
+fbk_dict, obsc_fbk_dict, err_dict = CloudRadKernel(filenames, data_path)
 
 print("calc done")