[cig-commits] r15874 - in doc/geodynamics.org/benchmarks/trunk/mc: 2d-cartesian 3d-spherical

luis at geodynamics.org luis at geodynamics.org
Fri Oct 23 17:45:35 PDT 2009 

Author: luis
Date: 2009-10-23 17:45:35 -0700 (Fri, 23 Oct 2009)
New Revision: 15874

Modified:
   doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/index.header
   doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite1.header
   doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite2.header
   doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite3.header
   doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.header
   doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.html
   doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.rst
Log:
Ran into docutils bug (seems to be fixed, but plone uses older version).

A doubly-indirect substitution will throw an exception. See these
threads for more details

  http://thread.gmane.org/gmane.text.docutils.user/2258
  http://thread.gmane.org/gmane.text.docutils.user/137/focus=138

Also, sync'd header files (do we need these in the repo?)

Modified: doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/index.header
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/index.header	2009-10-24 00:39:41 UTC (rev 15873)
+++ doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/index.header	2009-10-24 00:45:35 UTC (rev 15874)
@@ -9,7 +9,7 @@
 language: 
 rights: 
 creation_date: 2009/10/18 03:28:01.534 GMT-7
-modification_date: 2009/10/21 15:11:35.927 GMT-7
+modification_date: 2009/10/23 17:17:44.397 GMT-7
 excludeFromNav: False
 relatedItems: 
 allowDiscussion: None

Modified: doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite1.header
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite1.header	2009-10-24 00:39:41 UTC (rev 15873)
+++ doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite1.header	2009-10-24 00:45:35 UTC (rev 15874)
@@ -9,7 +9,7 @@
 language: 
 rights: 
 creation_date: 2009/10/18 03:31:32.373 GMT-7
-modification_date: 2009/10/21 15:11:17.367 GMT-7
+modification_date: 2009/10/23 17:17:44.747 GMT-7
 excludeFromNav: False
 relatedItems: 
 allowDiscussion: None

Modified: doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite2.header
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite2.header	2009-10-24 00:39:41 UTC (rev 15873)
+++ doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite2.header	2009-10-24 00:45:35 UTC (rev 15874)
@@ -9,7 +9,7 @@
 language: 
 rights: 
 creation_date: 2009/10/18 03:32:10.820 GMT-7
-modification_date: 2009/10/21 15:12:07.226 GMT-7
+modification_date: 2009/10/23 17:17:45.370 GMT-7
 excludeFromNav: False
 relatedItems: 
 allowDiscussion: None

Modified: doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite3.header
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite3.header	2009-10-24 00:39:41 UTC (rev 15873)
+++ doc/geodynamics.org/benchmarks/trunk/mc/2d-cartesian/suite3.header	2009-10-24 00:45:35 UTC (rev 15874)
@@ -9,7 +9,7 @@
 language: 
 rights: 
 creation_date: 2009/10/18 03:32:56.690 GMT-7
-modification_date: 2009/10/21 15:12:25.116 GMT-7
+modification_date: 2009/10/23 17:17:45.765 GMT-7
 excludeFromNav: False
 relatedItems: 
 allowDiscussion: None

Modified: doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.header
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.header	2009-10-24 00:39:41 UTC (rev 15873)
+++ doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.header	2009-10-24 00:45:35 UTC (rev 15874)
@@ -9,7 +9,7 @@
 language: 
 rights: 
 creation_date: 2009/10/18 03:35:38.481 GMT-7
-modification_date: 2009/10/21 15:13:00.469 GMT-7
+modification_date: 2009/10/23 17:37:08.617 GMT-7
 excludeFromNav: False
 relatedItems: 
 allowDiscussion: None

Modified: doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.html
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.html	2009-10-24 00:39:41 UTC (rev 15873)
+++ doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.html	2009-10-24 00:45:35 UTC (rev 15874)
@@ -41,7 +41,7 @@
 are for entirely basal heating and steady state or weakly time-dependent
 results, and viscosity variations from temperature-dependence vary from
 1 (mobile-lid regime) to 10<sup>6</sup> (stagnant lid regime). And [;Ra_{0.5};]
-defined by viscosity at [;T=0.5;] varies from 7×10<sup>3</sup> to 10<sup>5</sup> (i.e., to
+defined by viscosity at [;T=0.5;] varies from 7x10<sup>3</sup> to 10<sup>5</sup> (i.e., to
 achieve steady state or weakly time-dependent state).</p>
 <p>We hope that the community will join our effort and discuss what other
 benchmark cases should be included in our future benchmarks (e.g., internal
@@ -177,11 +177,9 @@
 from 1 (i.e., isoviscous) to 10<sup>6</sup> in stagnant lid regime. These cases are
 similar to what Ratcliff et al {1996} and Stemmer et al. {2006} had
 presented. However, we added more cases with larger viscosity contrasts.
-For cases with [;Ra_{0.5} = 7\times{}10^{3};], we use 12×32×32×32 elements,
-and for cases with [;Ra_{0.5} = 10^{5};], 12×48×48×48 elements are used.
+For cases with [;Ra_{0.5} = 7\times{}10^{3};], we use 12x32x32x32 elements,
+and for cases with [;Ra_{0.5} = 10^{5};], 12x48x48x48 elements are used.
 Radial resolution is refined near the top and bottom boundary layers.</p>
-<blockquote>
-</blockquote>
 <p>In addition to those outputs in Tables, we also provide files that list the
 full time-dependence of our standard outputs. For some cases, thermal
 structure images are also provided.</p>
@@ -270,7 +268,7 @@
 co-latitude and longitude directions, respectively, for cubic symmetry
 cases) for different Ra cases. We think that cases with
 [;Ra_{0.5} = 10^{5};] should require higher resolution.</p>
-<p>Again, files for time-dependence of the outputs from t=0 to steady state
+<p>Again, files for time-dependence of the outputs from [;t=0;] to steady state
 and representative snapshots of residual temperature field for selective
 cases can be downloaded at
 &lt;a href=&quot;<a class="reference external" href="http://anquetil.colorado.edu/szhong/CitcomS.html">http://anquetil.colorado.edu/szhong/CitcomS.html</a>&quot;&gt;Thermal Convection
@@ -282,7 +280,7 @@
 <p>Here we present results of Nussult numbers, RMS velocity, averaged
 temperature, and maximum and minimum flow velocity and temperature at the
 mid-mantle depth for 20 cases from CitcomS. For these cases,
-[;Ra_{0.5};] is either 7×10<sup>3</sup> or 10<sup>5</sup>, and viscosity contrast varies
+[;Ra_{0.5};] is either 7x10<sup>3</sup> or 10<sup>5</sup>, and viscosity contrast varies
 from 1 to 10<sup>6</sup>. The style of convection varies from mobile lid to
 stagnant lid regimes. For nine of the 20 cases, we could compare with
 previously published results {Stemmer et al., 2006; Ratcliff et al., 1996;

Modified: doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.rst
===================================================================
--- doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.rst	2009-10-24 00:39:41 UTC (rev 15873)
+++ doc/geodynamics.org/benchmarks/trunk/mc/3d-spherical/index.rst	2009-10-24 00:45:35 UTC (rev 15874)
@@ -1,9 +1,10 @@
-
 .. |times| unicode:: U+00D7
 .. |1e4| replace:: 10\ :sup:`4`
 .. |1e5| replace:: 10\ :sup:`5`
 .. |1e6| replace:: 10\ :sup:`6`
-.. |7e3| replace:: 7\ |times|\ 10\ :sup:`3`
+.. |7e3| replace:: 7x10\ :sup:`3`
+.. |12x32x32x32| replace:: 12x32x32x32
+.. |12x48x48x48| replace:: 12x48x48x48
 
 
 Presents initial benchmark results for CitcomS and
@@ -46,6 +47,7 @@
 benchmark cases should be included in our future benchmarks (e.g., internal
 heating, time-dependent cases at relatively high Ra, ...).  
 
+
 2. Definition of Benchmark Cases
 ================================
 
@@ -209,9 +211,6 @@
 and for cases with [;Ra_{0.5} = 10^{5};], |12x48x48x48| elements are used.
 Radial resolution is refined near the top and bottom boundary layers.  
 
-  .. |12x32x32x32| replace:: 12\ |times|\ 32\ |times|\ 32\ |times|\ 32
-  .. |12x48x48x48| replace:: 12\ |times|\ 48\ |times|\ 48\ |times|\ 48
-
 In addition to those outputs in Tables, we also provide files that list the
 full time-dependence of our standard outputs. For some cases, thermal
 structure images are also provided. 
@@ -313,7 +312,7 @@
 cases) for different Ra cases. We think that cases with
 [;Ra_{0.5} = 10^{5};] should require higher resolution. 
 
-Again, files for time-dependence of the outputs from t=0 to steady state
+Again, files for time-dependence of the outputs from [;t=0;] to steady state
 and representative snapshots of residual temperature field for selective
 cases can be downloaded at
 <a href="http://anquetil.colorado.edu/szhong/CitcomS.html">Thermal Convection
@@ -346,5 +345,3 @@
 Acknowledgement: Mr. Nan Zhang, a graduate student at the University of
 Colorado, helped with calculations and analyses.
 
-
-

More information about the CIG-COMMITS mailing list