[cig-commits] r15787 - doc/geodynamics.org/benchmarks/trunk/long
luis at geodynamics.org
luis at geodynamics.org
Wed Oct 7 12:16:04 PDT 2009
Author: luis
Date: 2009-10-07 12:16:03 -0700 (Wed, 07 Oct 2009)
New Revision: 15787
Modified:
doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.html
doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.rst
Log:
Fixed figures in long/falling-sphere.rst
Modified: doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.html
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.html 2009-10-07 19:15:55 UTC (rev 15786)
+++ doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.html 2009-10-07 19:16:03 UTC (rev 15787)
@@ -5,19 +5,19 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
<title>Falling Sphere</title>
-<link rel="stylesheet" href="../css/default.css" type="text/css" />
+<link rel="stylesheet" href="../css/voidspace.css" type="text/css" />
</head>
<body>
<div class="document" id="falling-sphere">
<h1 class="title">Falling Sphere</h1>
-<p>This benchmark simulates a rigid sphere falling through a cylinder filled
-with a viscous medium as in Figure [fig:Sphere-Cylinder]</p>
-<div class="figure">
+<p>This benchmark simulates a rigid sphere falling through
+a cylinder filled with a viscous medium as in <a class="reference internal" href="#figure-1">Figure 1</a>.</p>
+<!-- fig:Sphere-Cylinder -->
+<div align="center" class="figure">
<img alt="images/sphere_cylinder.png" src="images/sphere_cylinder.png" />
-<p class="caption">Figure [fig:Sphere-Cylinder]</p>
-<div class="legend">
-Schematic of a Sphere falling through a Cylinder.</div>
+<p class="caption"><span class="target" id="figure-1">Figure 1</span>:
+Schematic of a Sphere falling through a Cylinder.</p>
</div>
<p>The file <tt class="docutils literal"><span class="pre">input/benchmarks/falling_sphere/README</span></tt> has instructions on
running this benchmark. In an infinitely large cylinder, the analytic
@@ -65,8 +65,8 @@
height of 8, and place the sphere halfway down. We did runs where the
cylinder was twice as tall, and the results were essentially unchanged.</p>
<p>The errors in the computed velocity compared to the Faxen solution are
-plotted in Figure [fig:Error-in-velocity]. These were done with
-resolutions of [;8 \times 16 \times 8;], [;16 \times 32 \times 16;],
+plotted in <a class="reference internal" href="#figure-2">Figure 2</a>. These were done with resolutions of
+[;8 \times 16 \times 8;], [;16 \times 32 \times 16;],
and [;64 \times 128 \times 64;], corresponding to grid sizes ([;h;])
of [;0.5;], [;0.25;], [;0.125;], and [;0.0625;]. Because of the
symmetries of the problem we only have to simulate a quarter of the domain.
@@ -74,22 +74,22 @@
Since we are simulating a high viscosity sphere rather than a
completely rigid sphere, the velocity inside the sphere is not uniform.
The error bars indicate the variation in velocity across the sphere.</p>
-<div class="figure">
+<!-- fig:Error-in-velocity -->
+<div align="center" class="figure">
<img alt="images/Sphere_Error.png" src="images/Sphere_Error.png" />
-<p class="caption">Figure [fig:Error-in-velocity]</p>
-<div class="legend">
-Error in computed velocity vs. resolution.</div>
+<p class="caption"><span class="target" id="figure-2">Figure 2</span>:
+Error in computed velocity vs. resolution.</p>
</div>
-<p>Scaling the error with resolution gives Figure [fig:Scaled-error-velocity].
-The error scales linearly with resolution, giving us confidence that we
-can accurately solve this problem.</p>
-<div class="figure">
+<p>Scaling the error with resolution gives <a class="reference internal" href="#figure-3">Figure 3</a>. The error scales
+linearly with resolution, giving us confidence that we can accurately
+solve this problem.</p>
+<!-- fig:Scaled-error-velocity -->
+<div align="center" class="figure">
<img alt="images/Sphere_Scaled_Error.png" src="images/Sphere_Scaled_Error.png" />
-<p class="caption">Figure [fig:Scaled-error-velocity]</p>
-<div class="legend">
-As in figure [fig:Error-in-velocity], but with the error scaled
-with [;h;]. So the higher resolution errors are multiplied
-by 2, 4 and 8.</div>
+<p class="caption"><span class="target" id="figure-3">Figure 3</span>:
+As in figure [fig:Error-in-velocity], but with
+the error scaled with [;h;]. So the higher resolution
+errors are multiplied by 2, 4 and 8.</p>
</div>
</div>
</body>
Modified: doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.rst
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.rst 2009-10-07 19:15:55 UTC (rev 15786)
+++ doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.rst 2009-10-07 19:16:03 UTC (rev 15787)
@@ -2,15 +2,18 @@
Falling Sphere
==============
-This benchmark simulates a rigid sphere falling through a cylinder filled
-with a viscous medium as in Figure [fig:Sphere-Cylinder]
+This benchmark simulates a rigid sphere falling through
+a cylinder filled with a viscous medium as in `Figure 1`_.
+
+.. fig:Sphere-Cylinder
.. figure:: images/sphere_cylinder.png
+ :align: center
- Figure [fig:Sphere-Cylinder]
-
+ _`Figure 1`:
Schematic of a Sphere falling through a Cylinder.
+
The file ``input/benchmarks/falling_sphere/README`` has instructions on
running this benchmark. In an infinitely large cylinder, the analytic
solution for the drag on a sphere is
@@ -68,8 +71,8 @@
cylinder was twice as tall, and the results were essentially unchanged.
The errors in the computed velocity compared to the Faxen solution are
-plotted in Figure [fig:Error-in-velocity]. These were done with
-resolutions of [;8 \\times 16 \\times 8;], [;16 \\times 32 \\times 16;],
+plotted in `Figure 2`_. These were done with resolutions of
+[;8 \\times 16 \\times 8;], [;16 \\times 32 \\times 16;],
and [;64 \\times 128 \\times 64;], corresponding to grid sizes ([;h;])
of [;0.5;], [;0.25;], [;0.125;], and [;0.0625;]. Because of the
symmetries of the problem we only have to simulate a quarter of the domain.
@@ -78,21 +81,26 @@
completely rigid sphere, the velocity inside the sphere is not uniform.
The error bars indicate the variation in velocity across the sphere.
+
+.. fig:Error-in-velocity
.. figure:: images/Sphere_Error.png
+ :align: center
- Figure [fig:Error-in-velocity]
-
+ _`Figure 2`:
Error in computed velocity vs. resolution.
-Scaling the error with resolution gives Figure [fig:Scaled-error-velocity].
-The error scales linearly with resolution, giving us confidence that we
-can accurately solve this problem.
+Scaling the error with resolution gives `Figure 3`_. The error scales
+linearly with resolution, giving us confidence that we can accurately
+solve this problem.
+
+
+.. fig:Scaled-error-velocity
.. figure:: images/Sphere_Scaled_Error.png
+ :align: center
- Figure [fig:Scaled-error-velocity]
-
- As in figure [fig:Error-in-velocity], but with the error scaled
- with [;h;]. So the higher resolution errors are multiplied
- by 2, 4 and 8.
+ _`Figure 3`:
+ As in figure [fig:Error-in-velocity], but with
+ the error scaled with [;h;]. So the higher resolution
+ errors are multiplied by 2, 4 and 8.
More information about the CIG-COMMITS
mailing list