Merge pull request #881 from MPAS-Dev/develop

Merge develop into master
MPAS-Dev · Jul 6, 2022 · 67a19c0 · 67a19c0
2 parents cf30776 + 8db33b5
commit 67a19c0
Show file tree

Hide file tree

Showing 141 changed files with 2,110 additions and 3,080 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,11 +1,11 @@
 This software is open source software available under the BSD-3 license.
 
-Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 
 
-Copyright (c) 2020 Triad National Security, LLC. This program was produced
+Copyright (c) 2022 Triad National Security, LLC. This program was produced
 under U.S. Government contract 89233218CNA000001 for Los Alamos National
 Laboratory (LANL), which is operated by Triad National Security, LLC for the
 U.S. Department of Energy/National Nuclear Security Administration. All rights
@@ -16,7 +16,7 @@ irrevocable worldwide license in this material to reproduce, prepare derivative
 works, distribute copies to the public, perform publicly and display publicly,
 and to permit others to do so.
 
-Copyright (c) 2020 Lawrence Livermore National Security, LLC. This work was
+Copyright (c) 2022 Lawrence Livermore National Security, LLC. This work was
 produced under the auspices of the U.S. Department of Energy by Lawrence
 Livermore National Laboratory under Contract DE-AC52-07NA27344. This work was
 prepared as an account of work sponsored by an agency of the United States

diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "MPAS-Analysis" %}
-{% set version = "1.6.1" %}
+{% set version = "1.7.0" %}
 
 package:
   name: {{ name|lower }}
@@ -27,12 +27,13 @@ requirements:
     - cartopy_offlinedata
     - cmocean
     - dask
+    - f90nml
     - geometric_features >=0.5.0
     - gsw
     - lxml
     - mache >=1.1.2
     - matplotlib-base >=3.0.2
-    - mpas_tools >=0.5.1
+    - mpas_tools >=0.14.0
     - nco >=4.8.1
     - netcdf4
     - numpy
@@ -46,7 +47,6 @@ requirements:
     - scipy
     - setuptools
     - shapely
-    - six
     - xarray >=0.14.1
 
 test:

diff --git a/dev-spec.txt b/dev-spec.txt
@@ -8,12 +8,13 @@ cartopy >=0.18.0
 cartopy_offlinedata
 cmocean
 dask
+f90nml
 geometric_features>=0.5.0
 gsw
 lxml
 mache >=1.1.2
 matplotlib-base>=3.0.2
-mpas_tools>=0.5.1
+mpas_tools>=0.14.0
 nco>=4.8.1
 netcdf4
 numpy
@@ -27,10 +28,10 @@ requests
 scipy
 setuptools
 shapely
-six
 xarray>=0.14.1
 
 # Development
+flake8
 git
 pip
 pytest

diff --git a/docs/api.rst b/docs/api.rst
@@ -135,17 +135,6 @@ Sea ice tasks
    PlotClimatologyMapSubtask.set_plot_info
 
 
-Configuration
-==============
-.. currentmodule:: mpas_analysis.configuration
-
-.. autosummary::
-   :toctree: generated/
-
-   MpasAnalysisConfigParser.getWithDefault
-   MpasAnalysisConfigParser.getExpression
-
-
 Shared modules
 ==============
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -65,7 +65,7 @@
 # General information about the project.
 project = u'MPAS-Analysis'
 copyright = u'This software is open source software available under the BSD-3' \
-            u'license. Copyright (c) 2020 Triad National Security, LLC. ' \
+            u'license. Copyright (c) 2022 Triad National Security, LLC. ' \
             u'All rights reserved. Copyright (c) 2018 Lawrence Livermore ' \
             u'National Security, LLC. All rights reserved. Copyright (c) ' \
             u'2018 UT-Battelle, LLC. All rights reserved.'

diff --git a/docs/versions.rst b/docs/versions.rst
@@ -15,6 +15,7 @@ Documentation    On GitHub
 `v1.5.0`_        `1.5.0`_
 `v1.6.0`_        `1.6.0`_
 `v1.6.1`_        `1.6.1`_
+`v1.7.0`_        `1.7.0`_
 ================ ===============
 
 .. _`stable`: ../stable/index.html
@@ -28,6 +29,7 @@ Documentation    On GitHub
 .. _`v1.5.0`: ../1.5.0/index.html
 .. _`v1.6.0`: ../1.6.0/index.html
 .. _`v1.6.1`: ../1.6.1/index.html
+.. _`v1.7.0`: ../1.7.0/index.html
 .. _`master`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/master
 .. _`develop`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/develop
 .. _`1.2.6`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.2.6
@@ -39,3 +41,4 @@ Documentation    On GitHub
 .. _`1.5.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.5.0
 .. _`1.6.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.6.0
 .. _`1.6.1`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.6.1
+.. _`1.7.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.7.0
diff --git a/download_analysis_data.py b/download_analysis_data.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at

diff --git a/licenses/_headers/header-css b/licenses/_headers/header-css
@@ -1,10 +1,10 @@
 /*
 / This software is open source software available under the BSD-3 license.
 /
-/ Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-/ Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+/ Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+/ Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 / reserved.
-/ Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+/ Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 /
 / Additional copyright and license information can be found in the LICENSE file
 / distributed with this code, or at

diff --git a/licenses/_headers/header-css-full b/licenses/_headers/header-css-full
@@ -1,9 +1,9 @@
 /*
 / This software is open source software available under the BSD-3 license.
 /
-/ Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-/ Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-/ Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+/ Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+/ Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+/ Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 /
 / Copyright 2018. Los Alamos National Security, LLC. This software was produced
 / under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National

diff --git a/licenses/_headers/header-html b/licenses/_headers/header-html
@@ -1,10 +1,10 @@
 <!--
   - This software is open source software available under the BSD-3 license.
   -
-  - Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-  - Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+  - Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+  - Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
   - reserved.
-  - Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+  - Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
   -
   - Additional copyright and license information can be found in the LICENSE
   - file distributed with this code, or at

diff --git a/licenses/_headers/header-html-full b/licenses/_headers/header-html-full
@@ -1,9 +1,9 @@
 <!--
   - This software is open source software available under the BSD-3 license.
   -
-  - Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-  - Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-  - Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+  - Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+  - Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+  - Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
   -
   - Copyright 2018. Los Alamos National Security, LLC. This software was produced
   - under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National

diff --git a/licenses/_headers/header-ncl b/licenses/_headers/header-ncl
@@ -1,9 +1,9 @@
 ; This software is open source software available under the BSD-3 license.
 ;
-; Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-; Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+; Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+; Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 ; reserved.
-; Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+; Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 ;
 ; Additional copyright and license information can be found in the LICENSE file
 ; distributed with this code, or at

diff --git a/licenses/_headers/header-ncl-full b/licenses/_headers/header-ncl-full
@@ -1,8 +1,8 @@
 ; This software is open source software available under the BSD-3 license.
 ;
-; Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-; Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-; Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+; Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+; Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+; Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 ;
 ; Copyright 2018. Los Alamos National Security, LLC. This software was produced
 ; under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National

diff --git a/licenses/_headers/header-py b/licenses/_headers/header-py
@@ -1,9 +1,9 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at

diff --git a/licenses/_headers/header-py-full b/licenses/_headers/header-py-full
@@ -1,8 +1,8 @@
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Copyright 2018. Los Alamos National Security, LLC. This software was produced
 # under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National

diff --git a/licenses/_headers/license-bump-copyright.sh b/licenses/_headers/license-bump-copyright.sh
@@ -8,10 +8,10 @@
 #
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at

diff --git a/licenses/_headers/license-prepend-missing.sh b/licenses/_headers/license-prepend-missing.sh
@@ -8,10 +8,10 @@
 #
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at

diff --git a/licenses/_headers/license-setup.sh b/licenses/_headers/license-setup.sh
@@ -8,10 +8,10 @@
 #
 # This software is open source software available under the BSD-3 license.
 #
-# Copyright (c) 2020 Triad National Security, LLC. All rights reserved.
-# Copyright (c) 2020 Lawrence Livermore National Security, LLC. All rights
+# Copyright (c) 2022 Triad National Security, LLC. All rights reserved.
+# Copyright (c) 2022 Lawrence Livermore National Security, LLC. All rights
 # reserved.
-# Copyright (c) 2020 UT-Battelle, LLC. All rights reserved.
+# Copyright (c) 2022 UT-Battelle, LLC. All rights reserved.
 #
 # Additional copyright and license information can be found in the LICENSE file
 # distributed with this code, or at

diff --git a/licenses/_headers/update_license.py b/licenses/_headers/update_license.py
@@ -4,12 +4,12 @@
 
 extensions = ['py', 'sh', 'bash', 'html', 'css', 'js', 'ncl']
 
-replace = {'Copyright (c) 2020 Triad National Security, LLC.':
-           'Copyright (c) 2020 Triad National Security, LLC.',
-           'Copyright (c) 2020 Lawrence Livermore National Security, LLC.':
-           'Copyright (c) 2020 Lawrence Livermore National Security, LLC.',
-           'Copyright (c) 2020 UT-Battelle, LLC.':
-           'Copyright (c) 2020 UT-Battelle, LLC.'}
+replace = {'Copyright (c) 2022 Triad National Security, LLC.':
+           'Copyright (c) 2022 Triad National Security, LLC.',
+           'Copyright (c) 2022 Lawrence Livermore National Security, LLC.':
+           'Copyright (c) 2022 Lawrence Livermore National Security, LLC.',
+           'Copyright (c) 2022 UT-Battelle, LLC.':
+           'Copyright (c) 2022 UT-Battelle, LLC.'}
 
 files = []
 for ext in extensions:

diff --git a/mpas_analysis/__init__.py b/mpas_analysis/__init__.py
@@ -3,5 +3,5 @@
 import matplotlib as mpl
 mpl.use('Agg')
 
-__version_info__ = (1, 6, 1)
+__version_info__ = (1, 7, 0)
 __version__ = '.'.join(str(vi) for vi in __version_info__)