[cig-commits] r14549 - in doc/cigma/manual: . figures3/bm2 figures3/bm2/out figures3/bm3 figures3/bm3/out
luis at geodynamics.org
luis at geodynamics.org
Tue Mar 31 09:05:06 PDT 2009
Author: luis
Date: 2009-03-31 09:05:05 -0700 (Tue, 31 Mar 2009)
New Revision: 14549
Added:
doc/cigma/manual/figures3/bm2/out/
doc/cigma/manual/figures3/bm2/out/.keep
doc/cigma/manual/figures3/bm2/process-images.sh
doc/cigma/manual/figures3/bm3/out/
doc/cigma/manual/figures3/bm3/out/.keep
Modified:
doc/cigma/manual/figures3/bm3/process-images.sh
doc/cigma/manual/main2.lyx
Log:
Update manual
Added: doc/cigma/manual/figures3/bm2/out/.keep
===================================================================
Added: doc/cigma/manual/figures3/bm2/process-images.sh
===================================================================
--- doc/cigma/manual/figures3/bm2/process-images.sh (rev 0)
+++ doc/cigma/manual/figures3/bm2/process-images.sh 2009-03-31 16:05:05 UTC (rev 14549)
@@ -0,0 +1,88 @@
+#!/bin/bash
+#
+# See ../bm3/process-images.sh for comments
+#
+
+imglist="
+ temperature_64_20000_y099.png
+ velocity_64_20000_y099.png
+ log_error_temperature_64_08_20000_2100_y099.png
+ log_error_temperature_64_16_20000_4700_y099.png
+ log_error_temperature_64_32_20000_9900_y099.png
+ log_error_velocity_64_08_20000_2100_y099.png
+ log_error_velocity_64_16_20000_4700_y099.png
+ log_error_velocity_64_32_20000_9900_y099.png
+"
+
+orig=${PWD}
+tmp=/tmp/bm2
+mkdir -p $tmp
+for img in ${imglist}; do
+ cp -f -v ${img} ${tmp}
+done
+cd ${tmp}
+
+function img-cat
+{
+ local tile=$1
+ shift
+ montage -tile ${tile} -mode Concatenate $*
+}
+
+function img-trim
+{
+ echo $1 ...trimming
+ convert -trim $1 $1
+}
+
+function img-add-border
+{
+ echo $1 ...adding border
+ convert -border $2 -bordercolor white $1 $1
+}
+
+function img-resize
+{
+ echo $1 ...resizing
+ convert -resize '80%' $1 $1
+}
+
+function cat-pair
+{
+ echo Concatenating $1 $2
+ img-cat 2x1 $1 $2 $3
+}
+
+
+#
+# Start processing the images
+#
+
+for img in ${imglist}; do
+ img-trim ${img}
+ img-add-border ${img} 100
+done
+
+cat-pair \
+ temperature_64_20000_y099.png \
+ velocity_64_20000_y099.png \
+ fig_fields_64_20000_y099.png
+
+cat-pair \
+ log_error_temperature_64_16_20000_4700_y099.png \
+ log_error_temperature_64_32_20000_9900_y099.png \
+ fig_log_error_temperature_64_16_64_32_y099.png
+
+cat-pair \
+ log_error_velocity_64_16_20000_4700_y099.png \
+ log_error_velocity_64_32_20000_9900_y099.png \
+ fig_log_error_velocity_64_16_64_32_y099.png
+
+
+for img in fig_*; do
+ img-resize ${img}
+done
+
+cd ${orig}
+cp -f -v ${tmp}/fig_* ${orig}/out
+
Property changes on: doc/cigma/manual/figures3/bm2/process-images.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: doc/cigma/manual/figures3/bm3/out/.keep
===================================================================
Modified: doc/cigma/manual/figures3/bm3/process-images.sh
===================================================================
--- doc/cigma/manual/figures3/bm3/process-images.sh 2009-03-30 19:26:02 UTC (rev 14548)
+++ doc/cigma/manual/figures3/bm3/process-images.sh 2009-03-31 16:05:05 UTC (rev 14549)
@@ -5,14 +5,39 @@
# http://personal.cscs.ch/~mvalle/postprocessing/ImageTools.html
#
-function download-images
-{
- local url="http://stress.geodynamics.org/~luis/bm3/inclusion/"
- wget -q -nc -k -O foo.html ${url}
- wget -q -nc -F -B ${url} -i foo.html -nd -r -A'*.png'
- rm -f foo.html
-}
+#
+# List of the original image names
+#
+imglist="
+ pressure_512.png
+ velocity_512.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
+"
+#
+# Operate on copies of the original images
+#
+orig=${PWD}
+tmp=/tmp/bm3
+mkdir -p $tmp
+for img in ${imglist}; do
+ cp -f -v ${img} ${tmp}
+done
+cd ${tmp}
+
+
+#
+# Some useful functions
+#
function concatenate-images
{
local tile=$1
@@ -40,47 +65,43 @@
function concatenate-pair
{
- echo Concatenating $1 and $2
+ echo Concatenating $1 $2
concatenate-images 2x1 $1 $2 $3
}
+#
+# Start processing the images
+#
-
-imglist="
- pressure_512.png
- velocity_512.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
-"
-
-imglist2="
- fields_512.png
- log_error_128.png
- log_error_256.png
- log_error_512.png
-"
-
-#download-images
-
for img in ${imglist}; do
trim-image ${img}
add-border ${img} 100
done
-concatenate-pair pressure_512.png velocity_512.png 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
+concatenate-pair pressure_512.png velocity_512.png fig_fields_512.png
+concatenate-pair log_error_pressure_128.png log_error_velocity_128.png fig_log_error_fields_128.png
+concatenate-pair log_error_pressure_256.png log_error_velocity_256.png fig_log_error_fields_256.png
+concatenate-pair log_error_pressure_512.png log_error_velocity_512.png fig_log_error_fields_512.png
-for img in ${imglist2}; do
+concatenate-images 3x1 log_error_pressure_128.png log_error_pressure_256.png log_error_pressure_512.png fig_log_error_pressure.png
+concatenate-images 3x1 log_error_velocity_128.png log_error_velocity_256.png log_error_velocity_512.png fig_log_error_velocity.png
+
+concatenate-images 2x1 log_error_pressure_256.png log_error_pressure_512.png fig_log_error_pressure_256_512.png
+concatenate-images 2x1 log_error_velocity_256.png log_error_velocity_512.png fig_log_error_velocity_256_512.png
+
+concatenate-images 2x1 log_error_pressure_512_128.png log_error_pressure_512_256.png fig_log_error_pressure_512_128_512_256.png
+concatenate-images 2x1 log_error_velocity_512_128.png log_error_velocity_512_256.png fig_log_error_velocity_512_128_512_256.png
+
+
+#
+# finally, resize
+for img in fig_*; do
resize-image ${img}
done
+#
+# Copy the images back
+#
+cd ${orig}
+cp -f -v ${tmp}/fig_* ${orig}/out
+
Modified: doc/cigma/manual/main2.lyx
===================================================================
--- doc/cigma/manual/main2.lyx 2009-03-30 19:26:02 UTC (rev 14548)
+++ doc/cigma/manual/main2.lyx 2009-03-31 16:05:05 UTC (rev 14549)
@@ -4032,175 +4032,6 @@
\end_layout
-\begin_layout Plain Layout
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
-\begin_inset Float figure
-placement H
-wide false
-sideways false
-status open
-
-\begin_layout Plain Layout
-\begin_inset Graphics
- filename figures2/laplace_square6.png
- lyxscale 80
- scale 25
-
-\end_inset
-
-
-\begin_inset Caption
-
-\begin_layout Plain Layout
-Caption for 5.4 here
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Plain Layout
-\begin_inset Float figure
-placement H
-wide false
-sideways false
-status collapsed
-
-\begin_layout Plain Layout
-\begin_inset Graphics
- filename figures2/log_res_square_6_2.png
- lyxscale 40
- scale 18
-
-\end_inset
-
-
-\begin_inset Caption
-
-\begin_layout Plain Layout
-Caption for 5.4 here
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Plain Layout
-\begin_inset Float figure
-placement H
-wide false
-sideways false
-status collapsed
-
-\begin_layout Plain Layout
-\begin_inset Graphics
- filename figures2/log_res_square_6_3.png
- lyxscale 40
- scale 18
-
-\end_inset
-
-
-\begin_inset Caption
-
-\begin_layout Plain Layout
-Caption for 5.4 here
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Plain Layout
-\begin_inset Float figure
-placement H
-wide false
-sideways false
-status collapsed
-
-\begin_layout Plain Layout
-\begin_inset Graphics
- filename figures2/log_res_square_6_4.png
- lyxscale 40
- scale 18
-
-\end_inset
-
-
-\begin_inset Caption
-
-\begin_layout Plain Layout
-Caption for 5.4 here
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Plain Layout
-\begin_inset Float figure
-placement H
-wide false
-sideways false
-status collapsed
-
-\begin_layout Plain Layout
-\begin_inset Graphics
- filename figures2/log_res_square_6_5.png
- lyxscale 40
- scale 18
-
-\end_inset
-
-
-\begin_inset Caption
-
-\begin_layout Plain Layout
-Caption for 5.4 here
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
\begin_layout Standard
\begin_inset space ~
\end_inset
@@ -4215,7 +4046,8 @@
\begin_layout Plain Layout
\begin_inset Graphics
filename figures2/alpha_square.png
- scale 30
+ lyxscale 80
+ scale 40
\end_inset
@@ -4503,21 +4335,17 @@
\end_layout
\begin_layout Standard
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
\begin_inset Float figure
placement H
wide false
sideways false
-status collapsed
+status open
\begin_layout Plain Layout
\begin_inset Graphics
- filename figures2/log_res_citcomcu_velocity_32_08.png
+ filename figures3/bm2/out/fig_fields_64_20000_y099.png
lyxscale 40
- scale 40
+ scale 22
\end_inset
@@ -4525,7 +4353,7 @@
\begin_inset Caption
\begin_layout Plain Layout
-Caption for 5.1 here
+Slice of temperature and velocity fields on y=0.99 plane.
\end_layout
\end_inset
@@ -4544,13 +4372,13 @@
placement H
wide false
sideways false
-status collapsed
+status open
\begin_layout Plain Layout
\begin_inset Graphics
- filename figures2/log_res_citcomcu_velocity_32_16.png
+ filename figures3/bm2/out/fig_log_error_temperature_64_16_64_32_y099.png
lyxscale 40
- scale 40
+ scale 22
\end_inset
@@ -4558,7 +4386,7 @@
\begin_inset Caption
\begin_layout Plain Layout
-Caption for 5.2 here
+Temperature differences on y=0.99 slice
\end_layout
\end_inset
@@ -4569,6 +4397,29 @@
\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 Graphics
+ filename /Users/luis/p/cig/doc/cigma/figures3/bm2/out/fig_log_error_velocity_64_16_64_32_y099.png
+ lyxscale 40
+ scale 22
+
+\end_inset
+
+
+\begin_inset Caption
+
+\begin_layout Plain Layout
+Velocity differences on y=0.99 slice
\end_layout
\end_inset
@@ -4576,6 +4427,11 @@
\end_layout
+\end_inset
+
+
+\end_layout
+
\begin_layout Standard
In the figures above, we show three cross sections of the error in the velocity
field.
@@ -4604,9 +4460,9 @@
\begin_layout Plain Layout
\begin_inset Graphics
- filename figures3/bm3/fields_512.png
+ filename figures3/bm3/out/fig_fields_512.png
lyxscale 40
- scale 18
+ scale 22
\end_inset
@@ -4707,19 +4563,15 @@
\end_layout
\begin_layout Standard
-\begin_inset Note Note
-status collapsed
-
-\begin_layout Plain Layout
\begin_inset Float figure
placement H
wide false
sideways false
-status open
+status collapsed
\begin_layout Plain Layout
\begin_inset Graphics
- filename figures2/log_res_circular_inclusion_256_064.png
+ filename /Users/luis/p/cig/doc/cigma/figures3/bm3/out/fig_log_error_pressure_256_512.png
lyxscale 40
scale 18
@@ -4729,7 +4581,8 @@
\begin_inset Caption
\begin_layout Plain Layout
-Caption for 5.3 here
+Errors in pressure field for 256 and 512 resolutions.
+
\end_layout
\end_inset
@@ -4752,7 +4605,7 @@
\begin_layout Plain Layout
\begin_inset Graphics
- filename figures2/log_res_circular_inclusion_256_128.png
+ filename /Users/luis/p/cig/doc/cigma/figures3/bm3/out/fig_log_error_velocity_256_512.png
lyxscale 40
scale 18
@@ -4762,7 +4615,7 @@
\begin_inset Caption
\begin_layout Plain Layout
-Caption for 5.4 here
+Velocity field differences
\end_layout
\end_inset
@@ -4775,11 +4628,6 @@
\end_layout
-\end_inset
-
-
-\end_layout
-
\begin_layout Standard
The analytic solution is registered under the somewhat verbose name
\end_layout
@@ -4816,7 +4664,7 @@
\begin_layout Standard
\begin_inset Note Note
-status open
+status collapsed
\begin_layout Section
Strikeslip Benchmark Convergence
More information about the CIG-COMMITS
mailing list