[cig-commits] r5394 - mc/3D/CitcomS/trunk/doc/manual

tan2 at geodynamics.org tan2 at geodynamics.org
Thu Nov 30 12:57:37 PST 2006


Author: tan2
Date: 2006-11-30 12:57:36 -0800 (Thu, 30 Nov 2006)
New Revision: 5394

Modified:
   mc/3D/CitcomS/trunk/doc/manual/citcoms.lyx
Log:
Updated Appendices

Modified: mc/3D/CitcomS/trunk/doc/manual/citcoms.lyx
===================================================================
--- mc/3D/CitcomS/trunk/doc/manual/citcoms.lyx	2006-11-30 20:26:51 UTC (rev 5393)
+++ mc/3D/CitcomS/trunk/doc/manual/citcoms.lyx	2006-11-30 20:57:36 UTC (rev 5394)
@@ -4487,6 +4487,10 @@
 \end_layout
 
 \begin_layout Section
+\begin_inset LatexCommand \label{sec:Data-Layout}
+
+\end_inset
+
 Data Layout
 \end_layout
 
@@ -8025,7 +8029,7 @@
 \begin_layout Standard
 \noindent
 \begin_inset Tabular
-<lyxtabular version="3" rows="5" columns="2">
+<lyxtabular version="3" rows="6" columns="2">
 <features islongtable="true">
 <column alignment="left" valignment="top" leftline="true" width="1.75in">
 <column alignment="left" valignment="top" leftline="true" rightline="true" width="3.5in">
@@ -8034,7 +8038,7 @@
 \begin_inset Text
 
 \begin_layout Standard
-output_format="ascii-local"
+output_format="ascii"
 \end_layout
 
 \end_inset
@@ -8044,14 +8048,10 @@
 
 \begin_layout Standard
 Choose the format and layout of the output files.
- Can be either "ascii-local
+ Can be either 
 \begin_inset Quotes sld
 \end_inset
 
-, 
-\begin_inset Quotes sld
-\end_inset
-
 ascii
 \begin_inset Quotes srd
 \end_inset
@@ -8104,6 +8104,14 @@
 \begin_inset Quotes sld
 \end_inset
 
+geoid
+\begin_inset Quotes srd
+\end_inset
+
+, 
+\begin_inset Quotes sld
+\end_inset
+
 stress
 \begin_inset Quotes sld
 \end_inset
@@ -8153,11 +8161,7 @@
 
 \begin_layout Standard
 Controls the location of output files.
- Only significant if 
-\family typewriter
-output_format=ascii
-\family default
-.
+ 
 \end_layout
 
 \end_inset
@@ -8235,6 +8239,27 @@
 \end_inset
 </cell>
 </row>
+<row bottomline="true">
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Standard
+output_ll_max=20
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Standard
+This parameters control the max.
+ degree of spherical harmonics coefficients for geoid output.
+\end_layout
+
+\end_inset
+</cell>
+</row>
 </lyxtabular>
 
 \end_inset
@@ -8609,14 +8634,6 @@
 \family default
  in this case.
  
-\family typewriter
-datadir_old
-\family default
- is significant only if 
-\family typewriter
-output_format=ascii
-\family default
-.
 \end_layout
 
 \end_inset
@@ -10375,53 +10392,12 @@
 
 \end_layout
 
-\begin_layout Subsection
-Spherical Harmonics Information
-\end_layout
-
 \begin_layout Standard
-\begin_inset Tabular
-<lyxtabular version="3" rows="1" columns="2">
-<features islongtable="true">
-<column alignment="left" valignment="top" leftline="true" width="1.75in">
-<column alignment="left" valignment="top" leftline="true" rightline="true" width="3.5in">
-<row topline="true" bottomline="true">
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
 
-\begin_layout Standard
-ll_max=20
-\newline
-output_ll_max=20
-\newline
-nlong=361
-\newline
-nlati=181 
 \end_layout
 
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
 \begin_layout Standard
-These parameters control the resolution of the spherical harmonics.
- Currently not used.
- 
-\end_layout
 
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-
 \newpage
 
 \end_layout
@@ -10441,23 +10417,25 @@
 \begin_inset Text
 
 \begin_layout Standard
-layerd=6371e3
+radius=6371e3
 \newline
-density=3500.0
+density=3340.0
 \newline
 thermdiff=1.0e-6
 \newline
-gravacc=10.0
+gravacc=9.81
 \newline
 thermexp=3.0e-5
 \newline
 refvisc=1.0e+21
 \newline
 
-cp=1250
+cp=1200
 \newline
-wdensity=0.0
+density_above=1030.0
 \newline
+density_below=6600.0
+\newline
 surftemp=273
 \end_layout
 
@@ -10794,7 +10772,7 @@
 \end_inset
 </cell>
 </row>
-<row topline="true">
+<row topline="true" bottomline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
@@ -10859,7 +10837,7 @@
 \end_inset
 </cell>
 </row>
-<row topline="true">
+<row topline="true" bottomline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
@@ -11557,7 +11535,7 @@
 \begin_layout Standard
 \noindent
 \begin_inset Tabular
-<lyxtabular version="3" rows="20" columns="2">
+<lyxtabular version="3" rows="16" columns="2">
 <features islongtable="true">
 <column alignment="left" valignment="top" leftline="true" width="1.75in">
 <column alignment="left" valignment="top" leftline="true" rightline="true" width="3.5in">
@@ -11862,7 +11840,7 @@
 \end_inset
 </cell>
 </row>
-<row topline="true">
+<row topline="true" bottomline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
@@ -11882,86 +11860,6 @@
 \end_inset
 </cell>
 </row>
-<row topline="true">
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-ll_max=20 
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row topline="true">
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-nlong=361
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row topline="true">
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-nlati=181
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row topline="true" bottomline="true">
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-output_ll_max=20
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Standard
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
 </lyxtabular>
 
 \end_inset
@@ -12710,7 +12608,7 @@
 \begin_layout Standard
 \noindent
 \begin_inset Tabular
-<lyxtabular version="3" rows="13" columns="2">
+<lyxtabular version="3" rows="14" columns="2">
 <features islongtable="true">
 <column alignment="left" valignment="top" leftline="true" rightline="true" width="1.75in">
 <column alignment="left" valignment="top" rightline="true" width="3.5in">
@@ -12719,7 +12617,7 @@
 \begin_inset Text
 
 \begin_layout Standard
-layerd=6.371e+06
+radius=6.371e+06
 \end_layout
 
 \end_inset
@@ -12739,7 +12637,7 @@
 \begin_inset Text
 
 \begin_layout Standard
-density=3500
+density=3340.0
 \end_layout
 
 \end_inset
@@ -12779,7 +12677,7 @@
 \begin_inset Text
 
 \begin_layout Standard
-gravacc=10
+gravacc=9.81
 \end_layout
 
 \end_inset
@@ -12839,7 +12737,7 @@
 \begin_inset Text
 
 \begin_layout Standard
-cp=1250
+cp=1200
 \end_layout
 
 \end_inset
@@ -12859,7 +12757,7 @@
 \begin_inset Text
 
 \begin_layout Standard
-wdensity=0
+density_above=1030.0
 \end_layout
 
 \end_inset
@@ -12879,11 +12777,31 @@
 \begin_inset Text
 
 \begin_layout Standard
-surftemp=273
+density_below=6600.0
 \end_layout
 
 \end_inset
 </cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Standard
+
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topline="true">
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Standard
+surftemp=273.0
+\end_layout
+
+\end_inset
+</cell>
 <cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
 \begin_inset Text
 
@@ -13185,7 +13103,7 @@
 
 \begin_layout Standard
 \begin_inset Tabular
-<lyxtabular version="3" rows="10" columns="2">
+<lyxtabular version="3" rows="11" columns="2">
 <features islongtable="true">
 <column alignment="left" valignment="top" leftline="true" width="1.75in">
 <column alignment="left" valignment="top" leftline="true" rightline="true" width="3.5in">
@@ -13250,6 +13168,26 @@
 \begin_inset Text
 
 \begin_layout Standard
+output_ll_max=20
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Standard
+
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topline="true">
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Standard
 cb_block_size=1048576
 \end_layout
 
@@ -15140,14 +15078,32 @@
 radius temperature RMS(V_horizontal) RMS(V_vertical)
 \end_layout
 
+\begin_layout Subsection
+Geoid Output (test-case.geoid.10)
+\end_layout
+
+\begin_layout Standard
+The first line of the file is a header.
+ The rest of the file is column-based, where the meaning of each column
+ is:
+\end_layout
+
+\begin_layout LyX-Code
+degree order geoid_sin geoid_cos geoid_from_bncy_sin geoid_from_bncy_cos
+ geoid_from_surf_topo_sin geoid_from_surf_topo_cos
+\end_layout
+
 \begin_layout Section
 HDF5 Output (test-case.h5)
 \end_layout
 
 \begin_layout Standard
+The format and layout of HDF5 output is described in Section 
+\begin_inset LatexCommand \vref{sec:Data-Layout}
 
-\series bold
-(TODO: Insert Data Output table in section 4.3, Luis)
+\end_inset
+
+.
 \end_layout
 
 \begin_layout Chapter



More information about the cig-commits mailing list