Skip to content

Commit 3cf93a9

Browse files
authored
Merge pull request #1083 from xylar/fix-sic-diff-over-under
Set under/over indices for sea ice conc and thickness
2 parents 54ca87e + d61ed9b commit 3cf93a9

7 files changed

Lines changed: 49 additions & 47 deletions

docs/users_guide/tasks/climatologyMapSeaIceConcNH.rst

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,43 @@ The following configuration options are available for this task::
1818

1919
[climatologyMapSeaIceConcNH]
2020
## options related to plotting horizontally remapped climatologies of
21-
## sea ice concentration against reference model results and observations
21+
## sea ice concentration against control model results and observations
2222
## in the northern hemisphere (NH)
2323

2424
# colormap for model/observations
2525
colormapNameResult = ice
26+
# whether the colormap is indexed or continuous
27+
colormapTypeResult = indexed
2628
# color indices into colormapName for filled contours
2729
colormapIndicesResult = [20, 80, 110, 140, 170, 200, 230, 255]
2830
# colormap levels/values for contour boundaries
2931
colorbarLevelsResult = [0.15, 0.3, 0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1]
3032

3133
# colormap for differences
3234
colormapNameDifference = balance
35+
# whether the colormap is indexed or continuous
36+
colormapTypeDifference = indexed
3337
# color indices into colormapName for filled contours
34-
colormapIndicesDifference = [0, 32, 64, 96, 112, 128, 128, 144, 160, 192,
35-
224, 255]
38+
colormapIndicesDifference = [0, 0, 26, 51, 77, 102, 128, 128, 153, 179, 204, 230, 255, 255]
3639
# colormap levels/values for contour boundaries
37-
colorbarLevelsDifference = [-1., -0.8, -0.6, -0.4, -0.2, -0.1, 0, 0.1, 0.2,
38-
0.4, 0.6, 0.8, 1.]
40+
colorbarLevelsDifference = [-0.5, -0.4, -0.3, -0.2, -0.1, -0.05, 0, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5]
3941

4042
# Months or seasons to plot (These should be left unchanged, since
4143
# observations are only available for these seasons)
4244
seasons = ['JFM', 'JAS']
4345

44-
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
45-
comparisonGrids = ['latlon']
46-
47-
# reference lat/lon for sea ice plots in the northern hemisphere
48-
minimumLatitude = 50
49-
referenceLongitude = 0
46+
# comparison grid(s) (typically 'arctic_extended') on which to plot analysis
47+
comparisonGrids = ['arctic_extended']
5048

5149
# a list of prefixes describing the sources of the observations to be used
5250
observationPrefixes = ['NASATeam', 'Bootstrap']
5351

5452
# arrange subplots vertically?
5553
vertical = False
5654

55+
# the minimum threshold below which concentration is masked out
56+
minConcentration = 0.15
57+
5758
# observations files
5859
concentrationNASATeamNH_JFM = SSMI/NASATeam_NSIDC0051/SSMI_NASATeam_gridded_concentration_NH_jfm.interp0.5x0.5_20180710.nc
5960
concentrationNASATeamNH_JAS = SSMI/NASATeam_NSIDC0051/SSMI_NASATeam_gridded_concentration_NH_jas.interp0.5x0.5_20180710.nc

docs/users_guide/tasks/climatologyMapSeaIceConcSH.rst

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,43 @@ The following configuration options are available for this task::
1818

1919
[climatologyMapSeaIceConcSH]
2020
## options related to plotting horizontally remapped climatologies of
21-
## sea ice concentration against reference model results and observations
21+
## sea ice concentration against control model results and observations
2222
## in the southern hemisphere (SH)
2323

2424
# colormap for model/observations
2525
colormapNameResult = ice
26+
# whether the colormap is indexed or continuous
27+
colormapTypeResult = indexed
2628
# color indices into colormapName for filled contours
2729
colormapIndicesResult = [20, 80, 110, 140, 170, 200, 230, 255]
2830
# colormap levels/values for contour boundaries
2931
colorbarLevelsResult = [0.15, 0.3, 0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1]
3032

3133
# colormap for differences
3234
colormapNameDifference = balance
35+
# whether the colormap is indexed or continuous
36+
colormapTypeDifference = indexed
3337
# color indices into colormapName for filled contours
34-
colormapIndicesDifference = [0, 32, 64, 96, 112, 128, 128, 144, 160, 192,
35-
224, 255]
38+
colormapIndicesDifference = [0, 0, 26, 51, 77, 102, 128, 128, 153, 179, 204, 230, 255, 255]
3639
# colormap levels/values for contour boundaries
37-
colorbarLevelsDifference = [-1., -0.8, -0.6, -0.4, -0.2, -0.1, 0, 0.1, 0.2,
38-
0.4, 0.6, 0.8, 1.]
40+
colorbarLevelsDifference = [-0.5, -0.4, -0.3, -0.2, -0.1, -0.05, 0, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5]
3941

4042
# Months or seasons to plot (These should be left unchanged, since
4143
# observations are only available for these seasons)
4244
seasons = ['DJF', 'JJA']
4345

44-
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
45-
comparisonGrids = ['latlon']
46-
47-
# reference lat/lon for sea ice plots in the northern hemisphere
48-
minimumLatitude = -50
49-
referenceLongitude = 180
46+
# comparison grid(s) (typically 'antarctic_extended') on which to plot analysis
47+
comparisonGrids = ['antarctic_extended']
5048

5149
# a list of prefixes describing the sources of the observations to be used
5250
observationPrefixes = ['NASATeam', 'Bootstrap']
5351

5452
# arrange subplots vertically?
5553
vertical = False
5654

55+
# the minimum threshold below which concentration is masked out
56+
minConcentration = 0.15
57+
5758
# observations files
5859
concentrationNASATeamSH_DJF = SSMI/NASATeam_NSIDC0051/SSMI_NASATeam_gridded_concentration_SH_djf.interp0.5x0.5_20180710.nc
5960
concentrationNASATeamSH_JJA = SSMI/NASATeam_NSIDC0051/SSMI_NASATeam_gridded_concentration_SH_jja.interp0.5x0.5_20180710.nc

docs/users_guide/tasks/climatologyMapSeaIceThickNH.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,33 @@ The following configuration options are available for this task::
1919

2020
[climatologyMapSeaIceThickNH]
2121
## options related to plotting horizontally remapped climatologies of
22-
## sea ice thickness against reference model results and observations
22+
## sea ice thickness against control model results and observations
2323
## in the northern hemisphere (NH)
2424

2525
# colormap for model/observations
26-
colormapNameResult = ice
26+
colormapNameResult = davos
27+
# whether the colormap is indexed or continuous
28+
colormapTypeResult = indexed
2729
# color indices into colormapName for filled contours
2830
colormapIndicesResult = [20, 80, 110, 140, 170, 200, 230, 255]
2931
# colormap levels/values for contour boundaries
3032
colorbarLevelsResult = [0, 0.25, 0.5, 1, 1.5, 2, 2.5, 3, 3.5]
3133

3234
# colormap for differences
3335
colormapNameDifference = balance
36+
# whether the colormap is indexed or continuous
37+
colormapTypeDifference = indexed
3438
# color indices into colormapName for filled contours
35-
colormapIndicesDifference = [0, 32, 64, 96, 128, 128, 160, 192, 224, 255]
39+
colormapIndicesDifference = [0, 0, 32, 64, 96, 128, 128, 160, 192, 223, 255, 255]
3640
# colormap levels/values for contour boundaries
3741
colorbarLevelsDifference = [-3., -2.5, -2, -0.5, -0.1, 0, 0.1, 0.5, 2, 2.5, 3.]
3842

3943
# Months or seasons to plot (These should be left unchanged, since
4044
# observations are only available for these seasons)
4145
seasons = ['FM', 'ON']
4246

43-
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
44-
comparisonGrids = ['latlon']
45-
46-
# reference lat/lon for sea ice plots in the northern hemisphere
47-
minimumLatitude = 50
48-
referenceLongitude = 0
47+
# comparison grid(s) (typically 'arctic_extended') on which to plot analysis
48+
comparisonGrids = ['arctic_extended']
4949

5050
# a list of prefixes describing the sources of the observations to be used
5151
observationPrefixes = ['']

docs/users_guide/tasks/climatologyMapSeaIceThickSH.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,33 @@ The following configuration options are available for this task::
1919

2020
[climatologyMapSeaIceThickSH]
2121
## options related to plotting horizontally remapped climatologies of
22-
## sea ice thickness against reference model results and observations
22+
## sea ice thickness against control model results and observations
2323
## in the southern hemisphere (SH)
2424

2525
# colormap for model/observations
26-
colormapNameResult = ice
26+
colormapNameResult = davos
27+
# whether the colormap is indexed or continuous
28+
colormapTypeResult = indexed
2729
# color indices into colormapName for filled contours
2830
colormapIndicesResult = [20, 80, 110, 140, 170, 200, 230, 255]
2931
# colormap levels/values for contour boundaries
3032
colorbarLevelsResult = [0, 0.2, 0.4, 0.6, 0.8, 1, 1.5, 2, 2.5]
3133

3234
# colormap for differences
3335
colormapNameDifference = balance
36+
# whether the colormap is indexed or continuous
37+
colormapTypeDifference = indexed
3438
# color indices into colormapName for filled contours
35-
colormapIndicesDifference = [0, 32, 64, 96, 128, 128, 160, 192, 224, 255]
39+
colormapIndicesDifference = [0, 0, 32, 64, 96, 128, 128, 160, 192, 223, 255, 255]
3640
# colormap levels/values for contour boundaries
3741
colorbarLevelsDifference = [-3., -2.5, -2, -0.5, -0.1, 0, 0.1, 0.5, 2, 2.5, 3.]
3842

3943
# Months or seasons to plot (These should be left unchanged, since
4044
# observations are only available for these seasons)
4145
seasons = ['FM', 'ON']
4246

43-
# comparison grid(s) ('latlon', 'antarctic') on which to plot analysis
44-
comparisonGrids = ['latlon']
45-
46-
# reference lat/lon for sea ice plots in the northern hemisphere
47-
minimumLatitude = -50
48-
referenceLongitude = 180
47+
# comparison grid(s) (typically 'antarctic_extended') on which to plot analysis
48+
comparisonGrids = ['antarctic_extended']
4949

5050
# a list of prefixes describing the sources of the observations to be used
5151
observationPrefixes = ['']

mpas_analysis/default.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4711,7 +4711,7 @@ colormapNameDifference = balance
47114711
# whether the colormap is indexed or continuous
47124712
colormapTypeDifference = indexed
47134713
# color indices into colormapName for filled contours
4714-
colormapIndicesDifference = [0, 32, 64, 96, 112, 128, 128, 144, 160, 192, 224, 255]
4714+
colormapIndicesDifference = [0, 0, 26, 51, 77, 102, 128, 128, 153, 179, 204, 230, 255, 255]
47154715
# colormap levels/values for contour boundaries
47164716
colorbarLevelsDifference = [-0.5, -0.4, -0.3, -0.2, -0.1, -0.05, 0, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5]
47174717

@@ -4757,7 +4757,7 @@ colormapNameDifference = balance
47574757
# whether the colormap is indexed or continuous
47584758
colormapTypeDifference = indexed
47594759
# color indices into colormapName for filled contours
4760-
colormapIndicesDifference = [0, 32, 64, 96, 112, 128, 128, 144, 160, 192, 224, 255]
4760+
colormapIndicesDifference = [0, 0, 26, 51, 77, 102, 128, 128, 153, 179, 204, 230, 255, 255]
47614761
# colormap levels/values for contour boundaries
47624762
colorbarLevelsDifference = [-0.5, -0.4, -0.3, -0.2, -0.1, -0.05, 0, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5]
47634763

@@ -4803,7 +4803,7 @@ colormapNameDifference = balance
48034803
# whether the colormap is indexed or continuous
48044804
colormapTypeDifference = indexed
48054805
# color indices into colormapName for filled contours
4806-
colormapIndicesDifference = [0, 32, 64, 96, 128, 128, 160, 192, 224, 255]
4806+
colormapIndicesDifference = [0, 0, 32, 64, 96, 128, 128, 160, 192, 223, 255, 255]
48074807
# colormap levels/values for contour boundaries
48084808
colorbarLevelsDifference = [-3., -2.5, -2, -0.5, -0.1, 0, 0.1, 0.5, 2, 2.5, 3.]
48094809

@@ -4844,7 +4844,7 @@ colormapNameDifference = balance
48444844
# whether the colormap is indexed or continuous
48454845
colormapTypeDifference = indexed
48464846
# color indices into colormapName for filled contours
4847-
colormapIndicesDifference = [0, 32, 64, 96, 128, 128, 160, 192, 224, 255]
4847+
colormapIndicesDifference = [0, 0, 32, 64, 96, 128, 128, 160, 192, 223, 255, 255]
48484848
# colormap levels/values for contour boundaries
48494849
colorbarLevelsDifference = [-3., -2.5, -2, -0.5, -0.1, 0, 0.1, 0.5, 2, 2.5, 3.]
48504850

mpas_analysis/sea_ice/climatology_map_sea_ice_conc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def _add_obs_tasks(self, seasons, comparisonGridNames, hemisphere,
184184
galleryName='Observations: SSM/I {}'.format(
185185
prefix),
186186
maskMinThreshold=minConcentration,
187-
extend='neither',
187+
extend='both',
188188
prependComparisonGrid=False)
189189

190190
self.add_subtask(subtask)
@@ -231,7 +231,7 @@ def _add_ref_tasks(self, seasons, comparisonGridNames, hemisphere,
231231
groupLink='{}_conc'.format(hemisphere.lower()),
232232
galleryName=galleryName,
233233
maskMinThreshold=minConcentration,
234-
extend='neither',
234+
extend='both',
235235
prependComparisonGrid=False)
236236

237237
self.add_subtask(subtask)

mpas_analysis/sea_ice/climatology_map_sea_ice_thick.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def __init__(self, config, mpasClimatologyTask, hemisphere,
166166
groupLink=f'{hemisphere.lower()}_thick',
167167
galleryName=galleryName,
168168
maskMinThreshold=0,
169-
extend='neither',
169+
extend='both',
170170
prependComparisonGrid=False)
171171

172172
self.add_subtask(subtask)

0 commit comments

Comments
 (0)