[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
stephane.popinet at paradise.net.nz
Fri May 15 02:51:32 UTC 2009
The following commit has been merged in the upstream branch:
commit 73a868aa051beb2559be8f5ebdd33e6cb27e2dc4
Author: Stephane Popinet <stephane.popinet at paradise.net.nz>
Date: Sun Jan 30 14:23:18 2005 +1100
Graphic advection test restructured
Uses gerris/gfsview rather than advection.c/gts2oogl/geomview etc...
darcs-hash:20050130032318-fa380-3d38cc0f13ca8873da8c22b5561ac2405de5f5d5.gz
diff --git a/test/advection/graphic/Makefile.am b/test/advection/graphic/Makefile.am
index 1cac849..358c175 100644
--- a/test/advection/graphic/Makefile.am
+++ b/test/advection/graphic/Makefile.am
@@ -5,18 +5,20 @@ TESTS = test.sh
EXTRA_DIST = \
check.sh \
cleanup.sh \
- figures.sh \
report.sh \
tests
-test.sh:
+test.sh: star.gts
@echo "#! /bin/sh" > test.sh
@echo "rm -f report.ps" >> test.sh
- @echo "for f in tests/*; do if test \"\$$f\" != \"tests/CVS\"; then ./check.sh \"\$$f\"; fi; done" >> test.sh
+ @echo "./check.sh \"tests/*\";" >> test.sh
@chmod +x test.sh
report.ps: report.sh timestamp
./report.sh "tests/*"
+star.gts:
+ ../../poisson/shapes star | transform -i -s 0.9 > star.gts
+
clean-generic:
./cleanup.sh
diff --git a/test/advection/graphic/check.sh b/test/advection/graphic/check.sh
index c85fdae..e597c64 100755
--- a/test/advection/graphic/check.sh
+++ b/test/advection/graphic/check.sh
@@ -10,18 +10,20 @@ startdate=`date +%s`
PATH=$PATH:../../../../poisson:../../..
for test in $1; do
cd $test
- command=`awk '{if ($1 == "command:") print substr ($0, 10);}' < description.txt`
- rm -f *.gts
- if /bin/sh -c "$command > log 2>&1"; then
- all=`expr $all + 1`;
- echo "PASS: `basename $test`"
+ if gerris2D advection.gfs | gfsview-batch2D graphics.gfs 2> /dev/null; then
+ if ../../conservation.sh; then
+ echo "PASS: `basename $test`"
+ else
+ failed=`expr $failed + 1`;
+ echo "FAIL: `basename $test`"
+ fi
else
- all=`expr $all + 1`;
- failed=`expr $failed + 1`;
- echo "FAIL: `basename $test`"
+ failed=`expr $failed + 1`;
+ echo "FAIL: `basename $test`"
fi
cd ../..
expr `date +%s` - $startdate > timestamp
+ all=`expr $all + 1`;
done
if test "$failed" -eq 0; then
diff --git a/test/advection/graphic/cleanup.sh b/test/advection/graphic/cleanup.sh
index 3877329..e860366 100755
--- a/test/advection/graphic/cleanup.sh
+++ b/test/advection/graphic/cleanup.sh
@@ -1,6 +1,6 @@
#! /bin/sh
for file in tests/*; do
- rm -f $file/*.gts $file/*.ps $file/log $file/*~ $file/core
+ rm -f $file/*.eps $file/log $file/*~ $file/core
done
rm -f timestamp
diff --git a/test/advection/graphic/conservation.sh b/test/advection/graphic/conservation.sh
new file mode 100755
index 0000000..d738385
--- /dev/null
+++ b/test/advection/graphic/conservation.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if awk '
+BEGIN {
+ mass0 = 0.;
+}
+{
+ if ($4 == "sum:") {
+ if (mass0 == 0.)
+ mass0 = $5;
+ if (fabs ($5 - mass0) > 1e-10)
+ exit 1;
+ }
+# else if ($4 == "min:") {
+# if ($5 < -1e-2 || $11 > 1. + 1e-2)
+# exit 1;
+# }
+}' < log; then
+ exit 0;
+else
+ exit 1;
+fi
diff --git a/test/advection/graphic/figures.sh b/test/advection/graphic/figures.sh
deleted file mode 100755
index 356eee9..0000000
--- a/test/advection/graphic/figures.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-if test -z "$1"; then
- echo "usage: figures.sh FILES [COLUMNS]"
- echo " FILES: GTS files. example: \"*.gts\""
- echo " [COLUMNS]: number of columns (default is 3)"
- exit 1;
-fi
-
-if test -z "$2"; then
- ncol=2
-else
- ncol=`expr $2 - 1`
-fi
-
-x=0
-y=0
-col=0
-echo "LIST {" > /tmp/figures.oogl
-for file in $1; do
- transform --tx $x --ty $y < $file | gts2oogl --isolines 10 --nosurface | awk '{if (NF == 3) print $1 " " $2 " " 0; else print $0;}' >> /tmp/figures.oogl
- x1=`awk -v a=$x 'BEGIN {print a - 0.5}'`
- y1=`awk -v a=$y 'BEGIN {print a - 0.5}'`
- x2=`awk -v a=$x 'BEGIN {print a + 0.5}'`
- y2=`awk -v a=$y 'BEGIN {print a + 0.5}'`
- echo "VECT 1 5 0 5 0 $x1 $y1 0 $x1 $y2 0 $x2 $y2 0 $x2 $y1 0 $x1 $y1 0" >> /tmp/figures.oogl
- if expr $col \< $ncol >/dev/null; then
- col=`expr $col + 1`
- x=`expr $x + 1`
- else
- col=0
- x=0
- y=`expr $y - 1`
- fi
-done
-echo "}" >> /tmp/figures.oogl
-geomview -nopanels -wins 0 -c - <<EOF
- (camera default {
- perspective 0
- fov 1.42217
- })
- (backcolor default 1. 1. 1.)
- (load /tmp/figures.oogl geometry)
- (bbox-draw World no)
- (normalization World each)
- (look)
- (snapshot default "/tmp/figures.ps" ps 300 300)
- (exit)
-EOF
-rm -f /tmp/figures.oogl
-sed 's/1 setlinewidth/0.1 setlinewidth/g' < /tmp/figures.ps
-rm -f /tmp/figures.ps
diff --git a/test/advection/graphic/report.sh b/test/advection/graphic/report.sh
index 48be23f..9b0de8b 100755
--- a/test/advection/graphic/report.sh
+++ b/test/advection/graphic/report.sh
@@ -25,7 +25,7 @@ cat <<EOF > $texfile.tex
\vspace{5mm}
EOF
-../advection -V 2>&1 | awk '{print $0 "\\\\"}' >> $texfile.tex
+gerris2D -V 2>&1 | awk '{print $0 "\\\\"}' >> $texfile.tex
echo "`uname -a` \\\\" >> $texfile.tex
echo "Total running time: `cat timestamp` s\\\\" >> $texfile.tex
@@ -42,20 +42,25 @@ for test in $1; do
name=`basename $test`
if test "$name" != "CVS"; then
cd $test
- command=`awk '{if ($1 == "command:") print substr ($0, 10);}' < description.txt`
+ 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`
- ../../figures.sh "*.gts" > figure.ps
printf "Figure %2d: %s\n" $figure $name
figure=`expr $figure + 1`
cd ../..
- echo "\\begin{figure}" >> $texfile.tex
- echo "\\begin{center}" >> $texfile.tex
- echo "\\psfig{file=$test/figure.ps, width=\\hsize}" >> $texfile.tex
- echo "\\end{center}" >> $texfile.tex
- esname=`echo $name | awk 'BEGIN{FS=""}{for (i = 1; i <= NF; i++)if($i=="_")printf("\\\_"); else printf("%s", $i);}'`
- echo "\\caption{$esname: $caption {\tt $command}}" >> $texfile.tex
- echo "\\end{figure}" >> $texfile.tex
- echo "\\clearpage" >> $texfile.tex
+ cat <<EOF >> $texfile.tex
+\\begin{figure}
+\\begin{center}
+\\begin{tabular}{cc}
+\\psfig{file=$test/t-0.eps, width=0.45\\hsize} &
+\\psfig{file=$test/t-1.eps, width=0.45\\hsize} \\\\
+\\psfig{file=$test/t-2.eps, width=0.45\\hsize} &
+\\psfig{file=$test/t-3.eps, width=0.45\\hsize}
+\\end{tabular}
+\\end{center}
+\\caption{$esname: $caption}
+\\end{figure}
+\\clearpage
+EOF
fi
done
echo "\\end{document}" >> $texfile.tex
diff --git a/test/advection/graphic/tests/rotate1/advection.gfs b/test/advection/graphic/tests/rotate1/advection.gfs
new file mode 100644
index 0000000..76655b2
--- /dev/null
+++ b/test/advection/graphic/tests/rotate1/advection.gfs
@@ -0,0 +1,26 @@
+1 0 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 3.14159265359 }
+ Refine 6
+ VariableTracer {} T {
+ gradient = gfs_center_gradient
+ }
+ AdvectionParams { cfl = 0.5 }
+ Init {} {
+ U = { return -8.*y; }
+ V = { return 8.*x; }
+ T = {
+ double r2 = x*x + y*y;
+ double coeff = 20. + 20000.*r2*r2*r2*r2;
+ return (1. + cos(20.*x)*cos(20.*y))*exp(-coeff*r2)/2.;
+ }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 0.785398 } stdout { variables = T binary = 1 }
+ EventScript { step = 0.785398 } {
+ number=`echo $GfsTime | awk '{print int($1/0.785398+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
diff --git a/test/advection/graphic/tests/rotate1/description.txt b/test/advection/graphic/tests/rotate1/description.txt
index 53d46e9..1d83b3b 100644
--- a/test/advection/graphic/tests/rotate1/description.txt
+++ b/test/advection/graphic/tests/rotate1/description.txt
@@ -1,2 +1 @@
-command: advection -l 6 -s -v -n
caption: Rotation of a smooth field (``gaussian''), no limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate1/graphics.gfs b/test/advection/graphic/tests/rotate1/graphics.gfs
new file mode 100644
index 0000000..6ee922c
--- /dev/null
+++ b/test/advection/graphic/tests/rotate1/graphics.gfs
@@ -0,0 +1,56 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -8.01519
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
diff --git a/test/advection/graphic/tests/rotate2/advection.gfs b/test/advection/graphic/tests/rotate2/advection.gfs
new file mode 100644
index 0000000..5887be7
--- /dev/null
+++ b/test/advection/graphic/tests/rotate2/advection.gfs
@@ -0,0 +1,24 @@
+1 0 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 3.14159265359 }
+ Refine 6
+ VariableTracer {} T
+ AdvectionParams { cfl = 0.5 }
+ Init {} {
+ U = { return -8.*y; }
+ V = { return 8.*x; }
+ T = {
+ double r2 = x*x + y*y;
+ double coeff = 20. + 20000.*r2*r2*r2*r2;
+ return (1. + cos(20.*x)*cos(20.*y))*exp(-coeff*r2)/2.;
+ }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 0.785398 } stdout { variables = T binary = 1 }
+ EventScript { step = 0.785398 } {
+ number=`echo $GfsTime | awk '{print int($1/0.785398+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
diff --git a/test/advection/graphic/tests/rotate2/description.txt b/test/advection/graphic/tests/rotate2/description.txt
index 4e0f079..5a00a23 100644
--- a/test/advection/graphic/tests/rotate2/description.txt
+++ b/test/advection/graphic/tests/rotate2/description.txt
@@ -1,2 +1 @@
-command: advection -l 6 -s -v
caption: Rotation of a smooth field (``gaussian''), van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate2/graphics.gfs b/test/advection/graphic/tests/rotate2/graphics.gfs
new file mode 100644
index 0000000..6ee922c
--- /dev/null
+++ b/test/advection/graphic/tests/rotate2/graphics.gfs
@@ -0,0 +1,56 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -8.01519
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
diff --git a/test/advection/graphic/tests/rotate3/advection.gfs b/test/advection/graphic/tests/rotate3/advection.gfs
new file mode 100644
index 0000000..e53db36
--- /dev/null
+++ b/test/advection/graphic/tests/rotate3/advection.gfs
@@ -0,0 +1,20 @@
+1 0 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 3.14159265359 }
+ Refine 6
+ VariableTracer {} T
+ AdvectionParams { cfl = 0.5 }
+ InitFraction {} T ../../star.gts
+ Init {} {
+ U = { return -8.*y; }
+ V = { return 8.*x; }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 0.785398 } stdout { variables = T binary = 1 }
+ EventScript { step = 0.785398 } {
+ number=`echo $GfsTime | awk '{print int($1/0.785398+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
diff --git a/test/advection/graphic/tests/rotate3/description.txt b/test/advection/graphic/tests/rotate3/description.txt
index 106fc9f..bedc450 100644
--- a/test/advection/graphic/tests/rotate3/description.txt
+++ b/test/advection/graphic/tests/rotate3/description.txt
@@ -1,2 +1 @@
-command: shapes star | transform -i -s 0.9 | advection -l 6 -v
caption: Rotation of a sharp field (``star''), van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate3/graphics.gfs b/test/advection/graphic/tests/rotate3/graphics.gfs
new file mode 100644
index 0000000..1b30709
--- /dev/null
+++ b/test/advection/graphic/tests/rotate3/graphics.gfs
@@ -0,0 +1,56 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -11.5778
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
diff --git a/test/advection/graphic/tests/rotate4/advection.gfs b/test/advection/graphic/tests/rotate4/advection.gfs
new file mode 100644
index 0000000..8469b22
--- /dev/null
+++ b/test/advection/graphic/tests/rotate4/advection.gfs
@@ -0,0 +1,21 @@
+1 0 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 3.14159265359 }
+ Refine 6
+ VariableTracer {} T {
+ scheme = vof
+ }
+ InitFraction {} T ../../star.gts
+ Init {} {
+ U = { return -8.*y; }
+ V = { return 8.*x; }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 0.785398 } stdout { variables = T binary = 1 }
+ EventScript { step = 0.785398 } {
+ number=`echo $GfsTime | awk '{print int($1/0.785398+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
diff --git a/test/advection/graphic/tests/rotate4/description.txt b/test/advection/graphic/tests/rotate4/description.txt
new file mode 100644
index 0000000..d6b7555
--- /dev/null
+++ b/test/advection/graphic/tests/rotate4/description.txt
@@ -0,0 +1 @@
+caption: Rotation of a sharp field (``star''), VOF scheme, CFL of 0.5.
diff --git a/test/advection/graphic/tests/rotate4/graphics.gfs b/test/advection/graphic/tests/rotate4/graphics.gfs
new file mode 100644
index 0000000..1b30709
--- /dev/null
+++ b/test/advection/graphic/tests/rotate4/graphics.gfs
@@ -0,0 +1,56 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -11.5778
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
diff --git a/test/advection/graphic/tests/rotate_refine1/advection.gfs b/test/advection/graphic/tests/rotate_refine1/advection.gfs
new file mode 100644
index 0000000..957abe0
--- /dev/null
+++ b/test/advection/graphic/tests/rotate_refine1/advection.gfs
@@ -0,0 +1,20 @@
+1 0 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 3.14159265359 }
+ Refine { return x < 0.25 && x > -0.25 && y < 0.25 && y > -0.25 ? 7 : 5; }
+ VariableTracer {} T
+ AdvectionParams { cfl = 0.5 }
+ InitFraction {} T ../../star.gts
+ Init {} {
+ U = { return -8.*y; }
+ V = { return 8.*x; }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 0.785398 } stdout { variables = T binary = 1 }
+ EventScript { step = 0.785398 } {
+ number=`echo $GfsTime | awk '{print int($1/0.785398+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
diff --git a/test/advection/graphic/tests/rotate_refine1/description.txt b/test/advection/graphic/tests/rotate_refine1/description.txt
index a51563e..13a213a 100644
--- a/test/advection/graphic/tests/rotate_refine1/description.txt
+++ b/test/advection/graphic/tests/rotate_refine1/description.txt
@@ -1,2 +1 @@
-command: shapes star | transform -i -s 0.9 | advection -l 5 -v -b 2
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_refine1/graphics.gfs b/test/advection/graphic/tests/rotate_refine1/graphics.gfs
new file mode 100644
index 0000000..6624cfb
--- /dev/null
+++ b/test/advection/graphic/tests/rotate_refine1/graphics.gfs
@@ -0,0 +1,61 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -11.5778
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
+Levels {
+ r = 0 g = 0.0869612 b = 1
+ shading = Constant
+ maxlevel = -1
+}
diff --git a/test/advection/graphic/tests/translate1/advection.gfs b/test/advection/graphic/tests/translate1/advection.gfs
new file mode 100644
index 0000000..a7edd80
--- /dev/null
+++ b/test/advection/graphic/tests/translate1/advection.gfs
@@ -0,0 +1,28 @@
+1 2 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 8.94427191 }
+ Refine 6
+ VariableTracer {} T {
+ gradient = gfs_center_gradient
+ }
+ AdvectionParams { cfl = 0.5 }
+ Init {} {
+ U = { double theta = atan (1./2.); return cos (theta); }
+ V = { double theta = atan (1./2.); return sin (theta); }
+ T = {
+ double r2 = x*x + y*y;
+ double coeff = 20. + 20000.*r2*r2*r2*r2;
+ return (1. + cos(20.*x)*cos(20.*y))*exp(-coeff*r2)/2.;
+ }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 2.236067 } stdout { variables = T binary = 1 }
+ EventScript { step = 2.236067 } {
+ number=`echo $GfsTime | awk '{print int($1/2.236067+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
+1 1 right
+1 1 top
diff --git a/test/advection/graphic/tests/translate1/description.txt b/test/advection/graphic/tests/translate1/description.txt
index b407712..099dbe8 100644
--- a/test/advection/graphic/tests/translate1/description.txt
+++ b/test/advection/graphic/tests/translate1/description.txt
@@ -1,2 +1 @@
-command: advection -l 6 -s -v -t -p -n
caption: Translation of a smooth field (``gaussian''), periodic boundary conditions, no limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate1/graphics.gfs b/test/advection/graphic/tests/translate1/graphics.gfs
new file mode 100644
index 0000000..6ee922c
--- /dev/null
+++ b/test/advection/graphic/tests/translate1/graphics.gfs
@@ -0,0 +1,56 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -8.01519
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
diff --git a/test/advection/graphic/tests/translate2/advection.gfs b/test/advection/graphic/tests/translate2/advection.gfs
new file mode 100644
index 0000000..c2367c0
--- /dev/null
+++ b/test/advection/graphic/tests/translate2/advection.gfs
@@ -0,0 +1,26 @@
+1 2 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 8.94427191 }
+ Refine 6
+ VariableTracer {} T
+ AdvectionParams { cfl = 0.5 }
+ Init {} {
+ U = { double theta = atan (1./2.); return cos (theta); }
+ V = { double theta = atan (1./2.); return sin (theta); }
+ T = {
+ double r2 = x*x + y*y;
+ double coeff = 20. + 20000.*r2*r2*r2*r2;
+ return (1. + cos(20.*x)*cos(20.*y))*exp(-coeff*r2)/2.;
+ }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 2.2360679774998 } stdout { variables = T binary = 1 }
+ EventScript { step = 2.2360679774998 } {
+ number=`echo $GfsTime | awk '{print int($1/2.236067+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
+1 1 right
+1 1 top
diff --git a/test/advection/graphic/tests/translate2/description.txt b/test/advection/graphic/tests/translate2/description.txt
index fdc9fc5..f728fe5 100644
--- a/test/advection/graphic/tests/translate2/description.txt
+++ b/test/advection/graphic/tests/translate2/description.txt
@@ -1,2 +1 @@
-command: advection -l 6 -s -v -t -p
caption: Translation of a smooth field (``gaussian''), periodic boundary conditions, van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate2/graphics.gfs b/test/advection/graphic/tests/translate2/graphics.gfs
new file mode 100644
index 0000000..6ee922c
--- /dev/null
+++ b/test/advection/graphic/tests/translate2/graphics.gfs
@@ -0,0 +1,56 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -8.01519
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
diff --git a/test/advection/graphic/tests/translate3/advection.gfs b/test/advection/graphic/tests/translate3/advection.gfs
new file mode 100644
index 0000000..eceba15
--- /dev/null
+++ b/test/advection/graphic/tests/translate3/advection.gfs
@@ -0,0 +1,24 @@
+1 2 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 8.94427191 }
+ Refine 6
+ VariableTracer {} T {
+ gradient = gfs_center_gradient
+ }
+ AdvectionParams { cfl = 0.5 }
+ Init {} {
+ U = { double theta = atan (1./2.); return cos (theta); }
+ V = { double theta = atan (1./2.); return sin (theta); }
+ T = { return (1. + cos(2.*M_PI*x)*sin(2.*M_PI*y))/2.; }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 2.236067 } stdout { variables = T binary = 1 }
+ EventScript { step = 2.236067 } {
+ number=`echo $GfsTime | awk '{print int($1/2.236067+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
+1 1 right
+1 1 top
diff --git a/test/advection/graphic/tests/translate3/description.txt b/test/advection/graphic/tests/translate3/description.txt
index 7686def..b6df206 100644
--- a/test/advection/graphic/tests/translate3/description.txt
+++ b/test/advection/graphic/tests/translate3/description.txt
@@ -1,2 +1 @@
-command: advection -l 6 -S -v -t -p
caption: Translation of a smooth field (``periodic''), periodic boundary conditions, no limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate3/graphics.gfs b/test/advection/graphic/tests/translate3/graphics.gfs
new file mode 100644
index 0000000..6ee922c
--- /dev/null
+++ b/test/advection/graphic/tests/translate3/graphics.gfs
@@ -0,0 +1,56 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -8.01519
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
diff --git a/test/advection/graphic/tests/translate6/advection.gfs b/test/advection/graphic/tests/translate6/advection.gfs
new file mode 100644
index 0000000..6d7eacd
--- /dev/null
+++ b/test/advection/graphic/tests/translate6/advection.gfs
@@ -0,0 +1,22 @@
+1 2 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 8.94427191 }
+ Refine 6
+ VariableTracer {} T
+ AdvectionParams { cfl = 0.5 }
+ InitFraction {} T ../../star.gts
+ Init {} {
+ U = { double theta = atan (1./2.); return cos (theta); }
+ V = { double theta = atan (1./2.); return sin (theta); }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 2.2360679774998 } stdout { variables = T binary = 1 }
+ EventScript { step = 2.2360679774998 } {
+ number=`echo $GfsTime | awk '{print int($1/2.236067+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
+1 1 right
+1 1 top
diff --git a/test/advection/graphic/tests/translate6/description.txt b/test/advection/graphic/tests/translate6/description.txt
index 3cf33cc..3b48bab 100644
--- a/test/advection/graphic/tests/translate6/description.txt
+++ b/test/advection/graphic/tests/translate6/description.txt
@@ -1,2 +1 @@
-command: shapes star | transform -i -s 0.9 | advection -l 6 -v -t -p
caption: Translation of a sharp field (``star''), periodic boundary conditions, van Leer limiter, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate6/graphics.gfs b/test/advection/graphic/tests/translate6/graphics.gfs
new file mode 100644
index 0000000..1b30709
--- /dev/null
+++ b/test/advection/graphic/tests/translate6/graphics.gfs
@@ -0,0 +1,56 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -11.5778
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
diff --git a/test/advection/graphic/tests/translate7/advection.gfs b/test/advection/graphic/tests/translate7/advection.gfs
new file mode 100644
index 0000000..4650047
--- /dev/null
+++ b/test/advection/graphic/tests/translate7/advection.gfs
@@ -0,0 +1,23 @@
+1 2 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 8.94427191 }
+ Refine 6
+ VariableTracer {} T {
+ scheme = vof
+ }
+ InitFraction {} T ../../star.gts
+ Init {} {
+ U = { double theta = atan (1./2.); return cos (theta); }
+ V = { double theta = atan (1./2.); return sin (theta); }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 2.236067 } stdout { variables = T binary = 1 }
+ EventScript { step = 2.236067 } {
+ number=`echo $GfsTime | awk '{print int($1/2.236067+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
+1 1 right
+1 1 top
diff --git a/test/advection/graphic/tests/translate7/description.txt b/test/advection/graphic/tests/translate7/description.txt
new file mode 100644
index 0000000..f2918f0
--- /dev/null
+++ b/test/advection/graphic/tests/translate7/description.txt
@@ -0,0 +1 @@
+caption: Translation of a sharp field (``star''), periodic boundary conditions, VOF scheme, CFL of 0.5.
diff --git a/test/advection/graphic/tests/translate7/graphics.gfs b/test/advection/graphic/tests/translate7/graphics.gfs
new file mode 100644
index 0000000..1b30709
--- /dev/null
+++ b/test/advection/graphic/tests/translate7/graphics.gfs
@@ -0,0 +1,56 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -11.5778
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
diff --git a/test/advection/graphic/tests/translate_refine1/advection.gfs b/test/advection/graphic/tests/translate_refine1/advection.gfs
new file mode 100644
index 0000000..8e0ed88
--- /dev/null
+++ b/test/advection/graphic/tests/translate_refine1/advection.gfs
@@ -0,0 +1,28 @@
+1 2 GfsAdvection GfsBox GfsGEdge {} {
+ Time { end = 8.94427191 }
+ Refine { return x < 0. ? 7 : 5; }
+ VariableTracer {} T {
+ gradient = gfs_center_gradient
+ }
+ AdvectionParams { cfl = 0.5 }
+ Init {} {
+ U = { double theta = atan (1./2.); return cos (theta); }
+ V = { double theta = atan (1./2.); return sin (theta); }
+ T = {
+ double r2 = x*x + y*y;
+ double coeff = 20. + 20000.*r2*r2*r2*r2;
+ return (1. + cos(20.*x)*cos(20.*y))*exp(-coeff*r2)/2.;
+ }
+ }
+ OutputScalarStats { istep = 1 } log { v = T }
+ OutputScalarSum { istep = 1 } log { v = T }
+ OutputSimulation { step = 2.236067 } stdout { variables = T binary = 1 }
+ EventScript { step = 2.236067 } {
+ number=`echo $GfsTime | awk '{print int($1/2.236067+0.001)}'`
+ echo "Save t-$number.eps { format = EPS width = 400 height = 400 }"
+ }
+ OutputProgress { istep = 1 } stderr
+}
+GfsBox {}
+1 1 right
+1 1 top
diff --git a/test/advection/graphic/tests/translate_refine1/description.txt b/test/advection/graphic/tests/translate_refine1/description.txt
index 4d85d19..0ef58a9 100644
--- a/test/advection/graphic/tests/translate_refine1/description.txt
+++ b/test/advection/graphic/tests/translate_refine1/description.txt
@@ -1,2 +1 @@
-command: advection -l 5 -s -v -t -p -r 2 -n
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.
diff --git a/test/advection/graphic/tests/translate_refine1/graphics.gfs b/test/advection/graphic/tests/translate_refine1/graphics.gfs
new file mode 100644
index 0000000..af4758d
--- /dev/null
+++ b/test/advection/graphic/tests/translate_refine1/graphics.gfs
@@ -0,0 +1,71 @@
+# Gerris Flow Solver 2D version 0.7.0
+1 0 GfsAdvection GfsBox GfsGEdge { variables = T } {
+ GfsTime { i = 0 t = 0 end = 3.14159 }
+ GfsPhysicalParams { rho = 1 sigma = 0 g = 1 }
+ GfsAdvectionParams {
+ cfl = 0.5
+ gradient = gfs_center_gradient
+ flux = gfs_face_velocity_advection_flux
+ scheme = godunov
+}
+ GfsApproxProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsProjectionParams {
+ tolerance = 0.001
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsVariableTracer { istep = 1 } T {
+ cfl = 0.8
+ gradient = gfs_center_van_leer_gradient
+ flux = gfs_face_advection_flux
+ scheme = godunov
+} {
+ tolerance = 1e-06
+ nrelax = 4
+ minlevel = 0
+ nitermax = 100
+}
+ GfsOutputScalarStats { istep = 1 } stderr { v = T }
+ GfsOutputScalarSum { istep = 1 } stderr { v = T }
+ GfsOutputSimulation { step = 0.392699 } stdout { variables = T binary = 1 }
+}
+GfsBox { id = 1 pid = -1 size = 4 } {
+0 -1 0.0240864
+16 -1 0.0240864
+17 -1 0.0240864
+18 -1 0.0240864
+19 -1 0.0240864
+}
+# GfsView 2D
+View {
+ tx = 0 ty = 0
+ q0 = 0 q1 = 0 q2 = 0 q3 = 1
+ zoom = -8.01519
+ r = 1 g = 1 b = 1
+ res = 1
+ lc = 0.001
+ reactivity = 0.1
+}
+Isoline {
+ r = 0 g = 0 b = 0
+ shading = Constant
+ maxlevel = -1
+} {
+ v = T
+ amin = 1
+ amax = 1
+ cmap = Jet
+} {
+ n = 10
+}
+Levels {
+ r = 0 g = 0.0852064 b = 1
+ shading = Constant
+ maxlevel = -1
+}
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list