[cig-commits] [commit] master: More composite images (c3d6416)

[cig_noreply at geodynamics.org]

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

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

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

commit c3d64168910e551e667f57c6e520627f56fb2f9e
Author: Luis Armendariz <luis>
Date:   Sat Mar 28 01:33:05 2009 +0000

    More composite images


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

c3d64168910e551e667f57c6e520627f56fb2f9e
 figures3/bm3/fields_512.png    | Bin 170423 -> 1119995 bytes
 figures3/bm3/log_error_128.png | Bin 0 -> 1006990 bytes
 figures3/bm3/log_error_256.png | Bin 0 -> 997418 bytes
 figures3/bm3/log_error_512.png | Bin 0 -> 990219 bytes
 figures3/bm3/process-images.sh |  24 ++++++++++++++++++++++--
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/figures3/bm3/fields_512.png b/figures3/bm3/fields_512.png
index 8db06f8..99ec502 100644
Binary files a/figures3/bm3/fields_512.png and b/figures3/bm3/fields_512.png differ
diff --git a/figures3/bm3/log_error_128.png b/figures3/bm3/log_error_128.png
new file mode 100644
index 0000000..ce86982
Binary files /dev/null and b/figures3/bm3/log_error_128.png differ
diff --git a/figures3/bm3/log_error_256.png b/figures3/bm3/log_error_256.png
new file mode 100644
index 0000000..c44106d
Binary files /dev/null and b/figures3/bm3/log_error_256.png differ
diff --git a/figures3/bm3/log_error_512.png b/figures3/bm3/log_error_512.png
new file mode 100644
index 0000000..a7c3ac7
Binary files /dev/null and b/figures3/bm3/log_error_512.png differ
diff --git a/figures3/bm3/process-images.sh b/figures3/bm3/process-images.sh
index c6a8fba..33857ed 100755
--- a/figures3/bm3/process-images.sh
+++ b/figures3/bm3/process-images.sh
@@ -8,9 +8,16 @@ function download-images
     rm -f foo.html
 }
 
+function concatenate-images
+{
+    local tile=$1
+    shift
+    montage -tile ${tile} -mode Concatenate $*
+}
+
 function concatenate-pair
 {
-    montage -tile 2x1 -mode Concatenate $1 $2 $3
+    concatenate-images 2x1 $1 $2 $3
 }
 
 function trim-image
@@ -20,5 +27,18 @@ function trim-image
 
 download-images
 concatenate-pair pressure_512.png velocity_512.png fields_512.png
-trim-image fields_512.png
+concatenate-pair log_error_pressure_128.png log_error_velocity_128.png log_error_128.png
+concatenate-pair log_error_pressure_256.png log_error_velocity_256.png log_error_256.png
+concatenate-pair log_error_pressure_512.png log_error_velocity_512.png log_error_512.png
+
+trimlist="
+    fields_512.png
+    log_error_128.png
+    log_error_256.png
+    log_error_512.png
+"
+
+for img in ${trimlist}; do
+    trim-image ${img}
+done