[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:55:04 UTC 2009
The following commit has been merged in the upstream branch:
commit ebed5a13d126495cc0d9171868119ca6027083ee
Author: Stephane Popinet <popinet at users.sf.net>
Date: Wed Mar 5 12:41:38 2008 +1100
Cosmetics
darcs-hash:20080305014138-d4795-e72fc6c109fa2418196848b0ff47e85b9e14a955.gz
diff --git a/doc/examples/classes.c b/doc/examples/classes.c
index d2219ef..d5fe8bc 100644
--- a/doc/examples/classes.c
+++ b/doc/examples/classes.c
@@ -14,6 +14,8 @@ int main (int argc, char * argv[])
klass = gfs_classes ();
printf ("klass = {\\\n");
key_value_pair ("Define");
+ key_value_pair ("GfsProjectionParams");
+ key_value_pair ("GfsApproxProjectionParams");
while (*klass) {
key_value_pair ((*klass)->info.name);
klass++;
diff --git a/doc/share/darcs.css b/doc/share/darcs.css
index d9b7f2c..a1da05f 100644
--- a/doc/share/darcs.css
+++ b/doc/share/darcs.css
@@ -1,5 +1,6 @@
BODY {
font: x-small sans-serif;
+ font-size: 14px;
background: white;
color: black;
margin: 0;
diff --git a/test/boundaries/boundaries.gfs b/test/boundaries/boundaries.gfs
index abb3bc8..1d68647 100644
--- a/test/boundaries/boundaries.gfs
+++ b/test/boundaries/boundaries.gfs
@@ -39,7 +39,7 @@
Solid (ellipse (0., -0.25, 0.2, 0.1))
Init {} { U = 1 }
OutputSimulation { start = end } sim-LEVEL {
- variables = U,V,P
+ variables = U,V,P
}
}
GfsBox {
diff --git a/test/channel/channel.gfs b/test/channel/channel.gfs
index b0a2968..43517ad 100644
--- a/test/channel/channel.gfs
+++ b/test/channel/channel.gfs
@@ -35,20 +35,20 @@
ApproxProjectionParams { tolerance = 1e-6 }
Refine LEVEL
Global {
- double channel (double x) {
- double y1 = 0.2/4.;
- double y2 = 1e-6/4.;
-
- return x <= -0.25 ? y1 :
- x < 0.25 ? y2 + 0.5*(y1 - y2)*(1. + cos (2.*M_PI*(x + 0.25))) :
- y2;
- }
+ double channel (double x) {
+ double y1 = 0.2/4.;
+ double y2 = 1e-6/4.;
+
+ return x <= -0.25 ? y1 :
+ x < 0.25 ? y2 + 0.5*(y1 - y2)*(1. + cos (2.*M_PI*(x + 0.25))) :
+ y2;
+ }
}
Solid (0.125 - channel (x) - y) { scale = 4 tx = 1.5 }
Solid (y + 0.125 - channel (x)) { scale = 4 tx = 1.5 }
Init {} { U = 1 }
OutputSimulation { start = end } sim-LEVEL {
- variables = U,V,P
+ variables = U,V,P
}
}
GfsBox { left = Boundary { BcDirichlet U 1 } }
diff --git a/test/circle/refined/refined.gfs b/test/circle/refined/refined.gfs
index 1caa783..bf71863 100644
--- a/test/circle/refined/refined.gfs
+++ b/test/circle/refined/refined.gfs
@@ -51,23 +51,23 @@
Refine LEVEL
RefineSolid (LEVEL + 2)
Solid ({
- double dr = 0.1;
- double theta = atan2 (y, x);
- double radius = 0.79*(0.45 - dr + dr*cos (6.*theta));
- return x*x + y*y - radius*radius;
- })
+ double dr = 0.1;
+ double theta = atan2 (y, x);
+ double radius = 0.79*(0.45 - dr + dr*cos (6.*theta));
+ return x*x + y*y - radius*radius;
+ })
ApproxProjectionParams { nrelax = 4 tolerance = 1e-30 }
Init {} {
- Div = {
- int k = 3, l = 3;
- return -M_PI*M_PI*(k*k + l*l)*sin (M_PI*k*x)*sin (M_PI*l*y);
- }
+ Div = {
+ int k = 3, l = 3;
+ return -M_PI*M_PI*(k*k + l*l)*sin (M_PI*k*x)*sin (M_PI*l*y);
+ }
}
OutputTime { istep = 1 } {
- awk '{print n++, $8}' > time
+ awk '{print n++, $8}' > time
}
OutputProjectionStats { istep = 1 } {
- awk '{
+ awk '{
if ($1 == "niter:") printf ("%d ", $2);
if ($1 == "residual.infty:") print $3 " " $4;
}' > proj
diff --git a/test/circle/star/star.gfs b/test/circle/star/star.gfs
index 649bc79..4a21b33 100644
--- a/test/circle/star/star.gfs
+++ b/test/circle/star/star.gfs
@@ -57,23 +57,23 @@
Time { iend = 10 }
Refine LEVEL
Solid ({
- double dr = 0.1;
- double theta = atan2 (y, x);
- double radius = 0.79*(0.45 - dr + dr*cos (6.*theta));
- return x*x + y*y - radius*radius;
- })
+ double dr = 0.1;
+ double theta = atan2 (y, x);
+ double radius = 0.79*(0.45 - dr + dr*cos (6.*theta));
+ return x*x + y*y - radius*radius;
+ })
ApproxProjectionParams { nrelax = 4 tolerance = 1e-30 erelax = 2 }
Init {} {
- Div = {
- int k = 3, l = 3;
- return -M_PI*M_PI*(k*k + l*l)*sin (M_PI*k*x)*sin (M_PI*l*y);
- }
+ Div = {
+ int k = 3, l = 3;
+ return -M_PI*M_PI*(k*k + l*l)*sin (M_PI*k*x)*sin (M_PI*l*y);
+ }
}
OutputTime { istep = 1 } {
- awk '{print n++, $8}' > time
+ awk '{print n++, $8}' > time
}
OutputProjectionStats { istep = 1 } {
- awk '{
+ awk '{
if ($1 == "niter:") printf ("%d ", $2);
if ($1 == "residual.infty:") print $3 " " $4;
}' > proj
diff --git a/test/hydrostatic/quadratic/quadratic.gfs b/test/hydrostatic/quadratic/quadratic.gfs
index 782b59a..bd13a58 100644
--- a/test/hydrostatic/quadratic/quadratic.gfs
+++ b/test/hydrostatic/quadratic/quadratic.gfs
@@ -29,15 +29,15 @@
OutputScalarNorm { istep = 1 } v { v = V }
# Checks that the pressure profile is close to the exact solution
OutputErrorNorm { istep = 1 } p { v = P } {
- s = (cy*cy/2. + 0.5*cy)
- unbiased = 1
+ s = (cy*cy/2. + 0.5*cy)
+ unbiased = 1
}
EventScript { start = end } {
if awk '{if ($9 > 1e-12) exit (1);}' < v ; then :
else
return $GFS_STOP;
fi
- if awk '{if ($9 > 1e-12) exit (1);}' < p ; then :
+ if awk '{if ($9 > 1e-12) exit (1);}' < p ; then :
else
return $GFS_STOP;
fi
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list