[cig-commits] r15729 - in doc/geodynamics.org/benchmarks/trunk: . long

sue at geodynamics.org sue at geodynamics.org
Wed Sep 30 15:48:22 PDT 2009


Author: sue
Date: 2009-09-30 15:48:22 -0700 (Wed, 30 Sep 2009)
New Revision: 15729

Modified:
   doc/geodynamics.org/benchmarks/trunk/generate.sh
   doc/geodynamics.org/benchmarks/trunk/long/circular-inclusion.html
   doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.html
Log:
Use rst2html.py instead of rst2html-2.6.py

Modified: doc/geodynamics.org/benchmarks/trunk/generate.sh
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/generate.sh	2009-09-30 22:27:57 UTC (rev 15728)
+++ doc/geodynamics.org/benchmarks/trunk/generate.sh	2009-09-30 22:48:22 UTC (rev 15729)
@@ -1,5 +1,5 @@
 #!/bin/bash
-rst2html=rst2html-2.6.py
+rst2html=rst2html.py
 for rst in $(find . | grep '.rst$'); do
     path=$(dirname $rst)
     base=$(basename $rst .rst)

Modified: doc/geodynamics.org/benchmarks/trunk/long/circular-inclusion.html
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/long/circular-inclusion.html	2009-09-30 22:27:57 UTC (rev 15728)
+++ doc/geodynamics.org/benchmarks/trunk/long/circular-inclusion.html	2009-09-30 22:48:22 UTC (rev 15729)
@@ -291,7 +291,10 @@
 the pressure and velocity fields for a circular inclusion under simple
 shear as in Figure [fig:inclusion-setup].</p>
 <div class="figure">
-<img alt="images/inclusion_setup.epsFigure[fig:inclusion-setup]Schematicforthecircularinclusionbenchmark" src="images/inclusion_setup.epsFigure[fig:inclusion-setup]Schematicforthecircularinclusionbenchmark" />
+<img alt="images/inclusion_setup.png" src="images/inclusion_setup.png" />
+<p class="caption">Figure [fig:inclusion-setup]</p>
+<div class="legend">
+Schematic for the circular inclusion benchmark</div>
 </div>
 <p>The file <tt class="docutils literal"><span class="pre">input/benchmarks/circular_inclusion/README</span></tt> has instructions
 on how to run this benchmark.</p>
@@ -301,11 +304,11 @@
 relation</p>
 <blockquote>
 [;v_x = -\dot{\epsilon}y, v_y=\dot{\epsilon}x,;]</blockquote>
-<p>for the boundaries, where [;dot{epsilon};] is the magnitude of the shear
+<p>for the boundaries, where [;\dot{\epsilon};] is the magnitude of the shear
 and [;x;] and [;y;] are the coordinates. This induces an error of order
 [;r_i^2/r^2;], where [;r_i=0.1;] is the radius of the inclusion, and [;r;]
 is the radius. We have the boundaries at 80 times the radius of the inclusion,
-giving an error of about [;0.01%;], which is much smaller than the other errors we
+giving an error of about 0.01%, which is much smaller than the other errors we
 were looking at. Just to make sure, we did runs with boundaries at 40
 times the radius of the inclusion and got very similar results.</p>
 <p>A characteristic of the analytic solution is that the pressure is zero
@@ -348,9 +351,9 @@
 <img alt="images/inclusion_r8_p_error.png" src="images/inclusion_r8_p_error.png" />
 <p class="caption">Figure [fig:Pressure-error]</p>
 <div class="legend">
-Error in the pressure outside the inclusion along the line $y=x/2$ for
-resolutions of $128 times 128$ (blue), $256 times 256$ (red), and
-$512 times 512$ (black). The inclusion has radius $r_i=0.1$.</div>
+Error in the pressure outside the inclusion along the line [;y=x/2;]
+for resolutions of [;128 times 128;] (blue), [;256 times 256;] (red),
+and [;512 times 512;] (black). The inclusion has radius $sr_i=0.1$.</div>
 </div>
 <div class="figure">
 <img alt="images/inclusion_r8_p_scaled_error.png" src="images/inclusion_r8_p_scaled_error.png" />

Modified: doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.html
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.html	2009-09-30 22:27:57 UTC (rev 15728)
+++ doc/geodynamics.org/benchmarks/trunk/long/falling-sphere.html	2009-09-30 22:48:22 UTC (rev 15729)
@@ -342,7 +342,7 @@
 The error scales linearly with resolution, giving us confidence that we
 can accurately solve this problem.</p>
 <div class="figure">
-<img alt="images/Sphere_Scaled_Error.epsFigure[fig:Scaled-error-velocity]Asinfigure[fig:Error-in-velocity],butwiththeerrorscaledwith$h$.Sothehigherresolutionerrorsaremultipliedby2,4,and8." src="images/Sphere_Scaled_Error.epsFigure[fig:Scaled-error-velocity]Asinfigure[fig:Error-in-velocity],butwiththeerrorscaledwith$h$.Sothehigherresolutionerrorsaremultipliedby2,4,and8." />
+<img alt="images/Sphere_Scaled_Error.epsFigure[fig:Scaled-error-velocity]Asinfigure[fig:Error-in-velocity],butwiththeerrorscaledwith$h$.Sothehigherresolutionerrorsaremultipliedby2,4and8." src="images/Sphere_Scaled_Error.epsFigure[fig:Scaled-error-velocity]Asinfigure[fig:Error-in-velocity],butwiththeerrorscaledwith$h$.Sothehigherresolutionerrorsaremultipliedby2,4and8." />
 </div>
 </div>
 </body>



More information about the CIG-COMMITS mailing list