Merge pull request #857 from MPAS-Dev/develop

Merge `develop` into `master` for v1.6.0 release

README.md

@@ -30,7 +30,7 @@ used those components.
 
 [https://mpas-dev.github.io/MPAS-Analysis/stable/](https://mpas-dev.github.io/MPAS-Analysis/stable/)
 
-## Installation
+## Installation for users
 
 MPAS-Analysis is available as an anaconda package via the `conda-forge` channel:
 
@@ -40,6 +40,8 @@ conda create -n mpas-analysis mpas-analysis
 conda activate mpas-analysis
 ```
 
+## Installation for developers
+
 To use the latest version for developers, get the code from:
  [https://github.com/MPAS-Dev/MPAS-Analysis](https://github.com/MPAS-Dev/MPAS-Analysis)
 

azure-pipelines.yml

@@ -21,12 +21,12 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
-      Python37:
-        python.version: '3.7'
       Python38:
         python.version: '3.8'
       Python39:
         python.version: '3.9'
+      Python310:
+        python.version: '3.10'
 
   steps:
   - bash: echo "##vso[task.prependpath]$CONDA/bin"
@@ -62,8 +62,8 @@ jobs:
       conda activate build
       conda create --yes --quiet --name docs -c ${CONDA_PREFIX}/conda-bld/ \
           python=$PYTHON_VERSION mpas-analysis sphinx mock sphinx_rtd_theme \
-          tabulate m2r
-    condition: eq(variables['python.version'], '3.8')
+          tabulate m2r2 "mistune<2"
+    condition: eq(variables['python.version'], '3.9')
     displayName: Create Anaconda docs environment
 
   - bash: |
@@ -128,7 +128,7 @@ jobs:
         fi
         popd || exit 1
       fi
-    condition: eq(variables['python.version'], '3.8')
+    condition: eq(variables['python.version'], '3.9')
     displayName: build and deploy docs
 
 - job:
@@ -137,8 +137,8 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
-      Python38:
-        python.version: '3.8'
+      Python39:
+        python.version: '3.9'
 
   steps:
   - bash: echo "##vso[task.prependpath]$CONDA/bin"
@@ -178,12 +178,12 @@ jobs:
     vmImage: 'macOS-latest'
   strategy:
     matrix:
-      Python37:
-        python.version: '3.7'
       Python38:
         python.version: '3.8'
       Python39:
         python.version: '3.9'
+      Python310:
+        python.version: '3.10'
 
   steps:
   - bash: echo "##vso[task.prependpath]$CONDA/bin"

ci/python3.7.yaml → ci/python3.10.yaml

@@ -5,4 +5,4 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.7.* *_cpython
+- 3.10.* *_cpython

ci/recipe/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "MPAS-Analysis" %}
-{% set version = "1.5.0" %}
+{% set version = "1.6.0" %}
 
 package:
   name: {{ name|lower }}
@@ -18,10 +18,10 @@ build:
 
 requirements:
   host:
-    - python >=3.7,<3.10
+    - python >=3.7
     - pip
   run:
-    - python >=3.7,<3.10
+    - python >=3.7
     - bottleneck
     - cartopy >=0.18.0
     - cartopy_offlinedata

configs/alcf/config.20180410.A_WCYCL1950_HR.ne120_oRRS18v3_ICG.theta → configs/alcf/20180410.A_WCYCL1950_HR.ne120_oRRS18v3_ICG.theta.cfg

@@ -30,16 +30,10 @@ parallelTaskCount = 4
 # handle 12 simultaneous processes, one for each monthly climatology.
 ncclimoParallelMode = serial
 
-[diagnostics]
-## config options related to observations, mapping files and region files used
-## by MPAS-Analysis in diagnostics computations.
-
-# The base path to the diagnostics directory.  Typically, this will be a shared
-# directory on each E3SM supported machine (see the example config files for
-# its location).  For other machines, this would be the directory pointed to
-# when running "download_analysis_data.py" to get the public observations,
-# mapping files and region files.
-baseDirectory = /lus/theta-fs0/projects/ClimateEnergy_3/diagnostics
+# the number of total threads to use when ncclimo runs in "bck" or "mpi" mode.
+# Reduce this number if ncclimo is crashing (maybe because it is out of memory).
+# The number of threads must be a factor of 12 (1, 2, 3, 4, 6 or 12).
+ncclimoThreads = 4
 
 [input]
 ## options related to reading in the results to be analyzed

configs/alcf/20190405.GMPAS-DIB-IAF-ISMF.T62_oRRS30to10v3wLI.theta.yrs41-50.conf

@@ -23,13 +23,18 @@ mainRunName = 20190405.GMPAS-DIB-IAF-ISMF.T62_oRRS30to10v3wLI.theta
 ## options related to executing parallel tasks
 
 # the number of parallel tasks (1 means tasks run in serial, the default)
-parallelTaskCount = 12
+parallelTaskCount = 4
 
 # the parallelism mode in ncclimo ("serial" or "bck")
 # Set this to "bck" (background parallelism) if running on a machine that can
 # handle 12 simultaneous processes, one for each monthly climatology.
 ncclimoParallelMode = bck
 
+# the number of total threads to use when ncclimo runs in "bck" or "mpi" mode.
+# Reduce this number if ncclimo is crashing (maybe because it is out of memory).
+# The number of threads must be a factor of 12 (1, 2, 3, 4, 6 or 12).
+ncclimoThreads = 4
+
 [diagnostics]
 ## config options related to observations, mapping files and region files used
 ## by MPAS-Analysis in diagnostics computations.