[cig-commits] r5937 - in mc/3D/CitcomS/branches/compressible: . doc/manual

Tue Jan 30 13:32:08 PST 2007

Author: tan2
Date: 2007-01-30 13:32:04 -0800 (Tue, 30 Jan 2007)
New Revision: 5937

Modified:
   mc/3D/CitcomS/branches/compressible/configure.ac
   mc/3D/CitcomS/branches/compressible/doc/manual/citcoms.lyx
   mc/3D/CitcomS/branches/compressible/doc/manual/citcoms.pdf
Log:
Porting r5930-5935 from trunk

Modified: mc/3D/CitcomS/branches/compressible/configure.ac
===================================================================

--- mc/3D/CitcomS/branches/compressible/configure.ac	2007-01-30 21:28:51 UTC (rev 5936)
+++ mc/3D/CitcomS/branches/compressible/configure.ac	2007-01-30 21:32:04 UTC (rev 5937)
@@ -54,41 +54,8 @@
     AM_PATH_PYTHON([2.3])
     CIT_PYTHON_SYSCONFIG
 
-    # Checks for Python modules and packages.
-
-    builddir=`pwd`
-    save_PYTHONPATH="$PYTHONPATH"
-    PYTHONPATH="$builddir/python:$PYTHONPATH"; export PYTHONPATH
-    cd $srcdir
-
-    AC_MSG_NOTICE([downloading missing Python dependencies])
-    AS_IF([AC_TRY_COMMAND([$PYTHON setup.py install_deps -zmxd $builddir/deps >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
-          [],
-          [AC_MSG_FAILURE([cannot download missing Python dependencies])])
-
-    AC_MSG_NOTICE([building Python dependencies])
-    AS_IF([AC_TRY_COMMAND([$PYTHON setup.py develop -H None -f $builddir/deps -x -d $builddir/python >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
-          [],
-          [AC_MSG_FAILURE([building Python dependencies])])
-
-    AC_MSG_CHECKING([for egg-related flags])
-    AS_IF([AC_TRY_COMMAND([$PYTHON setup.py egg_flags >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
-          [AC_MSG_RESULT(ok)
-           . egg-flags.sh
-           rm -f egg-flags.sh
-          ],
-          [AC_MSG_RESULT(failed)
-          AC_MSG_FAILURE([cannot scan Python eggs for flags])])
-
-    cd $builddir
-    PYTHONPATH="$save_PYTHONPATH"
-    PYTHONPATH="${pythondir}:${pyexecdir}${save_PYTHONPATH:+:${save_PYTHONPATH}}"
-
-    AC_SUBST(PYTHONPATH)
-    AC_SUBST(PYTHON_EGG_CFLAGS)
-    AC_SUBST(PYTHON_EGG_CPPFLAGS)
-    AC_SUBST(PYTHON_EGG_LDFLAGS)
-
+    # Check for Python modules and packages.
+    CIT_PYTHON_EGG_SETUP
 fi
 
 # Checks for programs.

Modified: mc/3D/CitcomS/branches/compressible/doc/manual/citcoms.lyx
===================================================================
--- mc/3D/CitcomS/branches/compressible/doc/manual/citcoms.lyx	2007-01-30 21:28:51 UTC (rev 5936)
+++ mc/3D/CitcomS/branches/compressible/doc/manual/citcoms.lyx	2007-01-30 21:32:04 UTC (rev 5937)
@@ -1,4 +1,4 @@
-#LyX 1.4.2 created this file. For more info see http://www.lyx.org/
+#LyX 1.4.3 created this file. For more info see http://www.lyx.org/
 \lyxformat 245
 \begin_document
 \begin_header
@@ -16150,7 +16150,7 @@
 \end_layout
 
 \begin_layout LyX-Code
-nsd=1
+nsd= 1
 \newline
 1 
 \series bold
@@ -16173,7 +16173,7 @@
 \series default
 
 \newline
-nsd=2
+nsd= 2
 \newline
 1 
 \series bold
@@ -16196,7 +16196,7 @@
 \series default
 
 \newline
-nsd=3
+nsd= 3
 \newline
 1 
 \series bold
@@ -16234,7 +16234,7 @@
 \end_layout
 
 \begin_layout LyX-Code
-nsd=3
+nsd= 3
 \newline
 1 
 \series bold
@@ -16867,15 +16867,24 @@
 \end_layout
 
 \begin_layout Standard
+\noindent
+\align center
 
 \family typewriter
 \size footnotesize
+\begin_inset Float table
+placement H
+wide false
+sideways false
+status open
+
+\begin_layout Standard
 \begin_inset Tabular
 <lyxtabular version="3" rows="8" columns="2">
 <features>
 <column alignment="center" valignment="top" leftline="true" width="0">
 <column alignment="left" valignment="top" leftline="true" rightline="true" width="0">
-<row topline="true" bottomline="true">
+<row topline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
@@ -16899,7 +16908,7 @@
 \end_inset
 </cell>
 </row>
-<row>
+<row topline="true">
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
 \begin_inset Text
 
@@ -16913,11 +16922,7 @@
 \begin_inset Text
 
 \begin_layout Standard
-spherical harmonic orders (
-\family typewriter
-m
-\family default
-)
+spherical harmonic orders (m)
 \end_layout
 
 \end_inset
@@ -16937,12 +16942,8 @@
 \begin_inset Text
 
 \begin_layout Standard
-sine coefficients of total geoid (
-\family typewriter
-S
-\family default
-
-\begin_inset Formula $_{\text{lm}}$
+sine coefficients of total geoid (S
+\begin_inset Formula $_{\mathrm{lm}}$
 \end_inset
 
 )
@@ -16965,12 +16966,8 @@
 \begin_inset Text
 
 \begin_layout Standard
-cosine coefficients of total geoid (
-\family typewriter
-C
-\family default
-
-\begin_inset Formula $_{\text{lm}}$
+cosine coefficients of total geoid (C
+\begin_inset Formula $_{\mathrm{lm}}$
 \end_inset
 
 )
@@ -17013,7 +17010,7 @@
 \begin_inset Text
 
 \begin_layout Standard
-cosine coefficient sof the geoid due to internal density variation
+cosine coefficents of the geoid due to internal density variation
 \end_layout
 
 \end_inset
@@ -17066,14 +17063,19 @@
 
 \end_layout
 
+\end_inset
+
+
+\end_layout
+
 \begin_layout Standard
 The units of the geoid coefficients are meters.
- The geoid field can be reconstructed by:
+ The geoid field can be reconstructed by
 \end_layout
 
 \begin_layout Standard
 \begin_inset Formula \[
-{\textstyle {\displaystyle \sum}\left(S_{lm}\sin(m\phi)+C_{lm}\cos(m\phi)\right)P_{lm}(\cos\theta)}\]
+{\displaystyle \sum}\left(S_{lm}\sin(m\phi)+C_{lm}\cos(m\phi)\right)P_{lm}(\cos\theta)\]
 
 \end_inset
 
@@ -17082,13 +17084,9 @@
 
 \begin_layout Standard
 where 
-\shape italic
-P
-\begin_inset Formula $_{\text{lm}}$
+\begin_inset Formula $P_{\mathrm{lm}}$
 \end_inset
 
-
-\shape default
  is the associated Legendre polynomials.
 \end_layout
 

Modified: mc/3D/CitcomS/branches/compressible/doc/manual/citcoms.pdf
===================================================================
(Binary files differ)

