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

Stephane Popinet popinet at users.sf.net
Fri May 15 02:53:52 UTC 2009


The following commit has been merged in the upstream branch:
commit 67735c73a8992de4308b46eeabcc672215d7a3d6
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Jan 19 07:32:43 2007 +1100

    Updated capillary wave test cases
    
    darcs-hash:20070118203243-d4795-4de7ae67ff77dbcc9133eb28dbe9898764124078.gz

diff --git a/test/capwave/capwave.gfs b/test/capwave/capwave.gfs
index c07cb73..c844d25 100644
--- a/test/capwave/capwave.gfs
+++ b/test/capwave/capwave.gfs
@@ -20,7 +20,7 @@
 # \begin{center}
 # \begin{tabular}{|l|ccccc|} \hline
 # Method & $8^2$ & $16^2$ & $32^2$ & $64^2$ & $128^2$ \\ \hline
-# \input{convergence.tex} & 0.00596749 \\
+# \input{convergence.tex} & 0.00598128 \\
 # Markers & 0.3018 & 0.0778 & 0.0131 & 0.0082 & 0.00645 \\
 # Surfer & - & - & 0.1168 & 0.0132 & 0.007 \\ \hline
 # \end{tabular}
@@ -49,31 +49,14 @@
   VariableTracer {} T { scheme = vof }
   VariableCurvature {} K T
   SourceTension {} T 1 K
+  VariablePosition {} Y T y
   AdvectionParams { scheme = none }
   SourceDiffusion {} U 0.0182571749236
   SourceDiffusion {} V 0.0182571749236
   InitFraction {} T wave.gts
-  OutputSimulation { step = 3.04290519077e-3 } sim-%ld.gfs { binary = 1 }
-  EventScript { step = 3.04290519077e-3 } {
-    echo $GfsTime | awk -v level=LEVEL '{printf ("%g ", $1*11.1366559937) >> ("wave-" level) }'
-    gfs2oogl2D -g -c T < sim-$GfsIter.gfs | sort -n +1 -2 | awk -v level=LEVEL 'BEGIN {
-      n = exp (level*log (2.));
-      x = 1./(n + 1.);
-      c1 = c2 = 0.;
-    }
-    {
-      if ($1 > 0. && $1 < x) {
-        if (c1 + c2 < 1. && c2 + $4 > 1.) {
-          print y2+(0.5-c2)/n >> ("wave-" level);
-          exit 0;
-        }
-        c1 = c2;
-        c2 = $4;
-        y2 = $2;
-      }
-    }'
-    rm -f sim-$GfsIter.gfs
-  }
+  OutputScalarNorm { step = 3.04290519077e-3 } {
+      awk '{printf ("%g %g\n", $3*11.1366559937, $9); fflush(stdout); }' > wave-LEVEL
+  } { v = (T > 0. && T < 1. ? Y : 0.) }
 }
 GfsBox {}
 1 1 right
diff --git a/test/capwave/capwave.sh b/test/capwave/capwave.sh
index 0a14e9c..da6628e 100755
--- a/test/capwave/capwave.sh
+++ b/test/capwave/capwave.sh
@@ -15,7 +15,6 @@ if ! $donotrun; then
     fi
 
     for level in $levels; do
-	rm -f wave-$level
 	if sed "s/LEVEL/$level/g" < $1 | gerris2D -; then
 	    :
 	else
@@ -29,11 +28,6 @@ for level in $levels; do
     if awk -v level=$level 'BEGIN {s = 0.; n = 0; } {
           t = $1; y = $2;
           getline < "prosperetti"
-          dt = abs ($1 - t);
-          if (dt > 1e-5) {
-            print "Level " level ": times do not match " $1 " " t " " dt
-            exit 1
-          }
           s += (y - $2)*(y - $2);
           n += 1;
         }
diff --git a/test/capwave/convergence.ref b/test/capwave/convergence.ref
index 06d6a47..1541175 100644
--- a/test/capwave/convergence.ref
+++ b/test/capwave/convergence.ref
@@ -1,4 +1,4 @@
-3 0.0974121
-4 0.0298165
-5 0.0153267
-6 0.00810096
+3 0.146932
+4 0.023849
+5 0.0125015
+6 0.00740295
diff --git a/test/capwave/density/convergence.ref b/test/capwave/density/convergence.ref
index 9da62f3..bd6a6aa 100644
--- a/test/capwave/density/convergence.ref
+++ b/test/capwave/density/convergence.ref
@@ -1,4 +1,4 @@
-3 0.140388
-4 0.0239338
-5 0.0161247
-6 0.00721498
+3 0.1407
+4 0.0391388
+5 0.0109846
+6 0.00588064
diff --git a/test/capwave/density/density.gfs b/test/capwave/density/density.gfs
index a33fd39..74a7210 100644
--- a/test/capwave/density/density.gfs
+++ b/test/capwave/density/density.gfs
@@ -16,7 +16,7 @@
 # \begin{center}
 # \begin{tabular}{|l|ccccc|} \hline
 # Method & $8^2$ & $16^2$ & $32^2$ & $64^2$ & $128^2$ \\ \hline
-# \input{convergence.tex} & 0.00498124 \\
+# \input{convergence.tex} & 0.00447631 \\
 # Markers & 0.3593 & 0.1397 & 0.0566 & 0.0264 & 0.0148 \\
 # Surfer & - & - & 0.1233 & 0.0300 & 0.0254 \\ \hline
 # \end{tabular}
@@ -49,32 +49,15 @@
   VariableTracer {} T { scheme = vof }
   VariableCurvature {} K T
   SourceTension {} T 1 K
+  VariablePosition {} Y T y
   AdvectionParams { scheme = none }
   SourceDiffusion {} U 0.0182571749236
   SourceDiffusion {} V 0.0182571749236
   PhysicalParams { alpha = 1./(T + 0.1*(1. - T)) }
   InitFraction {} T wave.gts
-  OutputSimulation { step = .00225584983639310905 } sim-%ld.gfs { binary = 1 }
-  EventScript { step = .00225584983639310905 } {
-    echo $GfsTime | awk -v level=LEVEL '{printf ("%.5g ", $1*15.016663878457) >> ("wave-" level) }'
-    gfs2oogl2D -g -c T < sim-$GfsIter.gfs | sort -n +1 -2 | awk -v level=LEVEL 'BEGIN {
-      n = exp (level*log (2.));
-      x = 1./(n + 1.);
-      c1 = c2 = 0.;
-    }
-    {
-      if ($1 > 0. && $1 < x) {
-        if (c1 + c2 < 1. && c2 + $4 > 1.) {
-          print y2+(0.5-c2)/n >> ("wave-" level);
-          exit 0;
-        }
-        c1 = c2;
-        c2 = $4;
-        y2 = $2;
-      }
-    }'
-    rm -f sim-$GfsIter.gfs
-  }
+  OutputScalarNorm { step = .00225584983639310905 } {
+      awk '{printf ("%g %g\n", $3*15.016663878457, $9); fflush(stdout); }' > wave-LEVEL
+  } { v = (T > 0. && T < 1. ? Y : 0.) }
 }
 GfsBox {}
 1 1 right
diff --git a/test/capwave/density/prosperetti b/test/capwave/density/prosperetti
index 5ec17f4..91d37ac 100644
--- a/test/capwave/density/prosperetti
+++ b/test/capwave/density/prosperetti
@@ -51,106 +51,106 @@
 1.6938 0.000648269
 1.7276 0.000381966
 1.7615 0.000117299
-1.7954 -0.000145477
-1.8293 -0.00040611
-1.8631 -0.000664353
-1.897 -0.000919961
-1.9309 -0.0011727
-1.9648 -0.00142233
-1.9986 -0.00166862
-2.0325 -0.00191136
-2.0664 -0.00215032
-2.1003 -0.0023853
-2.1341 -0.00261608
-2.168 -0.00284246
-2.2019 -0.00306426
-2.2358 -0.00328128
-2.2696 -0.00349334
-2.3035 -0.00370027
-2.3374 -0.00390189
-2.3713 -0.00409805
-2.4051 -0.00428859
-2.439 -0.00447337
-2.4729 -0.00465223
-2.5068 -0.00482505
-2.5407 -0.0049917
-2.5745 -0.00515207
-2.6084 -0.00530603
-2.6423 -0.00545348
-2.6762 -0.00559434
-2.71 -0.0057285
-2.7439 -0.00585588
-2.7778 -0.00597641
-2.8117 -0.00609003
-2.8455 -0.00619667
-2.8794 -0.00629628
-2.9133 -0.00638881
-2.9472 -0.00647424
-2.981 -0.00655252
-3.0149 -0.00662364
-3.0488 -0.00668758
-3.0827 -0.00674433
-3.1165 -0.0067939
-3.1504 -0.00683628
-3.1843 -0.00687151
-3.2182 -0.00689958
-3.252 -0.00692055
-3.2859 -0.00693443
-3.3198 -0.00694128
-3.3537 -0.00694114
-3.3875 -0.00693406
-3.4214 -0.00692012
-3.4553 -0.00689937
-3.4892 -0.00687189
-3.523 -0.00683777
-3.5569 -0.00679709
-3.5908 -0.00674995
-3.6247 -0.00669644
-3.6585 -0.00663666
-3.6924 -0.00657074
-3.7263 -0.00649877
-3.7602 -0.00642089
-3.794 -0.00633722
-3.8279 -0.00624789
-3.8618 -0.00615304
-3.8957 -0.00605279
-3.9295 -0.00594731
-3.9634 -0.00583673
-3.9973 -0.00572121
-4.0312 -0.0056009
-4.065 -0.00547597
-4.0989 -0.00534657
-4.1328 -0.00521287
-4.1667 -0.00507504
-4.2005 -0.00493325
-4.2344 -0.00478768
-4.2683 -0.00463849
-4.3022 -0.00448588
-4.336 -0.00433003
-4.3699 -0.0041711
-4.4038 -0.0040093
-4.4377 -0.0038448
-4.4715 -0.00367779
-4.5054 -0.00350847
-4.5393 -0.00333701
-4.5732 -0.00316361
-4.607 -0.00298846
-4.6409 -0.00281174
-4.6748 -0.00263366
-4.7087 -0.00245439
-4.7425 -0.00227413
-4.7764 -0.00209307
-4.8103 -0.0019114
-4.8442 -0.0017293
-4.878 -0.00154695
-4.9119 -0.00136456
-4.9458 -0.00118229
-4.9797 -0.00100034
-5.0136 -0.000818878
-5.0474 -0.000638086
-5.0813 -0.000458142
-5.1152 -0.000279219
-5.1491 -0.000101489
+1.7954 0.000145477
+1.8293 0.00040611
+1.8631 0.000664353
+1.897 0.000919961
+1.9309 0.0011727
+1.9648 0.00142233
+1.9986 0.00166862
+2.0325 0.00191136
+2.0664 0.00215032
+2.1003 0.0023853
+2.1341 0.00261608
+2.168 0.00284246
+2.2019 0.00306426
+2.2358 0.00328128
+2.2696 0.00349334
+2.3035 0.00370027
+2.3374 0.00390189
+2.3713 0.00409805
+2.4051 0.00428859
+2.439 0.00447337
+2.4729 0.00465223
+2.5068 0.00482505
+2.5407 0.0049917
+2.5745 0.00515207
+2.6084 0.00530603
+2.6423 0.00545348
+2.6762 0.00559434
+2.71 0.0057285
+2.7439 0.00585588
+2.7778 0.00597641
+2.8117 0.00609003
+2.8455 0.00619667
+2.8794 0.00629628
+2.9133 0.00638881
+2.9472 0.00647424
+2.981 0.00655252
+3.0149 0.00662364
+3.0488 0.00668758
+3.0827 0.00674433
+3.1165 0.0067939
+3.1504 0.00683628
+3.1843 0.00687151
+3.2182 0.00689958
+3.252 0.00692055
+3.2859 0.00693443
+3.3198 0.00694128
+3.3537 0.00694114
+3.3875 0.00693406
+3.4214 0.00692012
+3.4553 0.00689937
+3.4892 0.00687189
+3.523 0.00683777
+3.5569 0.00679709
+3.5908 0.00674995
+3.6247 0.00669644
+3.6585 0.00663666
+3.6924 0.00657074
+3.7263 0.00649877
+3.7602 0.00642089
+3.794 0.00633722
+3.8279 0.00624789
+3.8618 0.00615304
+3.8957 0.00605279
+3.9295 0.00594731
+3.9634 0.00583673
+3.9973 0.00572121
+4.0312 0.0056009
+4.065 0.00547597
+4.0989 0.00534657
+4.1328 0.00521287
+4.1667 0.00507504
+4.2005 0.00493325
+4.2344 0.00478768
+4.2683 0.00463849
+4.3022 0.00448588
+4.336 0.00433003
+4.3699 0.0041711
+4.4038 0.0040093
+4.4377 0.0038448
+4.4715 0.00367779
+4.5054 0.00350847
+4.5393 0.00333701
+4.5732 0.00316361
+4.607 0.00298846
+4.6409 0.00281174
+4.6748 0.00263366
+4.7087 0.00245439
+4.7425 0.00227413
+4.7764 0.00209307
+4.8103 0.0019114
+4.8442 0.0017293
+4.878 0.00154695
+4.9119 0.00136456
+4.9458 0.00118229
+4.9797 0.00100034
+5.0136 0.000818878
+5.0474 0.000638086
+5.0813 0.000458142
+5.1152 0.000279219
+5.1491 0.000101489
 5.1829 7.48791e-05
 5.2168 0.000249719
 5.2507 0.000422866
@@ -250,106 +250,106 @@
 8.435 0.000336932
 8.4688 0.000217136
 8.5027 9.80675e-05
-8.5366 -2.01585e-05
-8.5705 -0.00013743
-8.6043 -0.000253636
-8.6382 -0.000368668
-8.6721 -0.00048242
-8.706 -0.000594787
-8.7398 -0.000705667
-8.7737 -0.00081496
-8.8076 -0.00092257
-8.8415 -0.0010284
-8.8753 -0.00113236
-8.9092 -0.00123435
-8.9431 -0.0013343
-8.977 -0.00143212
-9.0108 -0.00152772
-9.0447 -0.00162103
-9.0786 -0.00171197
-9.1125 -0.00180047
-9.1463 -0.00188646
-9.1802 -0.00196987
-9.2141 -0.00205064
-9.248 -0.00212871
-9.2818 -0.00220403
-9.3157 -0.00227653
-9.3496 -0.00234617
-9.3835 -0.0024129
-9.4173 -0.00247668
-9.4512 -0.00253746
-9.4851 -0.00259521
-9.519 -0.0026499
-9.5528 -0.00270149
-9.5867 -0.00274996
-9.6206 -0.00279529
-9.6545 -0.00283744
-9.6883 -0.00287642
-9.7222 -0.00291219
-9.7561 -0.00294476
-9.79 -0.00297411
-9.8238 -0.00300025
-9.8577 -0.00302316
-9.8916 -0.00304286
-9.9255 -0.00305935
-9.9593 -0.00307264
-9.9932 -0.00308274
-10.027 -0.00308966
-10.061 -0.00309343
-10.095 -0.00309406
-10.129 -0.00309159
-10.163 -0.00308604
-10.196 -0.00307743
-10.23 -0.0030658
-10.264 -0.0030512
-10.298 -0.00303365
-10.332 -0.00301319
-10.366 -0.00298988
-10.4 -0.00296376
-10.434 -0.00293487
-10.467 -0.00290327
-10.501 -0.00286901
-10.535 -0.00283216
-10.569 -0.00279275
-10.603 -0.00275086
-10.637 -0.00270655
-10.671 -0.00265988
-10.705 -0.00261092
-10.738 -0.00255974
-10.772 -0.0025064
-10.806 -0.00245097
-10.84 -0.00239353
-10.874 -0.00233416
-10.908 -0.00227292
-10.942 -0.0022099
-10.976 -0.00214517
-11.009 -0.00207881
-11.043 -0.0020109
-11.077 -0.00194153
-11.111 -0.00187077
-11.145 -0.0017987
-11.179 -0.00172541
-11.213 -0.00165098
-11.247 -0.0015755
-11.28 -0.00149906
-11.314 -0.00142172
-11.348 -0.00134359
-11.382 -0.00126475
-11.416 -0.00118527
-11.45 -0.00110525
-11.484 -0.00102477
-11.518 -0.000943919
-11.551 -0.000862776
-11.585 -0.000781427
-11.619 -0.000699955
-11.653 -0.000618444
-11.687 -0.000536976
-11.721 -0.000455633
-11.755 -0.000374495
-11.789 -0.000293643
-11.822 -0.000213156
-11.856 -0.000133111
-11.89 -5.35859e-05
+8.5366 2.01585e-05
+8.5705 0.00013743
+8.6043 0.000253636
+8.6382 0.000368668
+8.6721 0.00048242
+8.706 0.000594787
+8.7398 0.000705667
+8.7737 0.00081496
+8.8076 0.00092257
+8.8415 0.0010284
+8.8753 0.00113236
+8.9092 0.00123435
+8.9431 0.0013343
+8.977 0.00143212
+9.0108 0.00152772
+9.0447 0.00162103
+9.0786 0.00171197
+9.1125 0.00180047
+9.1463 0.00188646
+9.1802 0.00196987
+9.2141 0.00205064
+9.248 0.00212871
+9.2818 0.00220403
+9.3157 0.00227653
+9.3496 0.00234617
+9.3835 0.0024129
+9.4173 0.00247668
+9.4512 0.00253746
+9.4851 0.00259521
+9.519 0.0026499
+9.5528 0.00270149
+9.5867 0.00274996
+9.6206 0.00279529
+9.6545 0.00283744
+9.6883 0.00287642
+9.7222 0.00291219
+9.7561 0.00294476
+9.79 0.00297411
+9.8238 0.00300025
+9.8577 0.00302316
+9.8916 0.00304286
+9.9255 0.00305935
+9.9593 0.00307264
+9.9932 0.00308274
+10.027 0.00308966
+10.061 0.00309343
+10.095 0.00309406
+10.129 0.00309159
+10.163 0.00308604
+10.196 0.00307743
+10.23 0.0030658
+10.264 0.0030512
+10.298 0.00303365
+10.332 0.00301319
+10.366 0.00298988
+10.4 0.00296376
+10.434 0.00293487
+10.467 0.00290327
+10.501 0.00286901
+10.535 0.00283216
+10.569 0.00279275
+10.603 0.00275086
+10.637 0.00270655
+10.671 0.00265988
+10.705 0.00261092
+10.738 0.00255974
+10.772 0.0025064
+10.806 0.00245097
+10.84 0.00239353
+10.874 0.00233416
+10.908 0.00227292
+10.942 0.0022099
+10.976 0.00214517
+11.009 0.00207881
+11.043 0.0020109
+11.077 0.00194153
+11.111 0.00187077
+11.145 0.0017987
+11.179 0.00172541
+11.213 0.00165098
+11.247 0.0015755
+11.28 0.00149906
+11.314 0.00142172
+11.348 0.00134359
+11.382 0.00126475
+11.416 0.00118527
+11.45 0.00110525
+11.484 0.00102477
+11.518 0.000943919
+11.551 0.000862776
+11.585 0.000781427
+11.619 0.000699955
+11.653 0.000618444
+11.687 0.000536976
+11.721 0.000455633
+11.755 0.000374495
+11.789 0.000293643
+11.822 0.000213156
+11.856 0.000133111
+11.89 5.35859e-05
 11.924 2.53436e-05
 11.958 0.000103602
 11.992 0.000181118
@@ -450,105 +450,105 @@
 15.21 0.000107427
 15.244 5.40904e-05
 15.278 1.12259e-06
-15.312 -5.14263e-05
-15.346 -0.000103507
-15.379 -0.00015507
-15.413 -0.000206068
-15.447 -0.000256454
-15.481 -0.000306182
-15.515 -0.000355208
-15.549 -0.000403487
-15.583 -0.000450977
-15.617 -0.000497637
-15.65 -0.000543426
-15.684 -0.000588304
-15.718 -0.000632235
-15.752 -0.000675182
-15.786 -0.000717108
-15.82 -0.00075798
-15.854 -0.000797765
-15.888 -0.000836433
-15.921 -0.000873952
-15.955 -0.000910295
-15.989 -0.000945433
-16.023 -0.000979343
-16.057 -0.001012
-16.091 -0.00104338
-16.125 -0.00107346
-16.159 -0.00110222
-16.192 -0.00112965
-16.226 -0.00115572
-16.26 -0.00118042
-16.294 -0.00120375
-16.328 -0.00122567
-16.362 -0.00124619
-16.396 -0.0012653
-16.43 -0.00128298
-16.463 -0.00129924
-16.497 -0.00131405
-16.531 -0.00132744
-16.565 -0.00133938
-16.599 -0.00134988
-16.633 -0.00135894
-16.667 -0.00136657
-16.701 -0.00137276
-16.734 -0.00137752
-16.768 -0.00138087
-16.802 -0.0013828
-16.836 -0.00138333
-16.87 -0.00138246
-16.904 -0.00138021
-16.938 -0.0013766
-16.972 -0.00137164
-17.005 -0.00136533
-17.039 -0.00135771
-17.073 -0.00134878
-17.107 -0.00133858
-17.141 -0.00132711
-17.175 -0.0013144
-17.209 -0.00130048
-17.243 -0.00128536
-17.276 -0.00126907
-17.31 -0.00125164
-17.344 -0.0012331
-17.378 -0.00121347
-17.412 -0.00119277
-17.446 -0.00117105
-17.48 -0.00114833
-17.514 -0.00112463
-17.547 -0.0011
-17.581 -0.00107446
-17.615 -0.00104806
-17.649 -0.00102081
-17.683 -0.000992757
-17.717 -0.000963935
-17.751 -0.000934379
-17.785 -0.000904123
-17.818 -0.000873205
-17.852 -0.00084166
-17.886 -0.000809526
-17.92 -0.000776839
-17.954 -0.000743637
-17.988 -0.000709957
-18.022 -0.000675838
-18.056 -0.000641316
-18.089 -0.000606431
-18.123 -0.000571219
-18.157 -0.00053572
-18.191 -0.000499971
-18.225 -0.00046401
-18.259 -0.000427876
-18.293 -0.000391605
-18.327 -0.000355236
-18.36 -0.000318806
-18.394 -0.000282352
-18.428 -0.00024591
-18.462 -0.000209519
-18.496 -0.000173214
-18.53 -0.00013703
-18.564 -0.000101003
-18.598 -6.51686e-05
-18.631 -2.95609e-05
+15.312 5.14263e-05
+15.346 0.000103507
+15.379 0.00015507
+15.413 0.000206068
+15.447 0.000256454
+15.481 0.000306182
+15.515 0.000355208
+15.549 0.000403487
+15.583 0.000450977
+15.617 0.000497637
+15.65 0.000543426
+15.684 0.000588304
+15.718 0.000632235
+15.752 0.000675182
+15.786 0.000717108
+15.82 0.00075798
+15.854 0.000797765
+15.888 0.000836433
+15.921 0.000873952
+15.955 0.000910295
+15.989 0.000945433
+16.023 0.000979343
+16.057 0.001012
+16.091 0.00104338
+16.125 0.00107346
+16.159 0.00110222
+16.192 0.00112965
+16.226 0.00115572
+16.26 0.00118042
+16.294 0.00120375
+16.328 0.00122567
+16.362 0.00124619
+16.396 0.0012653
+16.43 0.00128298
+16.463 0.00129924
+16.497 0.00131405
+16.531 0.00132744
+16.565 0.00133938
+16.599 0.00134988
+16.633 0.00135894
+16.667 0.00136657
+16.701 0.00137276
+16.734 0.00137752
+16.768 0.00138087
+16.802 0.0013828
+16.836 0.00138333
+16.87 0.00138246
+16.904 0.00138021
+16.938 0.0013766
+16.972 0.00137164
+17.005 0.00136533
+17.039 0.00135771
+17.073 0.00134878
+17.107 0.00133858
+17.141 0.00132711
+17.175 0.0013144
+17.209 0.00130048
+17.243 0.00128536
+17.276 0.00126907
+17.31 0.00125164
+17.344 0.0012331
+17.378 0.00121347
+17.412 0.00119277
+17.446 0.00117105
+17.48 0.00114833
+17.514 0.00112463
+17.547 0.0011
+17.581 0.00107446
+17.615 0.00104806
+17.649 0.00102081
+17.683 0.000992757
+17.717 0.000963935
+17.751 0.000934379
+17.785 0.000904123
+17.818 0.000873205
+17.852 0.00084166
+17.886 0.000809526
+17.92 0.000776839
+17.954 0.000743637
+17.988 0.000709957
+18.022 0.000675838
+18.056 0.000641316
+18.089 0.000606431
+18.123 0.000571219
+18.157 0.00053572
+18.191 0.000499971
+18.225 0.00046401
+18.259 0.000427876
+18.293 0.000391605
+18.327 0.000355236
+18.36 0.000318806
+18.394 0.000282352
+18.428 0.00024591
+18.462 0.000209519
+18.496 0.000173214
+18.53 0.00013703
+18.564 0.000101003
+18.598 6.51686e-05
+18.631 2.95609e-05
 18.665 5.78599e-06
 18.699 4.08387e-05
 18.733 7.55641e-05
@@ -649,91 +649,91 @@
 21.951 5.2017e-05
 21.985 2.81319e-05
 22.019 4.40794e-06
-22.053 -1.91323e-05
-22.087 -4.24667e-05
-22.121 -6.55733e-05
-22.154 -8.84306e-05
-22.188 -0.000111018
-22.222 -0.000133314
-22.256 -0.000155299
-22.29 -0.000176953
-22.324 -0.000198258
-22.358 -0.000219194
-22.392 -0.000239744
-22.425 -0.000259889
-22.459 -0.000279614
-22.493 -0.0002989
-22.527 -0.000317733
-22.561 -0.000336096
-22.595 -0.000353976
-22.629 -0.000371359
-22.663 -0.000388229
-22.696 -0.000404576
-22.73 -0.000420386
-22.764 -0.000435647
-22.798 -0.00045035
-22.832 -0.000464483
-22.866 -0.000478038
-22.9 -0.000491004
-22.934 -0.000503373
-22.967 -0.000515139
-23.001 -0.000526293
-23.035 -0.00053683
-23.069 -0.000546744
-23.103 -0.000556029
-23.137 -0.000564683
-23.171 -0.0005727
-23.205 -0.000580078
-23.238 -0.000586815
-23.272 -0.000592909
-23.306 -0.000598359
-23.34 -0.000603165
-23.374 -0.000607327
-23.408 -0.000610846
-23.442 -0.000613724
-23.476 -0.000615963
-23.509 -0.000617565
-23.543 -0.000618535
-23.577 -0.000618876
-23.611 -0.000618594
-23.645 -0.000617693
-23.679 -0.000616179
-23.713 -0.000614059
-23.747 -0.00061134
-23.78 -0.000608029
-23.814 -0.000604134
-23.848 -0.000599665
-23.882 -0.000594629
-23.916 -0.000589038
-23.95 -0.0005829
-23.984 -0.000576227
-24.018 -0.000569029
-24.051 -0.000561318
-24.085 -0.000553105
-24.119 -0.000544404
-24.153 -0.000535227
-24.187 -0.000525587
-24.221 -0.000515496
-24.255 -0.00050497
-24.289 -0.000494022
-24.322 -0.000482667
-24.356 -0.000470919
-24.39 -0.000458793
-24.424 -0.000446305
-24.458 -0.00043347
-24.492 -0.000420303
-24.526 -0.000406822
-24.56 -0.000393041
-24.593 -0.000378977
-24.627 -0.000364646
-24.661 -0.000350066
-24.695 -0.000335252
-24.729 -0.000320222
-24.763 -0.000304992
-24.797 -0.00028958
-24.831 -0.000274002
-24.864 -0.000258275
-24.898 -0.000242417
-24.932 -0.000226444
-24.966 -0.000210374
-25 -0.000194223
+22.053 1.91323e-05
+22.087 4.24667e-05
+22.121 6.55733e-05
+22.154 8.84306e-05
+22.188 0.000111018
+22.222 0.000133314
+22.256 0.000155299
+22.29 0.000176953
+22.324 0.000198258
+22.358 0.000219194
+22.392 0.000239744
+22.425 0.000259889
+22.459 0.000279614
+22.493 0.0002989
+22.527 0.000317733
+22.561 0.000336096
+22.595 0.000353976
+22.629 0.000371359
+22.663 0.000388229
+22.696 0.000404576
+22.73 0.000420386
+22.764 0.000435647
+22.798 0.00045035
+22.832 0.000464483
+22.866 0.000478038
+22.9 0.000491004
+22.934 0.000503373
+22.967 0.000515139
+23.001 0.000526293
+23.035 0.00053683
+23.069 0.000546744
+23.103 0.000556029
+23.137 0.000564683
+23.171 0.0005727
+23.205 0.000580078
+23.238 0.000586815
+23.272 0.000592909
+23.306 0.000598359
+23.34 0.000603165
+23.374 0.000607327
+23.408 0.000610846
+23.442 0.000613724
+23.476 0.000615963
+23.509 0.000617565
+23.543 0.000618535
+23.577 0.000618876
+23.611 0.000618594
+23.645 0.000617693
+23.679 0.000616179
+23.713 0.000614059
+23.747 0.00061134
+23.78 0.000608029
+23.814 0.000604134
+23.848 0.000599665
+23.882 0.000594629
+23.916 0.000589038
+23.95 0.0005829
+23.984 0.000576227
+24.018 0.000569029
+24.051 0.000561318
+24.085 0.000553105
+24.119 0.000544404
+24.153 0.000535227
+24.187 0.000525587
+24.221 0.000515496
+24.255 0.00050497
+24.289 0.000494022
+24.322 0.000482667
+24.356 0.000470919
+24.39 0.000458793
+24.424 0.000446305
+24.458 0.00043347
+24.492 0.000420303
+24.526 0.000406822
+24.56 0.000393041
+24.593 0.000378977
+24.627 0.000364646
+24.661 0.000350066
+24.695 0.000335252
+24.729 0.000320222
+24.763 0.000304992
+24.797 0.00028958
+24.831 0.000274002
+24.864 0.000258275
+24.898 0.000242417
+24.932 0.000226444
+24.966 0.000210374
+25 0.000194223
diff --git a/test/capwave/prosperetti b/test/capwave/prosperetti
index fec7406..f03b8a1 100644
--- a/test/capwave/prosperetti
+++ b/test/capwave/prosperetti
@@ -51,109 +51,109 @@
 1.69439 0.000729205
 1.72828 0.000461218
 1.76216 0.000194543
-1.79605 -7.05725e-05
-1.82994 -0.000333881
-1.86383 -0.00059514
-1.89771 -0.000854105
-1.9316 -0.00111055
-1.96549 -0.00136424
-1.99938 -0.00161495
-2.03327 -0.00186245
-2.06715 -0.00210654
-2.10104 -0.00234698
-2.13493 -0.0025836
-2.16882 -0.00281616
-2.2027 -0.00304448
-2.23659 -0.00326838
-2.27048 -0.00348767
-2.30437 -0.00370215
-2.33825 -0.00391166
-2.37214 -0.00411604
-2.40603 -0.00431513
-2.43992 -0.00450876
-2.47381 -0.00469679
-2.50769 -0.00487908
-2.54158 -0.0050555
-2.57547 -0.0052259
-2.60936 -0.00539015
-2.64324 -0.00554815
-2.67713 -0.00569985
-2.71102 -0.00584505
-2.74491 -0.0059837
-2.7788 -0.00611575
-2.81268 -0.00624105
-2.84657 -0.00635955
-2.88046 -0.0064712
-2.91435 -0.00657595
-2.94823 -0.0066737
-2.98212 -0.00676445
-3.01601 -0.00684815
-3.0499 -0.00692475
-3.08379 -0.00699425
-3.11767 -0.0070566
-3.15156 -0.00711185
-3.18545 -0.00715995
-3.21934 -0.0072009
-3.25322 -0.00723475
-3.28711 -0.0072615
-3.321 -0.00728115
-3.35489 -0.00729375
-3.38877 -0.0072993
-3.42266 -0.0072979
-3.45655 -0.0072896
-3.49044 -0.00727445
-3.52433 -0.00725245
-3.55821 -0.00722375
-3.5921 -0.00718835
-3.62599 -0.0071464
-3.65988 -0.007098
-3.69376 -0.00704315
-3.72765 -0.006982
-3.76154 -0.00691465
-3.79543 -0.00684125
-3.82932 -0.00676185
-3.8632 -0.00667655
-3.89709 -0.00658555
-3.93098 -0.00648895
-3.96487 -0.0063869
-3.99875 -0.00627945
-4.03264 -0.00616685
-4.06653 -0.00604915
-4.10042 -0.00592655
-4.13431 -0.00579925
-4.16819 -0.0056673
-4.20208 -0.0055309
-4.23597 -0.00539025
-4.26986 -0.0052455
-4.30374 -0.00509675
-4.33763 -0.00494428
-4.37152 -0.00478819
-4.40541 -0.00462866
-4.4393 -0.0044659
-4.47318 -0.00430005
-4.50707 -0.00413131
-4.54096 -0.00395986
-4.57485 -0.0037859
-4.60873 -0.00360958
-4.64262 -0.00343111
-4.67651 -0.00325067
-4.7104 -0.00306844
-4.74428 -0.00288463
-4.77817 -0.00269939
-4.81206 -0.00251294
-4.84595 -0.00232546
-4.87984 -0.00213712
-4.91372 -0.00194812
-4.94761 -0.00175865
-4.9815 -0.00156888
-5.01539 -0.001379
-5.04927 -0.00118921
-5.08316 -0.00099966
-5.11705 -0.00081055
-5.15094 -0.000622055
-5.18483 -0.000434348
-5.21871 -0.000247603
-5.2526 -6.19925e-05
+1.79605 7.05725e-05
+1.82994 0.000333881
+1.86383 0.00059514
+1.89771 0.000854105
+1.9316 0.00111055
+1.96549 0.00136424
+1.99938 0.00161495
+2.03327 0.00186245
+2.06715 0.00210654
+2.10104 0.00234698
+2.13493 0.0025836
+2.16882 0.00281616
+2.2027 0.00304448
+2.23659 0.00326838
+2.27048 0.00348767
+2.30437 0.00370215
+2.33825 0.00391166
+2.37214 0.00411604
+2.40603 0.00431513
+2.43992 0.00450876
+2.47381 0.00469679
+2.50769 0.00487908
+2.54158 0.0050555
+2.57547 0.0052259
+2.60936 0.00539015
+2.64324 0.00554815
+2.67713 0.00569985
+2.71102 0.00584505
+2.74491 0.0059837
+2.7788 0.00611575
+2.81268 0.00624105
+2.84657 0.00635955
+2.88046 0.0064712
+2.91435 0.00657595
+2.94823 0.0066737
+2.98212 0.00676445
+3.01601 0.00684815
+3.0499 0.00692475
+3.08379 0.00699425
+3.11767 0.0070566
+3.15156 0.00711185
+3.18545 0.00715995
+3.21934 0.0072009
+3.25322 0.00723475
+3.28711 0.0072615
+3.321 0.00728115
+3.35489 0.00729375
+3.38877 0.0072993
+3.42266 0.0072979
+3.45655 0.0072896
+3.49044 0.00727445
+3.52433 0.00725245
+3.55821 0.00722375
+3.5921 0.00718835
+3.62599 0.0071464
+3.65988 0.007098
+3.69376 0.00704315
+3.72765 0.006982
+3.76154 0.00691465
+3.79543 0.00684125
+3.82932 0.00676185
+3.8632 0.00667655
+3.89709 0.00658555
+3.93098 0.00648895
+3.96487 0.0063869
+3.99875 0.00627945
+4.03264 0.00616685
+4.06653 0.00604915
+4.10042 0.00592655
+4.13431 0.00579925
+4.16819 0.0056673
+4.20208 0.0055309
+4.23597 0.00539025
+4.26986 0.0052455
+4.30374 0.00509675
+4.33763 0.00494428
+4.37152 0.00478819
+4.40541 0.00462866
+4.4393 0.0044659
+4.47318 0.00430005
+4.50707 0.00413131
+4.54096 0.00395986
+4.57485 0.0037859
+4.60873 0.00360958
+4.64262 0.00343111
+4.67651 0.00325067
+4.7104 0.00306844
+4.74428 0.00288463
+4.77817 0.00269939
+4.81206 0.00251294
+4.84595 0.00232546
+4.87984 0.00213712
+4.91372 0.00194812
+4.94761 0.00175865
+4.9815 0.00156888
+5.01539 0.001379
+5.04927 0.00118921
+5.08316 0.00099966
+5.11705 0.00081055
+5.15094 0.000622055
+5.18483 0.000434348
+5.21871 0.000247603
+5.2526 6.19925e-05
 5.28649 0.000122313
 5.32038 0.000305148
 5.35426 0.000486347
@@ -255,109 +255,109 @@
 8.60749 0.000384484
 8.64138 0.000254717
 8.67526 0.000125619
-8.70915 -2.68836e-06
-8.74304 -0.000130089
-8.77693 -0.000256468
-8.81081 -0.000381709
-8.8447 -0.0005057
-8.87859 -0.000628335
-8.91248 -0.000749505
-8.94637 -0.0008691
-8.98025 -0.000987015
-9.01414 -0.00110315
-9.04803 -0.00121742
-9.08192 -0.00132971
-9.1158 -0.00143994
-9.14969 -0.00154801
-9.18358 -0.00165383
-9.21747 -0.00175732
-9.25136 -0.00185841
-9.28524 -0.00195699
-9.31913 -0.00205301
-9.35302 -0.00214637
-9.38691 -0.00223703
-9.42079 -0.0023249
-9.45468 -0.00240994
-9.48857 -0.00249205
-9.52246 -0.00257121
-9.55635 -0.00264734
-9.59023 -0.0027204
-9.62412 -0.00279034
-9.65801 -0.00285711
-9.6919 -0.00292068
-9.72578 -0.00298101
-9.75967 -0.00303805
-9.79356 -0.00309178
-9.82745 -0.00314217
-9.86134 -0.0031892
-9.89522 -0.00323285
-9.92911 -0.00327309
-9.963 -0.00330992
-9.99689 -0.00334332
-10.0308 -0.00337328
-10.0647 -0.00339981
-10.0985 -0.0034229
-10.1324 -0.00344254
-10.1663 -0.00345875
-10.2002 -0.00347155
-10.2341 -0.00348093
-10.268 -0.00348692
-10.3019 -0.00348952
-10.3358 -0.00348877
-10.3697 -0.0034847
-10.4035 -0.00347732
-10.4374 -0.00346666
-10.4713 -0.00345277
-10.5052 -0.00343568
-10.5391 -0.00341542
-10.573 -0.00339204
-10.6069 -0.00336558
-10.6408 -0.0033361
-10.6746 -0.00330364
-10.7085 -0.00326824
-10.7424 -0.00322998
-10.7763 -0.00318891
-10.8102 -0.00314508
-10.8441 -0.00309854
-10.878 -0.00304939
-10.9119 -0.00299767
-10.9457 -0.00294345
-10.9796 -0.00288681
-11.0135 -0.00282781
-11.0474 -0.00276654
-11.0813 -0.00270305
-11.1152 -0.00263744
-11.1491 -0.00256976
-11.183 -0.00250013
-11.2168 -0.0024286
-11.2507 -0.00235527
-11.2846 -0.0022802
-11.3185 -0.0022035
-11.3524 -0.00212524
-11.3863 -0.0020455
-11.4202 -0.00196438
-11.4541 -0.00188197
-11.4879 -0.00179836
-11.5218 -0.00171363
-11.5557 -0.00162786
-11.5896 -0.00154115
-11.6235 -0.0014536
-11.6574 -0.00136529
-11.6913 -0.0012763
-11.7252 -0.00118674
-11.759 -0.00109669
-11.7929 -0.00100624
-11.8268 -0.000915475
-11.8607 -0.00082449
-11.8946 -0.000733375
-11.9285 -0.000642215
-11.9624 -0.0005511
-11.9963 -0.000460114
-12.0302 -0.000369346
-12.064 -0.000278881
-12.0979 -0.000188802
-12.1318 -9.9195e-05
-12.1657 -1.01408e-05
+8.70915 2.68836e-06
+8.74304 0.000130089
+8.77693 0.000256468
+8.81081 0.000381709
+8.8447 0.0005057
+8.87859 0.000628335
+8.91248 0.000749505
+8.94637 0.0008691
+8.98025 0.000987015
+9.01414 0.00110315
+9.04803 0.00121742
+9.08192 0.00132971
+9.1158 0.00143994
+9.14969 0.00154801
+9.18358 0.00165383
+9.21747 0.00175732
+9.25136 0.00185841
+9.28524 0.00195699
+9.31913 0.00205301
+9.35302 0.00214637
+9.38691 0.00223703
+9.42079 0.0023249
+9.45468 0.00240994
+9.48857 0.00249205
+9.52246 0.00257121
+9.55635 0.00264734
+9.59023 0.0027204
+9.62412 0.00279034
+9.65801 0.00285711
+9.6919 0.00292068
+9.72578 0.00298101
+9.75967 0.00303805
+9.79356 0.00309178
+9.82745 0.00314217
+9.86134 0.0031892
+9.89522 0.00323285
+9.92911 0.00327309
+9.963 0.00330992
+9.99689 0.00334332
+10.0308 0.00337328
+10.0647 0.00339981
+10.0985 0.0034229
+10.1324 0.00344254
+10.1663 0.00345875
+10.2002 0.00347155
+10.2341 0.00348093
+10.268 0.00348692
+10.3019 0.00348952
+10.3358 0.00348877
+10.3697 0.0034847
+10.4035 0.00347732
+10.4374 0.00346666
+10.4713 0.00345277
+10.5052 0.00343568
+10.5391 0.00341542
+10.573 0.00339204
+10.6069 0.00336558
+10.6408 0.0033361
+10.6746 0.00330364
+10.7085 0.00326824
+10.7424 0.00322998
+10.7763 0.00318891
+10.8102 0.00314508
+10.8441 0.00309854
+10.878 0.00304939
+10.9119 0.00299767
+10.9457 0.00294345
+10.9796 0.00288681
+11.0135 0.00282781
+11.0474 0.00276654
+11.0813 0.00270305
+11.1152 0.00263744
+11.1491 0.00256976
+11.183 0.00250013
+11.2168 0.0024286
+11.2507 0.00235527
+11.2846 0.0022802
+11.3185 0.0022035
+11.3524 0.00212524
+11.3863 0.0020455
+11.4202 0.00196438
+11.4541 0.00188197
+11.4879 0.00179836
+11.5218 0.00171363
+11.5557 0.00162786
+11.5896 0.00154115
+11.6235 0.0014536
+11.6574 0.00136529
+11.6913 0.0012763
+11.7252 0.00118674
+11.759 0.00109669
+11.7929 0.00100624
+11.8268 0.000915475
+11.8607 0.00082449
+11.8946 0.000733375
+11.9285 0.000642215
+11.9624 0.0005511
+11.9963 0.000460114
+12.0302 0.000369346
+12.064 0.000278881
+12.0979 0.000188802
+12.1318 9.9195e-05
+12.1657 1.01408e-05
 12.1996 7.8279e-05
 12.2335 0.000165984
 12.2674 0.000252894
@@ -459,108 +459,108 @@
 15.5206 0.000180467
 15.5545 0.000118076
 15.5884 5.60155e-05
-15.6223 -5.65895e-06
-15.6561 -6.68905e-05
-15.69 -0.000127624
-15.7239 -0.000187803
-15.7578 -0.000247376
-15.7917 -0.000306288
-15.8256 -0.00036449
-15.8595 -0.000421929
-15.8934 -0.000478555
-15.9272 -0.00053432
-15.9611 -0.00058918
-15.995 -0.000643085
-16.0289 -0.00069599
-16.0628 -0.00074785
-16.0967 -0.00079863
-16.1306 -0.00084828
-16.1645 -0.00089677
-16.1983 -0.00094405
-16.2322 -0.000990095
-16.2661 -0.00103486
-16.3 -0.00107832
-16.3339 -0.00112043
-16.3678 -0.00116118
-16.4017 -0.00120052
-16.4356 -0.00123843
-16.4694 -0.00127489
-16.5033 -0.00130986
-16.5372 -0.00134333
-16.5711 -0.00137528
-16.605 -0.00140569
-16.6389 -0.00143453
-16.6728 -0.00146179
-16.7067 -0.00148746
-16.7405 -0.00151152
-16.7744 -0.00153396
-16.8083 -0.00155478
-16.8422 -0.00157395
-16.8761 -0.00159149
-16.91 -0.00160738
-16.9439 -0.0016216
-16.9778 -0.00163419
-17.0117 -0.00164511
-17.0455 -0.00165438
-17.0794 -0.00166201
-17.1133 -0.00166798
-17.1472 -0.00167231
-17.1811 -0.00167502
-17.215 -0.0016761
-17.2489 -0.00167557
-17.2828 -0.00167344
-17.3166 -0.00166972
-17.3505 -0.00166443
-17.3844 -0.00165759
-17.4183 -0.00164921
-17.4522 -0.0016393
-17.4861 -0.00162791
-17.52 -0.00161503
-17.5539 -0.0016007
-17.5877 -0.00158494
-17.6216 -0.00156777
-17.6555 -0.00154923
-17.6894 -0.00152934
-17.7233 -0.00150812
-17.7572 -0.00148562
-17.7911 -0.00146185
-17.825 -0.00143685
-17.8588 -0.00141066
-17.8927 -0.00138331
-17.9266 -0.00135483
-17.9605 -0.00132525
-17.9944 -0.00129462
-18.0283 -0.00126296
-18.0622 -0.00123032
-18.0961 -0.00119674
-18.1299 -0.00116226
-18.1638 -0.00112692
-18.1977 -0.00109074
-18.2316 -0.00105379
-18.2655 -0.00101608
-18.2994 -0.000977675
-18.3333 -0.00093861
-18.3672 -0.00089893
-18.401 -0.00085867
-18.4349 -0.00081788
-18.4688 -0.0007766
-18.5027 -0.000734875
-18.5366 -0.00069274
-18.5705 -0.00065025
-18.6044 -0.00060744
-18.6383 -0.00056436
-18.6722 -0.000521045
-18.706 -0.000477546
-18.7399 -0.000433902
-18.7738 -0.000390157
-18.8077 -0.000346352
-18.8416 -0.000302531
-18.8755 -0.000258737
-18.9094 -0.00021501
-18.9433 -0.000171392
-18.9771 -0.000127924
-19.011 -8.46475e-05
-19.0449 -4.16014e-05
+15.6223 5.65895e-06
+15.6561 6.68905e-05
+15.69 0.000127624
+15.7239 0.000187803
+15.7578 0.000247376
+15.7917 0.000306288
+15.8256 0.00036449
+15.8595 0.000421929
+15.8934 0.000478555
+15.9272 0.00053432
+15.9611 0.00058918
+15.995 0.000643085
+16.0289 0.00069599
+16.0628 0.00074785
+16.0967 0.00079863
+16.1306 0.00084828
+16.1645 0.00089677
+16.1983 0.00094405
+16.2322 0.000990095
+16.2661 0.00103486
+16.3 0.00107832
+16.3339 0.00112043
+16.3678 0.00116118
+16.4017 0.00120052
+16.4356 0.00123843
+16.4694 0.00127489
+16.5033 0.00130986
+16.5372 0.00134333
+16.5711 0.00137528
+16.605 0.00140569
+16.6389 0.00143453
+16.6728 0.00146179
+16.7067 0.00148746
+16.7405 0.00151152
+16.7744 0.00153396
+16.8083 0.00155478
+16.8422 0.00157395
+16.8761 0.00159149
+16.91 0.00160738
+16.9439 0.0016216
+16.9778 0.00163419
+17.0117 0.00164511
+17.0455 0.00165438
+17.0794 0.00166201
+17.1133 0.00166798
+17.1472 0.00167231
+17.1811 0.00167502
+17.215 0.0016761
+17.2489 0.00167557
+17.2828 0.00167344
+17.3166 0.00166972
+17.3505 0.00166443
+17.3844 0.00165759
+17.4183 0.00164921
+17.4522 0.0016393
+17.4861 0.00162791
+17.52 0.00161503
+17.5539 0.0016007
+17.5877 0.00158494
+17.6216 0.00156777
+17.6555 0.00154923
+17.6894 0.00152934
+17.7233 0.00150812
+17.7572 0.00148562
+17.7911 0.00146185
+17.825 0.00143685
+17.8588 0.00141066
+17.8927 0.00138331
+17.9266 0.00135483
+17.9605 0.00132525
+17.9944 0.00129462
+18.0283 0.00126296
+18.0622 0.00123032
+18.0961 0.00119674
+18.1299 0.00116226
+18.1638 0.00112692
+18.1977 0.00109074
+18.2316 0.00105379
+18.2655 0.00101608
+18.2994 0.000977675
+18.3333 0.00093861
+18.3672 0.00089893
+18.401 0.00085867
+18.4349 0.00081788
+18.4688 0.0007766
+18.5027 0.000734875
+18.5366 0.00069274
+18.5705 0.00065025
+18.6044 0.00060744
+18.6383 0.00056436
+18.6722 0.000521045
+18.706 0.000477546
+18.7399 0.000433902
+18.7738 0.000390157
+18.8077 0.000346352
+18.8416 0.000302531
+18.8755 0.000258737
+18.9094 0.00021501
+18.9433 0.000171392
+18.9771 0.000127924
+19.011 8.46475e-05
+19.0449 4.16014e-05
 19.0788 1.17405e-06
 19.1127 4.36399e-05
 19.1466 8.57575e-05
@@ -663,76 +663,76 @@
 22.4337 8.3685e-05
 22.4676 5.37e-05
 22.5015 2.38765e-05
-22.5354 -5.7578e-06
-22.5692 -3.51759e-05
-22.6031 -6.43515e-05
-22.637 -9.32575e-05
-22.6709 -0.000121869
-22.7048 -0.00015016
-22.7387 -0.000178105
-22.7726 -0.000205683
-22.8065 -0.000232865
-22.8403 -0.000259632
-22.8742 -0.00028596
-22.9081 -0.000311826
-22.942 -0.000337209
-22.9759 -0.000362089
-23.0098 -0.000386445
-23.0437 -0.000410257
-23.0776 -0.000433507
-23.1114 -0.000456176
-23.1453 -0.000478245
-23.1792 -0.000499701
-23.2131 -0.000520525
-23.247 -0.0005407
-23.2809 -0.000560215
-23.3148 -0.000579055
-23.3487 -0.000597205
-23.3825 -0.000614655
-23.4164 -0.00063139
-23.4503 -0.0006474
-23.4842 -0.00066268
-23.5181 -0.000677215
-23.552 -0.000690995
-23.5859 -0.000704015
-23.6198 -0.00071627
-23.6536 -0.00072775
-23.6875 -0.000738455
-23.7214 -0.00074837
-23.7553 -0.000757505
-23.7892 -0.000765845
-23.8231 -0.00077339
-23.857 -0.000780145
-23.8909 -0.0007861
-23.9248 -0.00079126
-23.9586 -0.00079563
-23.9925 -0.000799205
-24.0264 -0.000801985
-24.0603 -0.000803985
-24.0942 -0.000805195
-24.1281 -0.000805625
-24.162 -0.00080528
-24.1959 -0.00080417
-24.2297 -0.000802295
-24.2636 -0.00079967
-24.2975 -0.00079629
-24.3314 -0.00079218
-24.3653 -0.000787335
-24.3992 -0.00078177
-24.4331 -0.0007755
-24.467 -0.00076853
-24.5008 -0.000760875
-24.5347 -0.000752545
-24.5686 -0.000743555
-24.6025 -0.00073392
-24.6364 -0.000723645
-24.6703 -0.000712755
-24.7042 -0.00070126
-24.7381 -0.000689175
-24.7719 -0.000676515
-24.8058 -0.0006633
-24.8397 -0.000649545
-24.8736 -0.000635265
-24.9075 -0.00062048
-24.9414 -0.000605205
-24.9753 -0.00058946
+22.5354 5.7578e-06
+22.5692 3.51759e-05
+22.6031 6.43515e-05
+22.637 9.32575e-05
+22.6709 0.000121869
+22.7048 0.00015016
+22.7387 0.000178105
+22.7726 0.000205683
+22.8065 0.000232865
+22.8403 0.000259632
+22.8742 0.00028596
+22.9081 0.000311826
+22.942 0.000337209
+22.9759 0.000362089
+23.0098 0.000386445
+23.0437 0.000410257
+23.0776 0.000433507
+23.1114 0.000456176
+23.1453 0.000478245
+23.1792 0.000499701
+23.2131 0.000520525
+23.247 0.0005407
+23.2809 0.000560215
+23.3148 0.000579055
+23.3487 0.000597205
+23.3825 0.000614655
+23.4164 0.00063139
+23.4503 0.0006474
+23.4842 0.00066268
+23.5181 0.000677215
+23.552 0.000690995
+23.5859 0.000704015
+23.6198 0.00071627
+23.6536 0.00072775
+23.6875 0.000738455
+23.7214 0.00074837
+23.7553 0.000757505
+23.7892 0.000765845
+23.8231 0.00077339
+23.857 0.000780145
+23.8909 0.0007861
+23.9248 0.00079126
+23.9586 0.00079563
+23.9925 0.000799205
+24.0264 0.000801985
+24.0603 0.000803985
+24.0942 0.000805195
+24.1281 0.000805625
+24.162 0.00080528
+24.1959 0.00080417
+24.2297 0.000802295
+24.2636 0.00079967
+24.2975 0.00079629
+24.3314 0.00079218
+24.3653 0.000787335
+24.3992 0.00078177
+24.4331 0.0007755
+24.467 0.00076853
+24.5008 0.000760875
+24.5347 0.000752545
+24.5686 0.000743555
+24.6025 0.00073392
+24.6364 0.000723645
+24.6703 0.000712755
+24.7042 0.00070126
+24.7381 0.000689175
+24.7719 0.000676515
+24.8058 0.0006633
+24.8397 0.000649545
+24.8736 0.000635265
+24.9075 0.00062048
+24.9414 0.000605205
+24.9753 0.00058946

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list