[cig-commits] [commit] master: Fixed the figure captions in Chapter 5. Also, make sure that the images (*.png) have the proper mime-type set. (97baa59)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Fri May 9 15:26:32 PDT 2014


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

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

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

commit 97baa59c7a780d81f3850415776466af5065737f
Author: Luis Armendariz <luis>
Date:   Mon Apr 13 19:59:53 2009 +0000

    Fixed the figure captions in Chapter 5. Also, make sure that the
    images (*.png) have the proper mime-type set.


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

97baa59c7a780d81f3850415776466af5065737f
 figures3/bm1/alpha.png                             | Bin 0 -> 49679 bytes
 figures3/bm1/alpha_2d.png                          | Bin 0 -> 17379 bytes
 figures3/bm1/alpha_3d.png                          | Bin 0 -> 16607 bytes
 figures3/bm1/process-images.sh                     |  19 +++
 .../out/fig_full_log_error_pressure_256_512.png    | Bin 0 -> 220242 bytes
 ...fig_full_log_error_pressure_512_128_512_256.png | Bin 0 -> 221864 bytes
 .../bm3/out/fig_inc_log_error_pressure_256_512.png | Bin 0 -> 203070 bytes
 .../fig_inc_log_error_pressure_512_128_512_256.png | Bin 0 -> 249146 bytes
 figures3/bm3/out/fig_pressure_512.png              | Bin 0 -> 86298 bytes
 figures3/bm3/process-images.sh                     | 161 ++++++++++-----------
 10 files changed, 93 insertions(+), 87 deletions(-)

diff --git a/figures3/bm1/alpha.png b/figures3/bm1/alpha.png
new file mode 100644
index 0000000..ba8b3c0
Binary files /dev/null and b/figures3/bm1/alpha.png differ
diff --git a/figures3/bm1/alpha_2d.png b/figures3/bm1/alpha_2d.png
new file mode 100644
index 0000000..af05d64
Binary files /dev/null and b/figures3/bm1/alpha_2d.png differ
diff --git a/figures3/bm1/alpha_3d.png b/figures3/bm1/alpha_3d.png
new file mode 100644
index 0000000..68cb4f6
Binary files /dev/null and b/figures3/bm1/alpha_3d.png differ
diff --git a/figures3/bm1/process-images.sh b/figures3/bm1/process-images.sh
new file mode 100755
index 0000000..e892539
--- /dev/null
+++ b/figures3/bm1/process-images.sh
@@ -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
+
diff --git a/figures3/bm3/out/fig_full_log_error_pressure_256_512.png b/figures3/bm3/out/fig_full_log_error_pressure_256_512.png
new file mode 100644
index 0000000..c20e33b
Binary files /dev/null and b/figures3/bm3/out/fig_full_log_error_pressure_256_512.png differ
diff --git a/figures3/bm3/out/fig_full_log_error_pressure_512_128_512_256.png b/figures3/bm3/out/fig_full_log_error_pressure_512_128_512_256.png
new file mode 100644
index 0000000..c286fe7
Binary files /dev/null and b/figures3/bm3/out/fig_full_log_error_pressure_512_128_512_256.png differ
diff --git a/figures3/bm3/out/fig_inc_log_error_pressure_256_512.png b/figures3/bm3/out/fig_inc_log_error_pressure_256_512.png
new file mode 100644
index 0000000..2f21b44
Binary files /dev/null and b/figures3/bm3/out/fig_inc_log_error_pressure_256_512.png differ
diff --git a/figures3/bm3/out/fig_inc_log_error_pressure_512_128_512_256.png b/figures3/bm3/out/fig_inc_log_error_pressure_512_128_512_256.png
new file mode 100644
index 0000000..42073b5
Binary files /dev/null and b/figures3/bm3/out/fig_inc_log_error_pressure_512_128_512_256.png differ
diff --git a/figures3/bm3/out/fig_pressure_512.png b/figures3/bm3/out/fig_pressure_512.png
new file mode 100644
index 0000000..466c71a
Binary files /dev/null and b/figures3/bm3/out/fig_pressure_512.png differ
diff --git a/figures3/bm3/process-images.sh b/figures3/bm3/process-images.sh
index 2517ae8..c92d414 100755
--- a/figures3/bm3/process-images.sh
+++ b/figures3/bm3/process-images.sh
@@ -11,28 +11,28 @@ set -x
 # 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,79 +57,66 @@ for img in ${imglist}; do
 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
+
+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
+
+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
 
 
 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
+    full_pressure_512.png \
+    inc_pressure_512.png \
+    fig_pressure_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 \
-    log_error_pressure_128.png \
-    log_error_velocity_128.png \
-    fig_log_error_fields_128.png
+    full_log_error_pressure_512_128.png \
+    full_log_error_pressure_512_256.png \
+    fig_full_log_error_pressure_512_128_512_256.png
+
 cat-pair \
-    log_error_pressure_256.png \
-    log_error_velocity_256.png \
-    fig_log_error_fields_256.png
+    inc_log_error_pressure_256.png \
+    inc_log_error_pressure_512.png \
+    fig_inc_log_error_pressure_256_512.png \
+
 cat-pair \
-    log_error_pressure_512.png \
-    log_error_velocity_512.png \
-    fig_log_error_fields_512.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
-
-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
-
-
-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
-
-
-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
+    inc_log_error_pressure_512_128.png \
+    inc_log_error_pressure_512_256.png \
+    fig_inc_log_error_pressure_512_128_512_256.png
 
 
 # finally, resize the images that will be included in the manual



More information about the CIG-COMMITS mailing list