[cig-commits] r4713 - in geodyn/3D/MAG/trunk: doc testdir

[wei at geodynamics.org]

Author: wei
Date: 2006-10-05 18:15:08 -0700 (Thu, 05 Oct 2006)
New Revision: 4713

Added:
   geodyn/3D/MAG/trunk/testdir/data_bench0/
   geodyn/3D/MAG/trunk/testdir/data_bench1/
Removed:
   geodyn/3D/MAG/trunk/testdir/data-bench0-olson/
   geodyn/3D/MAG/trunk/testdir/data-bench1-olson/
Modified:
   geodyn/3D/MAG/trunk/doc/mag_book.lyx
   geodyn/3D/MAG/trunk/testdir/notes
Log:
Upload benchmark data, mag-book update as well

Modified: geodyn/3D/MAG/trunk/doc/mag_book.lyx
===================================================================
--- geodyn/3D/MAG/trunk/doc/mag_book.lyx	2006-10-06 00:06:38 UTC (rev 4712)
+++ geodyn/3D/MAG/trunk/doc/mag_book.lyx	2006-10-06 01:15:08 UTC (rev 4713)
@@ -981,7 +981,7 @@
 \begin_inset Quotes srd
 \end_inset
 
- (32 harmonics, longitudianl symmetry 4) is linked using
+ (32 harmonics, longitudianl symmetry 4) is linked using.
 \end_layout
 
 \begin_deeper
@@ -991,7 +991,7 @@
 
 \end_deeper
 \begin_layout Enumerate
-Compile the program
+Compile the program with:
 \end_layout
 
 \begin_deeper
@@ -999,13 +999,13 @@
 $ make
 \end_layout
 
-\end_deeper
-\begin_layout Enumerate
-mv magx magx32s64 [Renaming is optional]
+\begin_layout LyX-Code
+$ mv magx magx32s64 [Renaming is optional]
 \end_layout
 
+\end_deeper
 \begin_layout Enumerate
-Background execute using par.XXX as input file and .YYY as output files extension
+Background execute using par.XXX as input file and .YYY as output files extension:
 \end_layout
 
 \begin_deeper
@@ -1013,6 +1013,15 @@
 $ magx32s4 <par.XXX >p.YYY 
 \end_layout
 
+\begin_layout Standard
+For running with the benchmark input files(par.bnch0 or par.bnch1) , the execution
+ statement should be:
+\end_layout
+
+\begin_layout LyX-Code
+$ magx32s4 <par.bnch0 >p.bench0
+\end_layout
+
 \end_deeper
 \begin_layout Enumerate
 If there is a problem with the input file list, it is often the final three
@@ -1020,7 +1029,7 @@
 \end_layout
 
 \begin_layout Enumerate
-Compare output files
+Compare your output files with the data provided in the directory: ~/bench-data.
 \end_layout
 
 \begin_layout Enumerate
@@ -1108,12 +1117,12 @@
 placement H
 wide false
 sideways false
-status collapsed
+status open
 
 \begin_layout Standard
 \align center
 \begin_inset Graphics
-	filename F6en.eps
+	filename images/F6en.eps
 	scale 90
 	BoundingBox 30bp 10bp 492bp 505bp
 	rotateOrigin center
@@ -1144,13 +1153,13 @@
 placement H
 wide false
 sideways false
-status collapsed
+status open
 
 \begin_layout Standard
 \noindent
 \align center
 \begin_inset Graphics
-	filename F6spct.ps
+	filename images/F6spct.ps
 	scale 50
 
 \end_inset
@@ -1214,13 +1223,13 @@
 placement H
 wide false
 sideways false
-status collapsed
+status open
 
 \begin_layout Standard
 \noindent
 \align center
 \begin_inset Graphics
-	filename map.jpeg
+	filename images/map.jpeg
 	lyxscale 30
 	scale 30
 
@@ -3772,7 +3781,43 @@
 \end_layout
 
 \begin_layout Standard
-The benchmark cases used in MAG 
+The benchmark cases used in MAG are published by Christensen et al.
+ 
+\begin_inset LatexCommand \cite{benchmark cases}
+
+\end_inset
+
+In case 0, the magnetic Prandtl number 
+\emph on
+Pm
+\emph default
+ is zero (non-magnetic convection).
+ The Ekman number is 
+\emph on
+E
+\emph default
+ 
+\emph on
+=10-3
+\emph default
+, the Prandtl number is 
+\emph on
+Pr
+\emph default
+ 
+\emph on
+= 1
+\emph default
+ and the Rayleigh number is 
+\emph on
+Ra
+\emph default
+ 
+\emph on
+= 100
+\emph default
+ in both cases.
+ 
 \end_layout
 
 \begin_layout Chapter
@@ -4381,7 +4426,7 @@
 
 \begin_layout Bibliography
 
-\bibitem [6]{key-6}
+\bibitem [6]{benchmark cases}
 Christensen, et al.
  (2001), A numerical dynamo benchmark.
 

Copied: geodyn/3D/MAG/trunk/testdir/data_bench0 (from rev 4691, geodyn/3D/MAG/trunk/testdir/data-bench0-olson)

Copied: geodyn/3D/MAG/trunk/testdir/data_bench1 (from rev 4691, geodyn/3D/MAG/trunk/testdir/data-bench1-olson)

Modified: geodyn/3D/MAG/trunk/testdir/notes
===================================================================
--- geodyn/3D/MAG/trunk/testdir/notes	2006-10-06 00:06:38 UTC (rev 4712)
+++ geodyn/3D/MAG/trunk/testdir/notes	2006-10-06 01:15:08 UTC (rev 4713)
@@ -1,3 +1,3 @@
-Benchmark test data: data-bench0-olson, data-bench1-olson
+Benchmark test data: data-bench0, data-bench1
 shell script for generating bench data: testdynamo.sh