[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit ff8ffc6a227f16d4d61e851cfb0e35b06159dc82
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri May 27 08:35:57 2005 +1000

    Cosmetics for advection tests
    
    darcs-hash:20050526223557-fbd8f-7af1c8cf26245b72388ba0d5b9cfecb666f8cf38.gz

diff --git a/test/advection/graphic/report.sh b/test/advection/graphic/report.sh
index 9b0de8b..f047a87 100755
--- a/test/advection/graphic/report.sh
+++ b/test/advection/graphic/report.sh
@@ -43,7 +43,7 @@ for test in $1; do
     if test "$name" != "CVS"; then
 	cd $test
         esname=`echo $name | awk 'BEGIN{FS=""}{for (i = 1; i <= NF; i++)if($i=="_")printf("\\\_"); else printf("%s", $i);}'`
-	caption=`awk '{if ($1 == "caption:") print substr ($0, 10);}' < description.txt`
+	caption=`cat description.tex`
 	printf "Figure %2d: %s\n" $figure $name
 	figure=`expr $figure + 1`
 	cd ../..
diff --git a/test/advection/order/tests/rotate1/description.tex b/test/advection/graphic/tests/rotate1/description.tex
similarity index 100%
copy from test/advection/order/tests/rotate1/description.tex
copy to test/advection/graphic/tests/rotate1/description.tex
diff --git a/test/advection/graphic/tests/rotate1/description.txt b/test/advection/graphic/tests/rotate1/description.txt
deleted file mode 100644
index 1d83b3b..0000000
--- a/test/advection/graphic/tests/rotate1/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Rotation of a smooth field (``gaussian''), no limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate2/description.tex b/test/advection/graphic/tests/rotate2/description.tex
new file mode 100644
index 0000000..9af5204
--- /dev/null
+++ b/test/advection/graphic/tests/rotate2/description.tex
@@ -0,0 +1 @@
+Rotation of a smooth field (``gaussian''), van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate2/description.txt b/test/advection/graphic/tests/rotate2/description.txt
deleted file mode 100644
index 5a00a23..0000000
--- a/test/advection/graphic/tests/rotate2/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Rotation of a smooth field (``gaussian''), van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate3/description.tex b/test/advection/graphic/tests/rotate3/description.tex
new file mode 100644
index 0000000..e41fadb
--- /dev/null
+++ b/test/advection/graphic/tests/rotate3/description.tex
@@ -0,0 +1 @@
+Rotation of a sharp field (``star''), van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate3/description.txt b/test/advection/graphic/tests/rotate3/description.txt
deleted file mode 100644
index bedc450..0000000
--- a/test/advection/graphic/tests/rotate3/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Rotation of a sharp field (``star''), van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate4/description.tex b/test/advection/graphic/tests/rotate4/description.tex
new file mode 100644
index 0000000..e3b217a
--- /dev/null
+++ b/test/advection/graphic/tests/rotate4/description.tex
@@ -0,0 +1 @@
+Rotation of a sharp field (``star''), VOF scheme, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate4/description.txt b/test/advection/graphic/tests/rotate4/description.txt
deleted file mode 100644
index d6b7555..0000000
--- a/test/advection/graphic/tests/rotate4/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Rotation of a sharp field (``star''), VOF scheme, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate_refine1/description.tex b/test/advection/graphic/tests/rotate_refine1/description.tex
new file mode 100644
index 0000000..b519389
--- /dev/null
+++ b/test/advection/graphic/tests/rotate_refine1/description.tex
@@ -0,0 +1 @@
+Rotation of a sharp field (``star''), van Leer limiter, CFL of 0.5, two levels of refinement in a square centered box.
diff --git a/test/advection/graphic/tests/rotate_refine1/description.txt b/test/advection/graphic/tests/rotate_refine1/description.txt
deleted file mode 100644
index 13a213a..0000000
--- a/test/advection/graphic/tests/rotate_refine1/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Rotation of a sharp field (``star''), van Leer limiter, CFL of 0.5, two levels of refinement in a square centered box.
diff --git a/test/advection/graphic/tests/rotate_refine2/description.tex b/test/advection/graphic/tests/rotate_refine2/description.tex
new file mode 100644
index 0000000..9492bbe
--- /dev/null
+++ b/test/advection/graphic/tests/rotate_refine2/description.tex
@@ -0,0 +1 @@
+Rotation of a sharp field (``star''), van Leer limiter, VOF scheme, CFL of 0.5, two levels of refinement in a square centered box.
diff --git a/test/advection/graphic/tests/rotate_refine2/description.txt b/test/advection/graphic/tests/rotate_refine2/description.txt
deleted file mode 100644
index 948ac36..0000000
--- a/test/advection/graphic/tests/rotate_refine2/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Rotation of a sharp field (``star''), van Leer limiter, VOF scheme, CFL of 0.5, two levels of refinement in a square centered box.
diff --git a/test/advection/order/tests/translate1/description.tex b/test/advection/graphic/tests/translate1/description.tex
similarity index 100%
copy from test/advection/order/tests/translate1/description.tex
copy to test/advection/graphic/tests/translate1/description.tex
diff --git a/test/advection/graphic/tests/translate1/description.txt b/test/advection/graphic/tests/translate1/description.txt
deleted file mode 100644
index 099dbe8..0000000
--- a/test/advection/graphic/tests/translate1/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Translation of a smooth field (``gaussian''), periodic boundary conditions, no limiter, CFL of 0.5.
diff --git a/test/advection/order/tests/translate1/description.tex b/test/advection/graphic/tests/translate2/description.tex
similarity index 60%
copy from test/advection/order/tests/translate1/description.tex
copy to test/advection/graphic/tests/translate2/description.tex
index 6ad3206..334841c 100644
--- a/test/advection/order/tests/translate1/description.tex
+++ b/test/advection/graphic/tests/translate2/description.tex
@@ -1 +1 @@
-Translation of a smooth field (``gaussian''), periodic boundary conditions, no limiter, CFL of 0.5.
+Translation of a smooth field (``gaussian''), periodic boundary conditions, van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate2/description.txt b/test/advection/graphic/tests/translate2/description.txt
deleted file mode 100644
index f728fe5..0000000
--- a/test/advection/graphic/tests/translate2/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Translation of a smooth field (``gaussian''), periodic boundary conditions, van Leer limiter, CFL of 0.5.
diff --git a/test/advection/order/tests/translate3/description.tex b/test/advection/graphic/tests/translate3/description.tex
similarity index 100%
copy from test/advection/order/tests/translate3/description.tex
copy to test/advection/graphic/tests/translate3/description.tex
diff --git a/test/advection/graphic/tests/translate3/description.txt b/test/advection/graphic/tests/translate3/description.txt
deleted file mode 100644
index b6df206..0000000
--- a/test/advection/graphic/tests/translate3/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Translation of a smooth field (``periodic''), periodic boundary conditions, no limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate6/description.tex b/test/advection/graphic/tests/translate6/description.tex
new file mode 100644
index 0000000..f25b6da
--- /dev/null
+++ b/test/advection/graphic/tests/translate6/description.tex
@@ -0,0 +1 @@
+Translation of a sharp field (``star''), periodic boundary conditions, van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate6/description.txt b/test/advection/graphic/tests/translate6/description.txt
deleted file mode 100644
index 3b48bab..0000000
--- a/test/advection/graphic/tests/translate6/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Translation of a sharp field (``star''), periodic boundary conditions, van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate7/description.tex b/test/advection/graphic/tests/translate7/description.tex
new file mode 100644
index 0000000..e8322d3
--- /dev/null
+++ b/test/advection/graphic/tests/translate7/description.tex
@@ -0,0 +1 @@
+Translation of a sharp field (``star''), periodic boundary conditions, VOF scheme, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate7/description.txt b/test/advection/graphic/tests/translate7/description.txt
deleted file mode 100644
index f2918f0..0000000
--- a/test/advection/graphic/tests/translate7/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Translation of a sharp field (``star''), periodic boundary conditions, VOF scheme, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate8/description.tex b/test/advection/graphic/tests/translate8/description.tex
new file mode 100644
index 0000000..df57e6a
--- /dev/null
+++ b/test/advection/graphic/tests/translate8/description.tex
@@ -0,0 +1 @@
+Translation of a sharp field (``star''), periodic boundary conditions, VOF scheme, CFL of 0.5, adaptive mesh refinement.
diff --git a/test/advection/graphic/tests/translate8/description.txt b/test/advection/graphic/tests/translate8/description.txt
deleted file mode 100644
index 999d33d..0000000
--- a/test/advection/graphic/tests/translate8/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Translation of a sharp field (``star''), periodic boundary conditions, VOF scheme, CFL of 0.5, adaptive mesh refinement.
diff --git a/test/advection/graphic/tests/translate_refine1/description.tex b/test/advection/graphic/tests/translate_refine1/description.tex
new file mode 100644
index 0000000..785c2e9
--- /dev/null
+++ b/test/advection/graphic/tests/translate_refine1/description.tex
@@ -0,0 +1 @@
+Translation of a smooth field (``gaussian''), periodic boundary conditions, no limiter, CFL of 0.5, two levels of refinement on the half left domain.
diff --git a/test/advection/graphic/tests/translate_refine1/description.txt b/test/advection/graphic/tests/translate_refine1/description.txt
deleted file mode 100644
index 0ef58a9..0000000
--- a/test/advection/graphic/tests/translate_refine1/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-caption: Translation of a smooth field (``gaussian''), periodic boundary conditions, no limiter, CFL of 0.5, two levels of refinement on the half left domain.

-- 
Gerris Flow Solver