Skip to content

Split climatology maps into more subtasks #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xylar merged 8 commits into from
Dec 8, 2017
Merged

Split climatology maps into more subtasks #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e70f40f
Split ocean climaotlogy mpas into more subtasks
xylar Oct 9, 2017
4139e82
Split sea-ice climatology maps into subtasks
xylar Oct 9, 2017
86533ed
Add antarctic comparison grid to ocean clim. maps
xylar Aug 14, 2017
810680f
Add subtask for remapping observations
xylar Dec 6, 2017
d340a78
Rename file for custom config parser
xylar Dec 7, 2017
636f3c5
Update auto-generated docs
xylar Dec 7, 2017
7eb0ae2
Add new units tests for the obs. remap. subtask
xylar Dec 7, 2017
e5f8606
Update unit tests to be consistent with recent changes
xylar Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions docs/api.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@ Ocean tasks
TimeSeriesOHC
TimeSeriesSST

.. currentmodule:: mpas_analysis.ocean.plot_climatology_map_subtask

.. autosummary::
:toctree: generated/

PlotClimatologyMapSubtask
PlotClimatologyMapSubtask.set_plot_info


Sea ice tasks
-------------

Expand All @@ -69,10 +78,18 @@ Sea ice tasks
ClimatologyMapSeaIceThick
TimeSeriesSeaIce

.. currentmodule:: mpas_analysis.sea_ice.plot_climatology_map_subtask

.. autosummary::
:toctree: generated/

PlotClimatologyMapSubtask
PlotClimatologyMapSubtask.set_plot_info


Configuration
==============
.. currentmodule:: mpas_analysis.configuration.MpasAnalysisConfigParser
.. currentmodule:: mpas_analysis.configuration

.. autosummary::
:toctree: generated/
Expand Down Expand Up @@ -122,7 +139,6 @@ Climatology
get_comparison_descriptor
get_antarctic_stereographic_projection
get_remapper
get_observation_climatology_file_names
compute_monthly_climatology
compute_climatology
add_years_months_days_in_month
Expand All @@ -134,6 +150,11 @@ Climatology
RemapMpasClimatologySubtask
RemapMpasClimatologySubtask.get_file_name

RemapObservedClimatologySubtask
RemapObservedClimatologySubtask.get_observation_descriptor
RemapObservedClimatologySubtask.build_observational_dataset
RemapObservedClimatologySubtask.get_file_name

Time Series
-----------
.. currentmodule:: mpas_analysis.shared.time_series
Expand Down
20 changes: 12 additions & 8 deletions mpas_analysis/config.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,14 @@ startYear = 11
# the last year over which to average climatalogies
endYear = 20

# The comparison grid resolution in degrees
# The comparison lat/lon grid resolution in degrees
comparisonLatResolution = 0.5
comparisonLonResolution = 0.5

# The comparison Antarctic polar stereographic grid size and resolution in km
comparisonAntarcticStereoWidth = 6000.
comparisonAntarcticStereoResolution = 10.

# interpolation order for model and observation results. Likely values are
# 'bilinear', 'neareststod' (nearest neighbor) or 'conserve'
mpasInterpolationMethod = bilinear
Expand Down Expand Up @@ -524,7 +528,7 @@ colorbarLevelsDifference = [-5, -3, -2, -1, 0, 1, 2, 3, 5]
# Nov, Dec, JFM, AMJ, JAS, OND, ANN)
seasons = ['JFM', 'JAS', 'ANN']

# comparison grid(s) ('lonlat', 'anatarctic') on which to plot analysis
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
comparisonGrids = ['latlon']

[climatologyMapSSS]
Expand All @@ -549,7 +553,7 @@ colorbarLevelsDifference = [-3, -2, -1, -0.5, 0, 0.5, 1, 2, 3]
# Nov, Dec, JFM, AMJ, JAS, OND, ANN)
seasons = ['JFM', 'JAS', 'ANN']

# comparison grid(s) ('lonlat', 'anatarctic') on which to plot analysis
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
comparisonGrids = ['latlon']

[climatologyMapMLD]
Expand All @@ -574,7 +578,7 @@ colorbarLevelsDifference = [-150, -80, -30, -10, 0, 10, 30, 80, 150]
# Nov, Dec, JFM, AMJ, JAS, OND, ANN)
seasons = ['JFM', 'JAS', 'ANN']

# comparison grid(s) ('lonlat', 'anatarctic') on which to plot analysis
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
comparisonGrids = ['latlon']

[climatologyMapSeaIceConcNH]
Expand All @@ -600,7 +604,7 @@ colorbarLevelsDifference = [-1., -0.8, -0.6, -0.4, -0.2, 0, 0.2, 0.4, 0.6, 0.8,
# observations are only available for these seasons)
seasons = ['JFM', 'JAS']

# comparison grid(s) ('lonlat', 'anatarctic') on which to plot analysis
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
comparisonGrids = ['latlon']

# reference lat/lon for sea ice plots in the northern hemisphere
Expand Down Expand Up @@ -636,7 +640,7 @@ colorbarLevelsDifference = [-1., -0.8, -0.6, -0.4, -0.2, 0, 0.2, 0.4, 0.6, 0.8,
# observations are only available for these seasons)
seasons = ['DJF', 'JJA']

# comparison grid(s) ('lonlat', 'anatarctic') on which to plot analysis
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
comparisonGrids = ['latlon']

# reference lat/lon for sea ice plots in the northern hemisphere
Expand Down Expand Up @@ -672,7 +676,7 @@ colorbarLevelsDifference = [-3., -2.5, -2, -0.5, -0.1, 0, 0.1, 0.5, 2, 2.5, 3.]
# observations are only available for these seasons)
seasons = ['FM', 'ON']

# comparison grid(s) ('lonlat', 'anatarctic') on which to plot analysis
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
comparisonGrids = ['latlon']

# reference lat/lon for sea ice plots in the northern hemisphere
Expand Down Expand Up @@ -708,7 +712,7 @@ colorbarLevelsDifference = [-3., -2.5, -2, -0.5, -0.1, 0, 0.1, 0.5, 2, 2.5, 3.]
# observations are only available for these seasons)
seasons = ['FM', 'ON']

# comparison grid(s) ('lonlat', 'anatarctic') on which to plot analysis
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
comparisonGrids = ['latlon']

# reference lat/lon for sea ice plots in the northern hemisphere
Expand Down
2 changes: 1 addition & 1 deletion mpas_analysis/configuration/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from .MpasAnalysisConfigParser import MpasAnalysisConfigParser
from .mpas_analysis_config_parser import MpasAnalysisConfigParser
0 ...configuration/MpasAnalysisConfigParser.py → ...figuration/mpas_analysis_config_parser.py
View file
Open in desktop
File renamed without changes.
8 changes: 5 additions & 3 deletions mpas_analysis/ocean/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from .climatology_map import ClimatologyMapSST, ClimatologyMapMLD, \
ClimatologyMapSSS
from .climatology_map_sst import ClimatologyMapSST
from .climatology_map_mld import ClimatologyMapMLD
from .climatology_map_sss import ClimatologyMapSSS

from .time_series_ohc import TimeSeriesOHC
from .time_series_sst import TimeSeriesSST
from .index_nino34 import IndexNino34
from .streamfunction_moc import StreamfunctionMOC
from .meridional_heat_transport import MeridionalHeatTransport
from .meridional_heat_transport import MeridionalHeatTransport
Loading