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

Stephane Popinet popinet at users.sf.net
Tue Nov 24 12:25:19 UTC 2009


The following commit has been merged in the upstream branch:
commit bc9254b8f4aa0318335b4e90a1984040776fbab9
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sat Oct 24 19:09:27 2009 +1100

    Updated test cases
    
    darcs-hash:20091024080927-d4795-513ace037a6fc57d7f6517fea6eba9f4abcdff82.gz

diff --git a/test/axiadvection/solid/axi.sh b/test/axiadvection/solid/axi.sh
index dc2f101..b634e9c 100644
--- a/test/axiadvection/solid/axi.sh
+++ b/test/axiadvection/solid/axi.sh
@@ -10,7 +10,7 @@ BEGIN { min = 1000.; max = -1000.; }{
 END {
   e = 2.*(max - min)/(max + min);
   print "VOF:", e;
-  if (e > 2e-2)
+  if (e > 2.5e-2)
     exit (1);
 }' < srt; then :
 else
diff --git a/test/lonlat/lonlat.gfs b/test/lonlat/lonlat.gfs
index 6ca9f85..06d83ce 100644
--- a/test/lonlat/lonlat.gfs
+++ b/test/lonlat/lonlat.gfs
@@ -61,16 +61,19 @@ Define LENGTH (150./180.*M_PI)
     OutputSimulation { step = 0.3 } sim-%g.txt { variables = U,V,P format = text }
 #    OutputSimulation { istep = 10 } stdout
     EventScript { start = end } {
+	status=0
 	for i in 0.3 0.6 0.9; do
 	    if awk 'BEGIN { n1 = 0; pi = 3.14159265359 }{
-              c = cos($1*pi/180.)*cos($2*pi/180.);
-              d = atan2(sqrt(1. - c*c),c)*180./pi
-              i = int(d*2.)
-              x[i] += d
-              y[i] += $6
-              n[i]++
-              x1[n1] = d;
-              y1[n1++] = $6;
+              if ($1 != "#") {
+                c = cos($1*pi/180.)*cos($2*pi/180.);
+                d = atan2(sqrt(1. - c*c),c)*180./pi
+                i = int(d*2.)
+                x[i] += d
+                y[i] += $6
+                n[i]++
+                x1[n1] = d;
+                y1[n1++] = $6;
+              }
             }END {
               for (i = 0; i <= 180; i++)
                 if (n[i] > 0)
@@ -88,7 +91,7 @@ Define LENGTH (150./180.*M_PI)
               }
             }' < sim-$i.txt > prof-$i.txt ; then :
 	    else
-		exit $GFS_STOP;
+		status=$GFS_STOP;
 	    fi
 
 	    cat <<EOF | gnuplot
@@ -106,6 +109,7 @@ EOF
 	    echo "Save stdout { format = EPS line_width = 0.5 }" | \
 		gfsview-batch2D sim-$i.gfs isolines.gfv > isolines-$i.eps
 	done
+	exit $status
     }
 }
 GfsBox {

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list