Skip to content

Commit

Permalink
Merge pull request #863 from MPAS-Dev/develop
Browse files Browse the repository at this point in the history
Merge develop to master for 1.6.1 release
  • Loading branch information
xylar authored Feb 8, 2022
2 parents bd151d2 + c48a4e5 commit cf30776
Show file tree
Hide file tree
Showing 21 changed files with 391 additions and 266 deletions.
4 changes: 2 additions & 2 deletions ci/recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "MPAS-Analysis" %}
{% set version = "1.6.0" %}
{% set version = "1.6.1" %}

package:
name: {{ name|lower }}
Expand Down Expand Up @@ -40,7 +40,7 @@ requirements:
- pillow
- progressbar2
- pyproj
- pyremap >=0.0.13,<0.1.0
- pyremap >=0.0.14,<0.1.0
- python-dateutil
- requests
- scipy
Expand Down
2 changes: 1 addition & 1 deletion dev-spec.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pandas
pillow
progressbar2
pyproj
pyremap>=0.0.13,<0.1.0
pyremap>=0.0.14,<0.1.0
python-dateutil
requests
scipy
Expand Down
12 changes: 11 additions & 1 deletion docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ Climatology
:toctree: generated/

get_comparison_descriptor
get_antarctic_stereographic_projection
get_remapper
compute_monthly_climatology
compute_climatology
Expand Down Expand Up @@ -275,6 +274,17 @@ Plotting
add_inset


Projection
----------
.. currentmodule:: mpas_analysis.shared.projection

.. autosummary::
:toctree: generated/

get_pyproj_projection
get_cartopy_projection


Regions
-------
.. currentmodule:: mpas_analysis.shared.regions
Expand Down
3 changes: 3 additions & 0 deletions docs/versions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Documentation On GitHub
`v1.4.0`_ `1.4.0`_
`v1.5.0`_ `1.5.0`_
`v1.6.0`_ `1.6.0`_
`v1.6.1`_ `1.6.1`_
================ ===============

.. _`stable`: ../stable/index.html
Expand All @@ -26,6 +27,7 @@ Documentation On GitHub
.. _`v1.4.0`: ../1.4.0/index.html
.. _`v1.5.0`: ../1.5.0/index.html
.. _`v1.6.0`: ../1.6.0/index.html
.. _`v1.6.1`: ../1.6.1/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
Expand All @@ -36,3 +38,4 @@ Documentation On GitHub
.. _`1.4.0`: https://github.com/MPAS-Dev/MPAS-Analysis/tree/1.4.0
.. _`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
2 changes: 1 addition & 1 deletion mpas_analysis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
import matplotlib as mpl
mpl.use('Agg')

__version_info__ = (1, 6, 0)
__version_info__ = (1, 6, 1)
__version__ = '.'.join(str(vi) for vi in __version_info__)
68 changes: 66 additions & 2 deletions mpas_analysis/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,16 @@ comparisonAntarcticStereoResolution = 10.
comparisonArcticStereoWidth = 6000.
comparisonArcticStereoResolution = 10.

# The comparison North Atlantic grid size and resolution in km
comparisonNorthAtlanticWidth = 8500.
comparisonNorthAtlanticHeight = 5500.
comparisonNorthAtlanticResolution = 20.

# The comparison North Pacific c grid size and resolution in km
comparisonNorthPacificWidth = 15000.
comparisonNorthPacificHeight = 5000.
comparisonNorthPacificResolution = 20.

# interpolation order for model and observation results. Likely values are
# 'bilinear', 'neareststod' (nearest neighbor) or 'conserve'
mpasInterpolationMethod = bilinear
Expand Down Expand Up @@ -349,12 +359,66 @@ dpi = 200
# Write out PDFs in addition to PNGs?
pdf = False

[polarProjection]
## options related to polar-projection plots
[plot_arctic]
## options related to Arctic projection plots

# figure sizes for different numbers of panels and layouts
onePanelFigSize = (8, 7.5)
threePanelVertFigSize = (8, 22)
threePanelHorizFigSize = (22, 7.5)

# whether to use the cartopy coastline (as opposed to the model coastline)
useCartopyCoastline = True

# latitude and longitude grid lines
latLines = np.arange(-80., 81., 10.)
lonLines = np.arange(-180., 181., 30.)

[plot_antarctic]
## options related to Antarctic projection plots

# figure sizes for different numbers of panels and layouts
onePanelFigSize = (8, 7.5)
threePanelVertFigSize = (8, 22)
threePanelHorizFigSize = (22, 7.5)

# whether to use the cartopy coastline (as opposed to the model coastline)
useCartopyCoastline = True

# latitude and longitude grid lines
latLines = np.arange(-80., 81., 10.)
lonLines = np.arange(-180., 181., 30.)

[plot_north_atlantic]
## options related to North Atlantic projection plots

# figure sizes for different numbers of panels and layouts
onePanelFigSize = (8, 7.5)
threePanelVertFigSize = (8, 16)
threePanelHorizFigSize = (22, 7.5)

# whether to use the cartopy coastline (as opposed to the model coastline)
useCartopyCoastline = True

# latitude and longitude grid lines
latLines = np.arange(-80., 81., 10.)
lonLines = np.arange(-180., 181., 30.)

[plot_north_pacific]
## options related to North Pacific projection plots

# figure sizes for different numbers of panels and layouts
onePanelFigSize = (8, 7.5)
threePanelVertFigSize = (8, 10)
threePanelHorizFigSize = (22, 7.5)

# whether to use the cartopy coastline (as opposed to the model coastline)
useCartopyCoastline = True

# latitude and longitude grid lines
latLines = np.arange(-80., 81., 10.)
lonLines = np.arange(-180., 181., 30.)


[html]
## options related to generating a webpage to display the analysis
Expand Down
5 changes: 3 additions & 2 deletions mpas_analysis/ocean/climatology_map_antarctic_melt.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
from mpas_analysis.shared.io import write_netcdf

from mpas_analysis.shared.climatology import RemapMpasClimatologySubtask, \
RemapObservedClimatologySubtask, get_antarctic_stereographic_projection
RemapObservedClimatologySubtask
from mpas_analysis.shared.projection import get_pyproj_projection
from mpas_analysis.shared.climatology.climatology import \
get_masked_mpas_climatology_file_name

Expand Down Expand Up @@ -294,7 +295,7 @@ def get_observation_descriptor(self, fileName): # {{{

# create a descriptor of the observation grid using the x/y polar
# stereographic coordinates
projection = get_antarctic_stereographic_projection()
projection = get_pyproj_projection(comparison_grid_name='antarctic')
obsDescriptor = ProjectionGridDescriptor.read(
projection, fileName=fileName, xVarName='x', yVarName='y')
return obsDescriptor # }}}
Expand Down
6 changes: 3 additions & 3 deletions mpas_analysis/ocean/climatology_map_schmidtko.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

from mpas_analysis.shared.io.utility import build_obs_path

from mpas_analysis.shared.climatology import RemapObservedClimatologySubtask, \
get_antarctic_stereographic_projection
from mpas_analysis.shared.climatology import RemapObservedClimatologySubtask
from mpas_analysis.shared.projection import get_pyproj_projection


class ClimatologyMapSchmidtko(AnalysisTask): # {{{
Expand Down Expand Up @@ -262,7 +262,7 @@ def get_observation_descriptor(self, fileName): # {{{

# create a descriptor of the observation grid using the x/y polar
# stereographic coordinates
projection = get_antarctic_stereographic_projection()
projection = get_pyproj_projection(comparison_grid_name='antarctic')
obsDescriptor = ProjectionGridDescriptor.read(
projection, fileName=fileName, xVarName='x', yVarName='y')
return obsDescriptor # }}}
Expand Down
Loading

0 comments on commit cf30776

Please sign in to comment.