[cig-commits] [commit] master: figures fixed, pdf can print. fig toc fixed. some line endings which ran off page fixed. (23f77b0)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/cigma

On branch  : master
Link       : https://github.com/geodynamics/cigma/compare/65c02138d3ae8b87c088cc14fe4f98e21e3f0805...a26f592c25c89a40622404999ba1effcdf6df9e3

>---------------------------------------------------------------

commit 23f77b0e5b5208b8947c06eca5b0147a23042e0e
Author: Sue Kientz <sue>
Date:   Tue Mar 3 00:19:57 2009 +0000

    figures fixed, pdf can print. fig toc fixed. some line endings which ran off page fixed.


>---------------------------------------------------------------

23f77b0e5b5208b8947c06eca5b0147a23042e0e
 cigma.lyx |  42 +----------------------
 cigma.pdf | Bin 3145521 -> 3807783 bytes
 main2.lyx | 115 ++++++++++++++++++++++++++------------------------------------
 3 files changed, 49 insertions(+), 108 deletions(-)

diff --git a/cigma.lyx b/cigma.lyx
index 38c9315..3021ed8 100644
--- a/cigma.lyx
+++ b/cigma.lyx
@@ -168,47 +168,7 @@ raggedbottom
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand include
-filename "introduction.lyx"
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset CommandInset include
-LatexCommand include
-filename "installation.lyx"
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset CommandInset include
-LatexCommand include
-filename "error_analysis.lyx"
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset CommandInset include
-LatexCommand include
-filename "interpolation.lyx"
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset CommandInset include
-LatexCommand include
-filename "running.lyx"
+filename "main2.lyx"
 
 \end_inset
 
diff --git a/cigma.pdf b/cigma.pdf
index 9226f8f..b84fadf 100644
Binary files a/cigma.pdf and b/cigma.pdf differ
diff --git a/main2.lyx b/main2.lyx
index 61c687e..4dff49d 100644
--- a/main2.lyx
+++ b/main2.lyx
@@ -3989,22 +3989,24 @@ $ vtk-residuals
 
 \begin_layout Standard
 \begin_inset Float figure
+placement H
 wide false
 sideways false
-status open
-
-\begin_layout Plain Layout
-\begin_inset Caption
+status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-	filename /Users/luis/p/cig/doc/cigma/figures2/log_res_citcomcu_velocity_32_08.png
+	filename /Users/sue/cigma/figures2/log_res_citcomcu_velocity_32_08.png
 	lyxscale 40
 	scale 40
 
 \end_inset
 
 
+\begin_inset Caption
+
+\begin_layout Plain Layout
+Caption for 5.1 here
 \end_layout
 
 \end_inset
@@ -4015,23 +4017,29 @@ status open
 \end_inset
 
 
+\begin_inset space ~
+\end_inset
+
+
 \begin_inset Float figure
+placement H
 wide false
 sideways false
-status open
-
-\begin_layout Plain Layout
-\begin_inset Caption
+status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-	filename /Users/luis/p/cig/doc/cigma/figures2/log_res_citcomcu_velocity_32_16.png
+	filename /Users/sue/cigma/figures2/log_res_citcomcu_velocity_32_16.png
 	lyxscale 40
-	width 40page%
+	scale 40
 
 \end_inset
 
 
+\begin_inset Caption
+
+\begin_layout Plain Layout
+Caption for 5.2 here
 \end_layout
 
 \end_inset
@@ -4110,41 +4118,26 @@ $ cigma compare
     -o circ_inc.h5:/pressure_256_064
 \end_layout
 
-\begin_layout LyX-Code
-\begin_inset Box Frameless
-position "t"
-hor_pos "c"
-has_inner_box 1
-inner_pos "t"
-use_parbox 0
-width "100col%"
-special "none"
-height "1in"
-height_special "totalheight"
-status open
-
-\begin_layout Plain Layout
+\begin_layout Standard
 \begin_inset Float figure
+placement H
 wide false
 sideways false
-status open
-
-\begin_layout Plain Layout
-\begin_inset Caption
+status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-	filename figures2/log_res_circular_inclusion_256_064.png
+	filename /Users/sue/cigma/figures2/log_res_circular_inclusion_256_064.png
 	lyxscale 40
+	scale 18
 
 \end_inset
 
 
-\end_layout
-
-\end_inset
-
+\begin_inset Caption
 
+\begin_layout Plain Layout
+Caption for 5.3 here
 \end_layout
 
 \end_inset
@@ -4155,51 +4148,29 @@ status open
 \end_inset
 
 
-\end_layout
+\begin_inset space ~
+\end_inset
 
-\begin_layout LyX-Code
-\begin_inset Box Frameless
-position "t"
-hor_pos "c"
-has_inner_box 1
-inner_pos "t"
-use_parbox 0
-width "100col%"
-special "none"
-height "1in"
-height_special "totalheight"
-status open
 
-\begin_layout Plain Layout
 \begin_inset Float figure
+placement H
 wide false
 sideways false
-status open
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-\begin_inset Caption
+status collapsed
 
 \begin_layout Plain Layout
 \begin_inset Graphics
-	filename figures2/log_res_circular_inclusion_256_128.png
+	filename /Users/sue/cigma/figures2/log_res_circular_inclusion_256_128.png
 	lyxscale 40
+	scale 18
 
 \end_inset
 
 
-\end_layout
-
-\end_inset
-
-
-\end_layout
+\begin_inset Caption
 
 \begin_layout Plain Layout
-
+Caption for 5.4 here
 \end_layout
 
 \end_inset
@@ -4214,10 +4185,16 @@ status open
 
 \begin_layout Standard
 The analytic solution is registered under the somewhat verbose name 
+\end_layout
+
+\begin_layout LyX-Code
+
 \family typewriter
 bm.gale.circular_inclusion.pressure
-\family default
-, which we shorten by storing it in a shell variable, 
+\end_layout
+
+\begin_layout Standard
+which we shorten by storing it in a shell variable, 
 \end_layout
 
 \begin_layout LyX-Code
@@ -7061,7 +7038,11 @@ Likewise, the following command would associate the mesh
 \family default
  with the field coefficients
 \family typewriter
-/model/variables/temperature/step00000
+/model/
+\begin_inset Newline newline
+\end_inset
+
+variables/temperature/step00000
 \end_layout
 
 \begin_layout LyX-Code