[cig-commits] r15834 - doc/geodynamics.org/benchmarks/trunk/long

[luis at geodynamics.org]

Author: luis
Date: 2009-10-18 00:19:14 -0700 (Sun, 18 Oct 2009)
New Revision: 15834

Modified:
   doc/geodynamics.org/benchmarks/trunk/long/relaxation-topography.html
   doc/geodynamics.org/benchmarks/trunk/long/relaxation-topography.rst
Log:
Updated long/relaxation-topography.rst

Modified: doc/geodynamics.org/benchmarks/trunk/long/relaxation-topography.html
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/long/relaxation-topography.html	2009-10-18 07:19:07 UTC (rev 15833)
+++ doc/geodynamics.org/benchmarks/trunk/long/relaxation-topography.html	2009-10-18 07:19:14 UTC (rev 15834)
@@ -17,44 +17,41 @@
 with the timescale [Folds]</p>
 <blockquote>
 [;t_r = \frac{4\pi\eta}{gL},;]</blockquote>
-<p>where [;eta;] is the viscosity, [;g;] is the gravitational constant,
+<p>where [;\eta;] is the viscosity, [;g;] is the gravitational constant,
 and [;L;] is the wavelength of the initial sinusoid.</p>
 <p>In our case, we simulate a medium with finite depth and finite height.
 The internal fields decay exponentially with depth with a length scale of
 [;L/{2\pi};]. The error in the solution due to a finite height is of
-order [;(2pi{A}/L)^2;], where [;A;] is the amplitude of the sinusoid.
+order [;(2\pi{A}/L)^2;], where [;A;] is the amplitude of the sinusoid.
 We use [;L=1;] and [;A=0.01;], giving errors of order 0.02% and 0.4%.</p>
 <p>The file <tt class="docutils literal"><span class="pre">input/benchmarks/sinusoid/README</span></tt> explains how to run this
 benchmark. Figure [fig:Strain-topo] shows the results of a low-resolution
-run. Even this run is not particularly small ([;128 \times 256;]),
+run. Even this run is not particularly small (128 × 256),
 because we need fairly high resolution to be able to accurately resolve
 the small (1%) height difference. Also note that we use symmetry to only
 simulate half of the wavelength.</p>
-<div class="figure">
-<img alt="images/Paraview_topography.png" src="images/Paraview_topography.png" />
-<p class="caption">Figure [Strain-topo]</p>
-<div class="legend">
-Strain rate and velocities for a sinusoidal topography relaxing
-under gravity.</div>
+<!-- fig:Strain-topo -->
+<div align="center" class="figure">
+<img alt="images/Paraview_topography.png" src="images/Paraview_topography.png" style="width: 90%;" />
+<p class="caption">Strain rate and velocities for a sinusoidal topography relaxing
+under gravity.</p>
 </div>
 <p>Running the code with multiple resolutions and measuring the error in the
 height in the trough gives Figure [fig:topo-error]. Scaling the error
 with resolution gives Figure [fig:scaled-topo-error]. The error decreases
 linearly with increasing resolution, giving us confidence in our ability
 to accurately track topography.</p>
-<div class="figure">
+<!-- fig:topo-error -->
+<div align="center" class="figure">
 <img alt="images/topo_error.png" src="images/topo_error.png" />
-<p class="caption">Figure [fig:topo-error]</p>
-<div class="legend">
-Error in the height at the trough</div>
+<p class="caption">Error in the height at the trough</p>
 </div>
-<div class="figure">
+<!-- fig:scaled-topo-error -->
+<div align="center" class="figure">
 <img alt="images/topo_scaled_error.png" src="images/topo_scaled_error.png" />
-<p class="caption">Figure [fig:scaled-topo-error]</p>
-<div class="legend">
-As in Figure [fig:topo-error], but with the error scaled with [;h;].
+<p class="caption">As in Figure [fig:topo-error], but with the error scaled with [;h;].
 So the medium-resolution error is multiplied by 2 and the
-high-resolution error is multiplied by 4.</div>
+high-resolution error is multiplied by 4.</p>
 </div>
 </div>
 </body>

Modified: doc/geodynamics.org/benchmarks/trunk/long/relaxation-topography.rst
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/long/relaxation-topography.rst	2009-10-18 07:19:07 UTC (rev 15833)
+++ doc/geodynamics.org/benchmarks/trunk/long/relaxation-topography.rst	2009-10-18 07:19:14 UTC (rev 15834)
@@ -8,26 +8,27 @@
 
     [;t_r = \\frac{4\\pi\\eta}{gL},;]
 
-where [;\eta;] is the viscosity, [;g;] is the gravitational constant,
+where [;\\eta;] is the viscosity, [;g;] is the gravitational constant,
 and [;L;] is the wavelength of the initial sinusoid.
 
 In our case, we simulate a medium with finite depth and finite height.
 The internal fields decay exponentially with depth with a length scale of
 [;L/{2\\pi};]. The error in the solution due to a finite height is of
-order [;(2\pi{A}/L)^2;], where [;A;] is the amplitude of the sinusoid.
+order [;(2\\pi{A}/L)^2;], where [;A;] is the amplitude of the sinusoid.
 We use [;L=1;] and [;A=0.01;], giving errors of order 0.02% and 0.4%.
 
 The file ``input/benchmarks/sinusoid/README`` explains how to run this
 benchmark. Figure [fig:Strain-topo] shows the results of a low-resolution
-run. Even this run is not particularly small ([;128 \\times 256;]),
+run. Even this run is not particularly small (128 |times| 256),
 because we need fairly high resolution to be able to accurately resolve
 the small (1%) height difference. Also note that we use symmetry to only
 simulate half of the wavelength.
 
+.. fig:Strain-topo
 .. figure:: images/Paraview_topography.png
+   :align: center
+   :width: 90%
 
-   Figure [Strain-topo]
-
    Strain rate and velocities for a sinusoidal topography relaxing
    under gravity.
 
@@ -37,17 +38,18 @@
 linearly with increasing resolution, giving us confidence in our ability
 to accurately track topography.
 
+.. fig:topo-error
 .. figure:: images/topo_error.png
+   :align: center
 
-   Figure [fig:topo-error]
-
    Error in the height at the trough
 
+.. fig:scaled-topo-error
 .. figure:: images/topo_scaled_error.png
+   :align: center
 
-   Figure [fig:scaled-topo-error]
-
    As in Figure [fig:topo-error], but with the error scaled with [;h;].
    So the medium-resolution error is multiplied by 2 and the
    high-resolution error is multiplied by 4.
    
+.. |times| unicode:: U+00D7