Skip to content

Commit b892c8c

Browse files
authored
Merge pull request #1054 from xylar/fix-docs
Fix several errors in the docs
2 parents 99071b9 + 0a5df49 commit b892c8c

9 files changed

+41
-36
lines changed

docs/tutorials/dev_getting_started.rst

+1
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ following:
442442
If you find that new jobs are being lanuched for ncremap tasks, set:
443443

444444
.. code-block:: ini
445+
445446
[execute]
446447
447448
...

docs/users_guide/tasks/antshipTransects.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _task_antshipTransects:
22

33
antshipTransects
4-
=============
4+
================
55

66
An analysis task for interpolating MPAS fields to transects from ship-based observations around Antarctica and comparing them.
77

@@ -15,7 +15,6 @@ Configuration Options
1515

1616
The following configuration options are available for this task::
1717

18-
[antshipTransects]
1918
[antshipTransects]
2019
## options related to plotting model ship CTD transects.
2120

docs/users_guide/tasks/climatologyMapSeaIceAlbedoNH.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _task_climatologyMapSeaIceAlbedoNH:
22

33
climatologyMapSeaIceAlbedoNH
4-
==========================
4+
============================
55

66
An analysis task for plotting maps of Arctic sea ice broadband albedo.
77
Care must be taken when evaluating albedo - long-time averages do not

docs/users_guide/tasks/climatologyMapSeaIceVolumeTendencyThermoNH.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _task_climatologyMapSeaIceVolumeTendencyThermoNH:
22

33
climatologyMapSeaIceVolumeTendencyThermoNH
4-
========================================
4+
==========================================
55

66
An analysis task for plotting maps of Arctic sea ice volume tendency due to thermodynamics.
77

docs/users_guide/tasks/climatologyMapSeaIceVolumeTendencyThermoSH.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _task_climatologyMapSeaIceVolumeTendencyThermoSH:
22

33
climatologyMapSeaIceVolumeTendencyThermoSH
4-
========================================
4+
==========================================
55

66
An analysis task for plotting maps of Antarctic sea ice volume tendency due to thermodynamics.
77

docs/users_guide/tasks/climatologyMapSeaIceVolumeTendencyTranspNH.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _task_climatologyMapSeaIceVolumeTendencyTranspNH:
22

33
climatologyMapSeaIceVolumeTendencyTranspNH
4-
========================================
4+
==========================================
55

66
An analysis task for plotting maps of Arctic sea ice volume tendency due to transport.
77

docs/users_guide/tasks/climatologyMapSeaIceVolumeTendencyTranspSH.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _task_climatologyMapSeaIceVolumeTendencyTranspSH:
22

33
climatologyMapSeaIceVolumeTendencyTranspSH
4-
========================================
4+
==========================================
55

66
An analysis task for plotting maps of Antarctic sea ice volume tendency due to transport.
77

docs/users_guide/tasks/osnapTransects.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.. _task_osnapTransects:
22

33
osnapTransects
4-
=============
4+
==============
55

66
An analysis task for interpolating MPAS fields to
7-
`Overturning in the Subpolar North Atlantic Program (OSNAP)`_ transects
7+
`Overturning in the Subpolar North Atlantic Program (OSNAP)`_ transects
88
and comparing them with ship-based observations.
99

1010
Component and Tags::
@@ -121,7 +121,7 @@ For details on these configuration options, see:
121121
Observations
122122
------------
123123

124-
:ref:`osnap`
124+
:ref:`osnap_t_s`
125125

126126
Example Result
127127
--------------

mpas_analysis/obs/observational_datasets.xml

+31-26
Original file line numberDiff line numberDiff line change
@@ -1042,11 +1042,16 @@
10421042
ocean
10431043
</component>
10441044
<description>
1045-
AntShip
1046-
----
1047-
Southern Ocean (90°S-45°S) conservative temperature and absolute salinity profiles compilation (OCEAN ICE D1.1)
1045+
Southern Ocean (90°S-45°S) conservative temperature and absolute salinity
1046+
profiles compilation (OCEAN ICE D1.1)
10481047

1049-
This profile compilation contains conservative temperature and absolute salinity profiles computed from ship CTD, Argo floats and seal-borne profilers in the Southern Ocean (90°S-45°S) since 1972, using the GSW toolbox. It provides with an opportunity to investigate the broad scale climatology of the Southern Ocean hydrography on and off the continental shelf and facilitate localized timeseries analysis of the variability across various timescales.
1048+
This profile compilation contains conservative temperature and absolute
1049+
salinity profiles computed from ship CTD, Argo floats and seal-borne
1050+
profilers in the Southern Ocean (90°S-45°S) since 1972, using the GSW
1051+
toolbox. It provides with an opportunity to investigate the broad scale
1052+
climatology of the Southern Ocean hydrography on and off the continental
1053+
shelf and facilitate localized timeseries analysis of the variability
1054+
across various timescales.
10501055

10511056
</description>
10521057
<source>
@@ -1605,27 +1610,27 @@
16051610
ocean
16061611
</component>
16071612
<description>
1608-
OSNAP is designed to provide a continuous record of the full-water
1609-
column, trans-basin fluxes of heat, mass and freshwater in the subpolar
1610-
North Atlantic. It consists of two legs: one extending from southern
1611-
Labrador to the southwestern tip of Greenland across the mouth of the
1612-
Labrador Sea (OSNAP West), and the second from the southeastern tip of
1613-
Greenland to Scotland (OSNAP East). The observing system also includes
1614-
subsurface floats (OSNAP Floats) in order to trace the pathways of
1615-
overflow waters in the basin and to assess the connectivity of currents
1616-
crossing the OSNAP line. The location of the OSNAP East and West legs
1617-
purposefully melds with a number of long-term observational efforts in
1618-
the North Atlantic: the Canadian repeat AR7W program in the Labrador
1619-
Sea; the German Labrador Sea western boundary array at 53°N; the
1620-
global Ocean Observatories Initiative node to be placed in the
1621-
southwestern Irminger Sea; the repeat A1E/AR7E hydrographic sections
1622-
across the Irminger and Iceland basins; and the Ellett line in the
1623-
Rockall region. Importantly, this observing system, in conjunction with
1624-
the RAPID/MOCHA array at 26ºN and the EU THOR/NACLIM program, will
1625-
provide a comprehensive measure of the Atlantic Meridional Overturning
1626-
Circulation (AMOC) and provide a means to evaluate intergyre
1627-
connectivity in the North Atlantic. OSNAP is a collaborative effort,
1628-
which includes several countries including US, Canada, China, France,
1613+
OSNAP is designed to provide a continuous record of the full-water
1614+
column, trans-basin fluxes of heat, mass and freshwater in the subpolar
1615+
North Atlantic. It consists of two legs: one extending from southern
1616+
Labrador to the southwestern tip of Greenland across the mouth of the
1617+
Labrador Sea (OSNAP West), and the second from the southeastern tip of
1618+
Greenland to Scotland (OSNAP East). The observing system also includes
1619+
subsurface floats (OSNAP Floats) in order to trace the pathways of
1620+
overflow waters in the basin and to assess the connectivity of currents
1621+
crossing the OSNAP line. The location of the OSNAP East and West legs
1622+
purposefully melds with a number of long-term observational efforts in
1623+
the North Atlantic: the Canadian repeat AR7W program in the Labrador
1624+
Sea; the German Labrador Sea western boundary array at 53°N; the
1625+
global Ocean Observatories Initiative node to be placed in the
1626+
southwestern Irminger Sea; the repeat A1E/AR7E hydrographic sections
1627+
across the Irminger and Iceland basins; and the Ellett line in the
1628+
Rockall region. Importantly, this observing system, in conjunction with
1629+
the RAPID/MOCHA array at 26ºN and the EU THOR/NACLIM program, will
1630+
provide a comprehensive measure of the Atlantic Meridional Overturning
1631+
Circulation (AMOC) and provide a means to evaluate intergyre
1632+
connectivity in the North Atlantic. OSNAP is a collaborative effort,
1633+
which includes several countries including US, Canada, China, France,
16291634
Germany, Netherlands and the UK.
16301635
</description>
16311636
<source>
@@ -1646,7 +1651,7 @@
16461651
- preprocess_observations/preprocessingOSNAP30day.ipynb
16471652
</preprocessing>
16481653
<tasks>
1649-
- climatologyMapOSNAP
1654+
- osnapTransects
16501655
</tasks>
16511656
<subdirectory>
16521657
Ocean/OSNAP

0 commit comments

Comments
 (0)