Skip to content

Commit

Permalink
Merge pull request #335 from xylar/fill_in_obs_xml
Browse files Browse the repository at this point in the history
Fill in xml for observations

This merge updates an XML database describing the observations used in MPAS-Analysis and makes some changes to how this database is displayed as tables in the documentation.
  • Loading branch information
xylar authored Apr 25, 2018
2 parents 5871157 + 9fd3910 commit f2b8487
Show file tree
Hide file tree
Showing 14 changed files with 1,750 additions and 163 deletions.
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@


# Build some custom rst files
xmlFileName = '../mpas_analysis/obs/observationstable.xml'
for component in ['ocean', 'seaice', 'landice']:
xmlFileName = '../mpas_analysis/obs/observational_datasets.xml'
for component in ['ocean', 'seaice']:
build_rst_table_from_xml(xmlFileName, '{}_obs_table.rst'.format(component),
component)
6 changes: 3 additions & 3 deletions docs/observations.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Observations
============

A variety of observational datasets are used within MPAS-Analysis:

Ocean Observations
Expand All @@ -8,6 +11,3 @@ Sea Ice Observations
--------------------
.. include:: seaice_obs_table.rst

Land Ice Observations
---------------------
.. include:: landice_obs_table.rst
Loading

0 comments on commit f2b8487

Please sign in to comment.