[cig-commits] r14678 - in doc/cigma/manual/figures3: . bm1 bm3 bm3/out

[luis at geodynamics.org]

Author: luis
Date: 2009-04-13 12:59:53 -0700 (Mon, 13 Apr 2009)
New Revision: 14678

Added:
   doc/cigma/manual/figures3/bm1/
   doc/cigma/manual/figures3/bm1/alpha.png
   doc/cigma/manual/figures3/bm1/alpha_2d.png
   doc/cigma/manual/figures3/bm1/alpha_3d.png
   doc/cigma/manual/figures3/bm1/process-images.sh
   doc/cigma/manual/figures3/bm3/out/fig_full_log_error_pressure_256_512.png
   doc/cigma/manual/figures3/bm3/out/fig_full_log_error_pressure_512_128_512_256.png
   doc/cigma/manual/figures3/bm3/out/fig_inc_log_error_pressure_256_512.png
   doc/cigma/manual/figures3/bm3/out/fig_inc_log_error_pressure_512_128_512_256.png
   doc/cigma/manual/figures3/bm3/out/fig_pressure_512.png
Modified:
   doc/cigma/manual/figures3/bm3/process-images.sh
Log:
Fixed the figure captions in Chapter 5. Also, make sure that the
images (*.png) have the proper mime-type set.


Added: doc/cigma/manual/figures3/bm1/alpha.png
===================================================================
(Binary files differ)


Property changes on: doc/cigma/manual/figures3/bm1/alpha.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: doc/cigma/manual/figures3/bm1/alpha_2d.png
===================================================================
(Binary files differ)


Property changes on: doc/cigma/manual/figures3/bm1/alpha_2d.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: doc/cigma/manual/figures3/bm1/alpha_3d.png
===================================================================
(Binary files differ)


Property changes on: doc/cigma/manual/figures3/bm1/alpha_3d.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: doc/cigma/manual/figures3/bm1/process-images.sh
===================================================================
--- doc/cigma/manual/figures3/bm1/process-images.sh	                        (rev 0)
+++ doc/cigma/manual/figures3/bm1/process-images.sh	2009-04-13 19:59:53 UTC (rev 14678)
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -x
+source ../common.sh
+
+img-caption '(a) 2D Poisson Problem' \
+    alpha_2d.png \
+    rm_alpha_2d.png
+
+img-caption '(b) 3D Poisson Problem' \
+    alpha_3d.png \
+    rm_alpha_3d.png
+
+cat-pair \
+    rm_alpha_2d.png \
+    rm_alpha_3d.png \
+    alpha.png
+
+rm -f rm_*.png
+


Property changes on: doc/cigma/manual/figures3/bm1/process-images.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: doc/cigma/manual/figures3/bm3/out/fig_full_log_error_pressure_256_512.png
===================================================================
(Binary files differ)


Property changes on: doc/cigma/manual/figures3/bm3/out/fig_full_log_error_pressure_256_512.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: doc/cigma/manual/figures3/bm3/out/fig_full_log_error_pressure_512_128_512_256.png
===================================================================
(Binary files differ)


Property changes on: doc/cigma/manual/figures3/bm3/out/fig_full_log_error_pressure_512_128_512_256.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: doc/cigma/manual/figures3/bm3/out/fig_inc_log_error_pressure_256_512.png
===================================================================
(Binary files differ)


Property changes on: doc/cigma/manual/figures3/bm3/out/fig_inc_log_error_pressure_256_512.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: doc/cigma/manual/figures3/bm3/out/fig_inc_log_error_pressure_512_128_512_256.png
===================================================================
(Binary files differ)


Property changes on: doc/cigma/manual/figures3/bm3/out/fig_inc_log_error_pressure_512_128_512_256.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: doc/cigma/manual/figures3/bm3/out/fig_pressure_512.png
===================================================================
(Binary files differ)


Property changes on: doc/cigma/manual/figures3/bm3/out/fig_pressure_512.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: doc/cigma/manual/figures3/bm3/process-images.sh
===================================================================
--- doc/cigma/manual/figures3/bm3/process-images.sh	2009-04-13 19:50:04 UTC (rev 14677)
+++ doc/cigma/manual/figures3/bm3/process-images.sh	2009-04-13 19:59:53 UTC (rev 14678)
@@ -11,28 +11,28 @@
 # List of the original image names
 #
 imglist="
-    pressure_512.png
-    velocity_512.png
-    error_pressure_128.png
-    error_pressure_256.png
-    error_pressure_512.png
-    error_velocity_128.png
-    error_velocity_256.png
-    error_velocity_512.png
-    error_pressure_512_128.png
-    error_pressure_512_256.png
-    error_velocity_512_128.png
-    error_velocity_512_256.png
-    log_error_pressure_128.png
-    log_error_pressure_256.png
-    log_error_pressure_512.png
-    log_error_velocity_128.png
-    log_error_velocity_256.png
-    log_error_velocity_512.png
-    log_error_pressure_512_128.png
-    log_error_pressure_512_256.png
-    log_error_velocity_512_128.png
-    log_error_velocity_512_256.png
+    full_pressure_512.png
+    full_velocity_512.png
+    full_log_error_pressure_128.png
+    full_log_error_pressure_256.png
+    full_log_error_pressure_512.png
+    full_log_error_pressure_512_128.png
+    full_log_error_pressure_512_256.png
+    full_log_error_velocity_128.png
+    full_log_error_velocity_256.png
+    full_log_error_velocity_512.png
+    full_log_error_velocity_512_128.png
+    full_log_error_velocity_512_256.png
+    inc_pressure_512.png
+    inc_velocity_512.png
+    inc_log_error_pressure_128.png
+    inc_log_error_pressure_256.png
+    inc_log_error_pressure_512.png
+    inc_log_error_pressure_512_128.png
+    inc_log_error_pressure_512_256.png
+    inc_log_error_velocity_512.png
+    inc_log_error_velocity_512_128.png
+    inc_log_error_velocity_512_256.png
 "
 
 # 
@@ -57,81 +57,68 @@
 done
 
 
-cat-pair \
-    pressure_512.png \
-    velocity_512.png \
-    fig_fields_512.png
+img-caption '(a) Pressure' \
+    full_pressure_512.png \
+    full_pressure_512.png
+img-caption '(b) Pressure near inclusion' \
+    inc_pressure_512.png \
+    inc_pressure_512.png
 
+img-caption '(a) log (pressure error for 256 x 256 case)' \
+    full_log_error_pressure_256.png \
+    full_log_error_pressure_256.png
+img-caption '(b) log (pressure error for 512 x 512 case)' \
+    full_log_error_pressure_512.png \
+    full_log_error_pressure_512.png
 
-cat-pair \
-    error_pressure_128.png \
-    error_velocity_128.png \
-    fig_error_fields_128.png
-cat-pair \
-    error_pressure_256.png \
-    error_velocity_256.png \
-    fig_error_fields_256.png
-cat-pair \
-    error_pressure_512.png \
-    error_velocity_512.png \
-    fig_error_fields_512.png
+img-caption '(a) log (pressure error for 128 x 128 case)' \
+    full_log_error_pressure_512_128.png \
+    full_log_error_pressure_512_128.png
+img-caption '(a) log (pressure error for 256 x 256 case)' \
+    full_log_error_pressure_512_256.png \
+    full_log_error_pressure_512_256.png
 
+img-caption '(a) log (pressure error for 256 x 256 case)' \
+    inc_log_error_pressure_256.png \
+    inc_log_error_pressure_256.png
+img-caption '(b) log (pressure error for 512 x 512 case)' \
+    inc_log_error_pressure_512.png \
+    inc_log_error_pressure_512.png
 
-cat-pair \
-    log_error_pressure_128.png \
-    log_error_velocity_128.png \
-    fig_log_error_fields_128.png
-cat-pair \
-    log_error_pressure_256.png \
-    log_error_velocity_256.png \
-    fig_log_error_fields_256.png
-cat-pair \
-    log_error_pressure_512.png \
-    log_error_velocity_512.png \
-    fig_log_error_fields_512.png
+img-caption '(a) log (pressure error for 128 x 128 case)' \
+    inc_log_error_pressure_512_128.png \
+    inc_log_error_pressure_512_128.png
+img-caption '(a) log (pressure error for 256 x 256 case)' \
+    inc_log_error_pressure_512_256.png \
+    inc_log_error_pressure_512_256.png
 
 
-img-cat 3x1 \
-    error_pressure_128.png \
-    error_pressure_256.png \
-    error_pressure_512.png \
-    fig_error_pressure.png
-img-cat 3x1 \
-    log_error_pressure_128.png \
-    log_error_pressure_256.png \
-    log_error_pressure_512.png \
-    fig_log_error_pressure.png
+cat-pair \
+    full_pressure_512.png \
+    inc_pressure_512.png \
+    fig_pressure_512.png
 
-img-cat 2x1 \
-    error_pressure_256.png \
-    error_pressure_512.png \
-    fig_error_pressure_256_512.png
-img-cat 2x1 \
-    log_error_pressure_256.png \
-    log_error_pressure_512.png \
-    fig_log_error_pressure_256_512.png
+cat-pair \
+    full_log_error_pressure_256.png \
+    full_log_error_pressure_512.png \
+    fig_full_log_error_pressure_256_512.png
 
+cat-pair \
+    full_log_error_pressure_512_128.png \
+    full_log_error_pressure_512_256.png \
+    fig_full_log_error_pressure_512_128_512_256.png
 
-img-cat 2x1 \
-    error_pressure_512_128.png \
-    error_pressure_512_256.png \
-    fig_error_pressure_512_128_512_256.png
-img-cat 2x1 \
-    log_error_pressure_512_128.png \
-    log_error_pressure_512_256.png \
-    fig_log_error_pressure_512_128_512_256.png
+cat-pair \
+    inc_log_error_pressure_256.png \
+    inc_log_error_pressure_512.png \
+    fig_inc_log_error_pressure_256_512.png \
 
+cat-pair \
+    inc_log_error_pressure_512_128.png \
+    inc_log_error_pressure_512_256.png \
+    fig_inc_log_error_pressure_512_128_512_256.png
 
-img-cat 2x1 \
-    error_velocity_512_128.png \
-    error_velocity_512_256.png \
-    fig_error_velocity_512_128_512_256.png
-img-cat 2x1 \
-    log_error_velocity_512_128.png \
-    log_error_velocity_512_256.png \
-    fig_log_error_velocity_512_128_512_256.png
 
-
 # finally, resize the images that will be included in the manual
 for img in fig_*; do
     resize-image ${img}