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

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

The following commit has been merged in the upstream branch:
commit 293a5468de507bd3ca29620c532d5ec795d351d0
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Wed Feb 27 10:03:50 2008 +1100

    New air/water capillary wave test case
    
    darcs-hash:20080226230350-d4795-f1704cfa3cbc891b54cda050b418816dc1b38eba.gz

diff --git a/test/capwave/density/density.gfs b/test/capwave/air-water/air-water.gfs
similarity index 52%
copy from test/capwave/density/density.gfs
copy to test/capwave/air-water/air-water.gfs
index 342a631..863da20 100644
--- a/test/capwave/density/density.gfs
+++ b/test/capwave/air-water/air-water.gfs
@@ -1,26 +1,17 @@
-# Title: Fluids of different densities
+# Title: Air-Water capillary wave
 #
 # Description:
 #
-# Same test as before but with a density ratio of 10. The dynamic
-# viscosities are identical.
-#
-# Table \ref{convergence} shows the convergence of various
-# solvers as a function of resolution: Gerris, the marker technique of
-# \cite{popinet99} and Surfer \cite{gueyffier98}.
-#
-# The time-evolution of the amplitude given by Prosperetti's theory
-# and Gerris ($64^2$) is given on Figure \ref{amplitude}.
+# Same test as before but with density and viscosity ratio
+# corresponding to an air/water interface.
 #
 # \begin{table}[htbp]
 # \caption{\label{convergence}Convergence of the relative error between the analytical
-# solution and simulation results from various solvers.}
+# solution and simulation results.}
 # \begin{center}
 # \begin{tabular}{|l|ccccc|} \hline
 # Method & $8^2$ & $16^2$ & $32^2$ & $64^2$ & $128^2$ \\ \hline
-# \input{convergence.tex} & 0.001155 \\
-# Markers & 0.3593 & 0.1397 & 0.0566 & 0.0264 & 0.0148 \\
-# Surfer & - & - & 0.1233 & 0.0300 & 0.0254 \\ \hline
+# \input{convergence.tex} & 0.00313 \\
 # \end{tabular}
 # \end{center}
 # \end{table}
@@ -34,26 +25,34 @@
 # \end{figure}
 #
 # Author: St\'ephane Popinet
-# Command: sh ../capwave.sh density.gfs
-# Version: 1.1.0
+# Command: sh ../capwave.sh air-water.gfs
+# Version: 1.2.0
 # Required files: convergence.ref prosperetti
 # Generated files: convergence.tex amplitude.eps
 #
+# Theoretical solution generated using:
+#  ~/local/src/laplace/oscillations planar 1 1 0.0182571749236 0.273038508 1 1 0.0012 0.01 0 0 | awk '{print $1*15.7402, ($2 > 0. ? $2 : -$2)}' > prosperetti
+#
 3 5 GfsSimulation GfsBox GfsGEdge {} {
-  Time { end = 1.66481717925811447992 }
+  Time { end = 1.58928694288774963184 }
   ApproxProjectionParams { tolerance = 1e-6 }
   ProjectionParams { tolerance = 1e-6 }
   Refine floor(LEVEL + 1 - (LEVEL - 2)*fabs(y)/1.5)
   VariableTracerVOF T
+  VariableFiltered T1 T 1
   VariableCurvature K T
   SourceTension T 1 K
   VariablePosition Y T y
-  SourceDiffusion U 0.0182571749236
-  SourceDiffusion V 0.0182571749236
-  PhysicalParams { alpha = 1./(T + 0.1*(1. - T)) }
+  Global {
+      #define VAR(T,min,max)   (min + CLAMP(T,0,1)*(max - min))
+      #define RHO(T)            VAR(T, 1.2/1000., 1.)
+      #define MU(T)             VAR(T, 1.8e-5/1.003e-3, 1.)
+  }
+  PhysicalParams { alpha = 1./RHO(T1) }
+  SourceViscosity 0.0182571749236*MU(T1)
   InitFraction T (y - 0.01*cos (2.*M_PI*x))
-  OutputScalarNorm { step = .00225584983639310905 } {
-      awk '{printf ("%g %g\n", $3*15.016663878457, $9); fflush(stdout); }' > wave-LEVEL
+  OutputScalarNorm { step = 0.00198785108553814829 } {
+      awk '{printf ("%g %g\n", $3*15.7402, $9); fflush(stdout); }' > wave-LEVEL
   } { v = (T > 0. && T < 1. ? Y : 0.) }
 }
 GfsBox {}
diff --git a/test/capwave/air-water/convergence.ref b/test/capwave/air-water/convergence.ref
new file mode 100644
index 0000000..bd1183c
--- /dev/null
+++ b/test/capwave/air-water/convergence.ref
@@ -0,0 +1,4 @@
+3 0.196812
+4 0.0754273
+5 0.0159282
+6 0.0057351
diff --git a/test/capwave/air-water/prosperetti b/test/capwave/air-water/prosperetti
new file mode 100644
index 0000000..e6a3434
--- /dev/null
+++ b/test/capwave/air-water/prosperetti
@@ -0,0 +1,800 @@
+0 0.01
+0.0312892 0.00999512
+0.0625783 0.00998051
+0.0938675 0.00995625
+0.125157 0.00992241
+0.156446 0.00987909
+0.187735 0.00982636
+0.219025 0.00976434
+0.250313 0.00969313
+0.281603 0.00961285
+0.312892 0.00952363
+0.344182 0.0094256
+0.37547 0.00931889
+0.40676 0.00920366
+0.438048 0.00908006
+0.469338 0.00894826
+0.500627 0.00880841
+0.531916 0.0086607
+0.563205 0.00850532
+0.594495 0.00834244
+0.625783 0.00817226
+0.657073 0.00799498
+0.688361 0.00781082
+0.719651 0.00761997
+0.75094 0.00742267
+0.78223 0.00721912
+0.813518 0.00700956
+0.844808 0.00679422
+0.876096 0.00657333
+0.907386 0.00634713
+0.938675 0.00611587
+0.969965 0.00587979
+1.00125 0.00563915
+1.03254 0.0053942
+1.06383 0.00514518
+1.09512 0.00489238
+1.12641 0.00463604
+1.1577 0.00437642
+1.18899 0.0041138
+1.22028 0.00384844
+1.25157 0.0035806
+1.28286 0.00331056
+1.31414 0.00303859
+1.34543 0.00276495
+1.37672 0.00248992
+1.40801 0.00221377
+1.4393 0.00193677
+1.47059 0.00165918
+1.50188 0.00138128
+1.53317 0.00110333
+1.56446 0.000825597
+1.59574 0.000548353
+1.62703 0.000271857
+1.65832 3.62942e-06
+1.68962 0.000277848
+1.72091 0.000550542
+1.7522 0.000821458
+1.78349 0.00109035
+1.81477 0.00135696
+1.84606 0.00162105
+1.87735 0.00188238
+1.90864 0.00214071
+1.93993 0.00239581
+1.97122 0.00264745
+2.0025 0.00289541
+2.03379 0.00313947
+2.06508 0.00337941
+2.09637 0.00361503
+2.12767 0.00384611
+2.15896 0.00407247
+2.19025 0.0042939
+2.22152 0.00451022
+2.25282 0.00472125
+2.28411 0.00492681
+2.3154 0.00512672
+2.34669 0.00532084
+2.37798 0.005509
+2.40927 0.00569104
+2.44055 0.00586683
+2.47184 0.00603622
+2.50313 0.00619909
+2.53442 0.00635532
+2.56572 0.00650477
+2.59701 0.00664735
+2.62828 0.00678295
+2.65957 0.00691148
+2.69087 0.00703284
+2.72216 0.00714696
+2.75345 0.00725376
+2.78474 0.00735317
+2.81603 0.00744514
+2.84731 0.00752962
+2.8786 0.00760655
+2.90989 0.0076759
+2.94118 0.00773765
+2.97247 0.00779177
+3.00377 0.00783825
+3.03506 0.00787707
+3.06633 0.00790824
+3.09762 0.00793177
+3.12892 0.00794766
+3.16021 0.00795595
+3.1915 0.00795666
+3.22279 0.00794983
+3.25408 0.00793549
+3.28536 0.00791371
+3.31665 0.00788453
+3.34794 0.00784802
+3.37923 0.00780425
+3.41052 0.0077533
+3.44182 0.00769524
+3.47309 0.00763018
+3.50438 0.00755821
+3.53567 0.00747942
+3.56697 0.00739393
+3.59826 0.00730185
+3.62955 0.0072033
+3.66084 0.00709841
+3.69212 0.0069873
+3.72341 0.00687011
+3.7547 0.00674699
+3.78599 0.00661808
+3.81728 0.00648352
+3.84857 0.00634349
+3.87986 0.00619813
+3.91114 0.00604761
+3.94243 0.0058921
+3.97372 0.00573177
+4.00502 0.0055668
+4.03631 0.00539737
+4.0676 0.00522366
+4.09887 0.00504585
+4.13017 0.00486414
+4.16146 0.00467873
+4.19275 0.00448979
+4.22404 0.00429754
+4.25533 0.00410216
+4.28662 0.00390387
+4.3179 0.00370286
+4.34919 0.00349934
+4.38048 0.00329352
+4.41177 0.0030856
+4.44306 0.0028758
+4.47436 0.00266431
+4.50565 0.00245135
+4.53692 0.00223714
+4.56822 0.00202187
+4.59951 0.00180577
+4.6308 0.00158903
+4.66209 0.00137188
+4.69338 0.00115452
+4.72467 0.000937154
+4.75595 0.000719994
+4.78724 0.000503245
+4.81853 0.000287112
+4.84982 7.17978e-05
+4.88111 0.000142497
+4.91241 0.000355573
+4.94368 0.000567232
+4.97497 0.000777281
+5.00627 0.000985526
+5.03756 0.00119178
+5.06885 0.00139585
+5.10014 0.00159756
+5.13143 0.00179673
+5.16271 0.00199317
+5.194 0.00218672
+5.22529 0.0023772
+5.25658 0.00256445
+5.28787 0.0027483
+5.31916 0.00292861
+5.35046 0.0031052
+5.38173 0.00327793
+5.41302 0.00344667
+5.44431 0.00361125
+5.47561 0.00377156
+5.5069 0.00392745
+5.53819 0.0040788
+5.56947 0.00422548
+5.60076 0.00436739
+5.63205 0.00450441
+5.66334 0.00463643
+5.69463 0.00476335
+5.72592 0.00488507
+5.75721 0.00500151
+5.78849 0.00511258
+5.81978 0.00521819
+5.85107 0.00531829
+5.88236 0.00541279
+5.91366 0.00550163
+5.94495 0.00558476
+5.97624 0.00566213
+6.00751 0.00573369
+6.03881 0.0057994
+6.0701 0.00585923
+6.10139 0.00591315
+6.13268 0.00596113
+6.16397 0.00600317
+6.19526 0.00603924
+6.22654 0.00606935
+6.25783 0.0060935
+6.28912 0.00611168
+6.32041 0.00612392
+6.35171 0.00613023
+6.383 0.00613063
+6.41427 0.00612516
+6.44556 0.00611384
+6.47686 0.00609672
+6.50815 0.00607384
+6.53944 0.00604525
+6.57073 0.006011
+6.60202 0.00597117
+6.6333 0.0059258
+6.66459 0.00587498
+6.69588 0.00581878
+6.72717 0.00575728
+6.75846 0.00569055
+6.78976 0.00561871
+6.82105 0.00554182
+6.85232 0.00546
+6.88361 0.00537335
+6.91491 0.00528197
+6.9462 0.00518598
+6.97749 0.00508548
+7.00878 0.0049806
+7.04006 0.00487145
+7.07135 0.00475817
+7.10264 0.00464088
+7.13393 0.00451971
+7.16522 0.0043948
+7.19651 0.00426629
+7.22781 0.00413431
+7.25908 0.003999
+7.29037 0.00386052
+7.32166 0.00371902
+7.35296 0.00357463
+7.38425 0.00342752
+7.41554 0.00327783
+7.44683 0.00312573
+7.47811 0.00297137
+7.5094 0.0028149
+7.54069 0.0026565
+7.57198 0.00249631
+7.60327 0.0023345
+7.63456 0.00217124
+7.66586 0.00200668
+7.69713 0.00184099
+7.72842 0.00167433
+7.75971 0.00150687
+7.79101 0.00133877
+7.8223 0.0011702
+7.85359 0.00100131
+7.88486 0.000832271
+7.91616 0.000663246
+7.94745 0.000494394
+7.97874 0.000325876
+8.01003 0.000157852
+8.04132 9.52121e-06
+8.07261 0.000176087
+8.10389 0.000341689
+8.13518 0.000506175
+8.16647 0.000669393
+8.19776 0.000831194
+8.22906 0.00099143
+8.26035 0.00114996
+8.29164 0.00130663
+8.32291 0.00146131
+8.35421 0.00161385
+8.3855 0.00176413
+8.41679 0.00191201
+8.44808 0.00205736
+8.47937 0.00220006
+8.51065 0.00233998
+8.54194 0.00247699
+8.57323 0.002611
+8.60452 0.00274187
+8.63581 0.00286951
+8.66711 0.0029938
+8.6984 0.00311465
+8.72967 0.00323195
+8.76096 0.00334562
+8.79226 0.00345555
+8.82355 0.00356167
+8.85484 0.00366388
+8.88613 0.00376212
+8.91742 0.0038563
+8.9487 0.00394637
+8.97999 0.00403224
+9.01128 0.00411387
+9.04257 0.00419118
+9.07386 0.00426414
+9.10515 0.00433269
+9.13645 0.00439679
+9.16772 0.00445639
+9.19901 0.00451147
+9.23031 0.00456199
+9.2616 0.00460793
+9.29289 0.00464926
+9.32418 0.00468597
+9.35546 0.00471805
+9.38675 0.00474549
+9.41804 0.00476828
+9.44933 0.00478642
+9.48062 0.00479993
+9.51191 0.0048088
+9.5432 0.00481306
+9.57448 0.00481272
+9.60577 0.00480781
+9.63706 0.00479835
+9.66835 0.00478438
+9.69965 0.00476592
+9.73094 0.00474303
+9.76223 0.00471573
+9.79351 0.00468409
+9.8248 0.00464814
+9.85609 0.00460795
+9.88738 0.00456358
+9.91867 0.00451508
+9.94996 0.00446253
+9.98124 0.004406
+10.0125 0.00434555
+10.0438 0.00428126
+10.0751 0.00421322
+10.1064 0.00414151
+10.1377 0.00406621
+10.169 0.00398742
+10.2003 0.00390522
+10.2316 0.00381971
+10.2628 0.00373099
+10.2941 0.00363915
+10.3254 0.00354431
+10.3567 0.00344657
+10.388 0.00334603
+10.4193 0.0032428
+10.4506 0.003137
+10.4819 0.00302873
+10.5132 0.00291812
+10.5445 0.00280528
+10.5757 0.00269033
+10.607 0.00257339
+10.6383 0.00245458
+10.6696 0.00233402
+10.7009 0.00221184
+10.7322 0.00208816
+10.7635 0.0019631
+10.7948 0.0018368
+10.826 0.00170938
+10.8573 0.00158096
+10.8886 0.00145167
+10.9199 0.00132165
+10.9512 0.00119101
+10.9825 0.00105989
+11.0138 0.000928413
+11.0451 0.000796705
+11.0764 0.000664895
+11.1077 0.000533107
+11.1389 0.000401468
+11.1702 0.000270103
+11.2015 0.000139135
+11.2328 8.68841e-06
+11.2641 0.000121116
+11.2954 0.000250158
+11.3267 0.000378317
+11.358 0.000505476
+11.3893 0.000631519
+11.4206 0.00075633
+11.4518 0.000879796
+11.4831 0.00100181
+11.5144 0.00112225
+11.5457 0.00124103
+11.577 0.00135802
+11.6083 0.00147314
+11.6396 0.00158628
+11.6709 0.00169733
+11.7021 0.00180622
+11.7334 0.00191283
+11.7647 0.00201709
+11.796 0.0021189
+11.8273 0.00221818
+11.8586 0.00231484
+11.8899 0.00240882
+11.9212 0.00250002
+11.9525 0.00258838
+11.9838 0.00267382
+12.015 0.00275629
+12.0463 0.00283571
+12.0776 0.00291203
+12.1089 0.00298518
+12.1402 0.00305512
+12.1715 0.00312179
+12.2028 0.00318513
+12.2341 0.00324513
+12.2654 0.00330172
+12.2966 0.00335487
+12.3279 0.00340455
+12.3592 0.00345073
+12.3905 0.00349338
+12.4218 0.00353247
+12.4531 0.003568
+12.4844 0.00359993
+12.5157 0.00362827
+12.547 0.00365299
+12.5782 0.00367409
+12.6095 0.00369158
+12.6408 0.00370545
+12.6721 0.0037157
+12.7034 0.00372235
+12.7347 0.0037254
+12.766 0.00372488
+12.7973 0.00372079
+12.8286 0.00371316
+12.8599 0.00370201
+12.8911 0.00368738
+12.9224 0.00366929
+12.9537 0.00364778
+12.985 0.00362288
+13.0163 0.00359464
+13.0476 0.0035631
+13.0789 0.0035283
+13.1102 0.00349029
+13.1414 0.00344913
+13.1727 0.00340487
+13.204 0.00335757
+13.2353 0.00330729
+13.2666 0.00325409
+13.2979 0.00319803
+13.3292 0.00313919
+13.3605 0.00307762
+13.3918 0.00301342
+13.4231 0.00294664
+13.4543 0.00287737
+13.4856 0.00280568
+13.5169 0.00273166
+13.5482 0.00265538
+13.5795 0.00257694
+13.6108 0.00249641
+13.6421 0.00241388
+13.6734 0.00232944
+13.7047 0.00224318
+13.736 0.0021552
+13.7672 0.00206558
+13.7985 0.00197442
+13.8298 0.00188181
+13.8611 0.00178785
+13.8924 0.00169264
+13.9237 0.00159626
+13.955 0.00149883
+13.9863 0.00140043
+14.0175 0.00130117
+14.0488 0.00120115
+14.0801 0.00110045
+14.1114 0.000999197
+14.1427 0.000897472
+14.174 0.00079538
+14.2053 0.00069302
+14.2366 0.00059049
+14.2679 0.00048789
+14.2992 0.000385317
+14.3304 0.00028287
+14.3617 0.000180645
+14.393 7.87392e-05
+14.4243 2.27518e-05
+14.4556 0.000123733
+14.4869 0.000224111
+14.5182 0.000323793
+14.5495 0.000422687
+14.5808 0.000520702
+14.612 0.000617749
+14.6433 0.00071374
+14.6746 0.00080859
+14.7059 0.000902212
+14.7372 0.000994524
+14.7685 0.00108544
+14.7998 0.00117489
+14.8311 0.00126279
+14.8624 0.00134906
+14.8936 0.00143363
+14.9249 0.00151642
+14.9562 0.00159738
+14.9875 0.00167642
+15.0188 0.00175348
+15.0501 0.0018285
+15.0814 0.00190142
+15.1127 0.00197217
+15.144 0.00204071
+15.1753 0.00210697
+15.2065 0.0021709
+15.2378 0.00223246
+15.2691 0.00229159
+15.3004 0.00234826
+15.3317 0.00240241
+15.363 0.00245402
+15.3943 0.00250304
+15.4256 0.00254944
+15.4568 0.00259319
+15.4881 0.00263425
+15.5194 0.00267262
+15.5507 0.00270825
+15.582 0.00274113
+15.6133 0.00277124
+15.6446 0.00279857
+15.6759 0.0028231
+15.7072 0.00284482
+15.7385 0.00286374
+15.7698 0.00287983
+15.801 0.00289311
+15.8323 0.00290356
+15.8636 0.00291121
+15.8949 0.00291604
+15.9262 0.00291808
+15.9574 0.00291733
+15.9887 0.00291381
+16.0201 0.00290753
+16.0514 0.00289851
+16.0827 0.00288679
+16.1139 0.00287237
+16.1452 0.00285529
+16.1765 0.00283557
+16.2078 0.00281325
+16.239 0.00278837
+16.2703 0.00276095
+16.3017 0.00273104
+16.333 0.00269868
+16.3643 0.0026639
+16.3955 0.00262677
+16.4268 0.00258731
+16.4581 0.00254559
+16.4894 0.00250165
+16.5208 0.00245554
+16.5519 0.00240732
+16.5832 0.00235705
+16.6146 0.00230478
+16.6459 0.00225058
+16.6771 0.0021945
+16.7084 0.00213661
+16.7397 0.00207697
+16.771 0.00201564
+16.8023 0.0019527
+16.8335 0.00188821
+16.8648 0.00182224
+16.8962 0.00175486
+16.9275 0.00168614
+16.9588 0.00161616
+16.99 0.00154498
+17.0213 0.00147269
+17.0526 0.00139934
+17.0839 0.00132503
+17.1151 0.00124983
+17.1464 0.0011738
+17.1778 0.00109704
+17.2091 0.00101961
+17.2404 0.000941588
+17.2716 0.000863058
+17.3029 0.000784096
+17.3342 0.000704778
+17.3655 0.000625182
+17.3969 0.000545385
+17.428 0.000465464
+17.4593 0.000385496
+17.4907 0.000305557
+17.522 0.000225724
+17.5532 0.000146072
+17.5845 6.66762e-05
+17.6158 1.23887e-05
+17.6471 9.1049e-05
+17.6784 0.000169232
+17.7096 0.000246864
+17.7409 0.000323876
+17.7723 0.000400196
+17.8036 0.000475755
+17.8349 0.000550484
+17.8661 0.000624317
+17.8974 0.000697188
+17.9287 0.00076903
+17.96 0.000839782
+17.9912 0.000909381
+18.0225 0.000977765
+18.0539 0.00104488
+18.0852 0.00111066
+18.1165 0.00117505
+18.1477 0.001238
+18.179 0.00129946
+18.2103 0.00135937
+18.2416 0.00141768
+18.273 0.00147436
+18.3041 0.00152934
+18.3354 0.00158259
+18.3668 0.00163406
+18.3981 0.00168371
+18.4293 0.00173152
+18.4606 0.00177743
+18.4919 0.00182141
+18.5232 0.00186343
+18.5545 0.00190347
+18.5857 0.00194149
+18.617 0.00197746
+18.6484 0.00201137
+18.6797 0.00204319
+18.7108 0.00207289
+18.7422 0.00210047
+18.7735 0.0021259
+18.8048 0.00214918
+18.8361 0.00217028
+18.8673 0.00218921
+18.8986 0.00220595
+18.93 0.0022205
+18.9613 0.00223285
+18.9926 0.00224301
+19.0238 0.00225097
+19.0551 0.00225674
+19.0864 0.00226032
+19.1177 0.00226172
+19.1489 0.00226096
+19.1802 0.00225803
+19.2115 0.00225296
+19.2429 0.00224576
+19.2742 0.00223645
+19.3054 0.00222504
+19.3367 0.00221157
+19.368 0.00219604
+19.3993 0.00217849
+19.4306 0.00215894
+19.4618 0.00213742
+19.4931 0.00211396
+19.5245 0.00208859
+19.5558 0.00206136
+19.5869 0.00203228
+19.6183 0.0020014
+19.6496 0.00196876
+19.6809 0.00193439
+19.7122 0.00189834
+19.7434 0.00186065
+19.7747 0.00182137
+19.8061 0.00178054
+19.8374 0.0017382
+19.8687 0.0016944
+19.8999 0.0016492
+19.9312 0.00160264
+19.9625 0.00155478
+19.9938 0.00150566
+20.025 0.00145534
+20.0563 0.00140387
+20.0876 0.00135131
+20.119 0.00129771
+20.1503 0.00124313
+20.1815 0.00118763
+20.2128 0.00113126
+20.2441 0.00107409
+20.2754 0.00101616
+20.3067 0.000957546
+20.3379 0.000898298
+20.3692 0.000838478
+20.4006 0.000778147
+20.4319 0.000717363
+20.463 0.000656187
+20.4944 0.00059468
+20.5257 0.000532902
+20.557 0.000470914
+20.5883 0.000408774
+20.6195 0.000346544
+20.6508 0.000284284
+20.6822 0.000222052
+20.7135 0.000159908
+20.7448 9.79118e-05
+20.776 3.61205e-05
+20.8073 2.54074e-05
+20.8386 8.66144e-05
+20.8699 0.000147444
+20.9011 0.000207839
+20.9324 0.000267746
+20.9637 0.000327108
+20.9951 0.000385871
+21.0264 0.000443984
+21.0576 0.000501393
+21.0889 0.000558047
+21.1202 0.000613896
+21.1515 0.00066889
+21.1828 0.000722981
+21.214 0.000776122
+21.2453 0.000828267
+21.2767 0.000879371
+21.308 0.00092939
+21.3391 0.000978281
+21.3705 0.001026
+21.4018 0.00107252
+21.4331 0.00111779
+21.4644 0.00116177
+21.4956 0.00120444
+21.5269 0.00124575
+21.5583 0.00128567
+21.5896 0.00132418
+21.6209 0.00136124
+21.6521 0.00139682
+21.6834 0.0014309
+21.7147 0.00146346
+21.746 0.00149446
+21.7772 0.00152388
+21.8085 0.00155172
+21.8398 0.00157794
+21.8712 0.00160253
+21.9025 0.00162548
+21.9337 0.00164676
+21.965 0.00166638
+21.9963 0.00168431
+22.0276 0.00170055
+22.0589 0.0017151
+22.0901 0.00172794
+22.1214 0.00173907
+22.1528 0.00174849
+22.1841 0.00175621
+22.2152 0.00176221
+22.2466 0.00176651
+22.2779 0.0017691
+22.3092 0.00177
+22.3405 0.0017692
+22.3717 0.00176673
+22.403 0.00176259
+22.4343 0.00175679
+22.4657 0.00174934
+22.4968 0.00174027
+22.5282 0.00172958
+22.5595 0.0017173
+22.5908 0.00170345
+22.6221 0.00168804
+22.6533 0.0016711
+22.6846 0.00165265
+22.7159 0.00163272
+22.7473 0.00161133
+22.7786 0.00158852
+22.8098 0.0015643
+22.8411 0.00153871
+22.8724 0.00151178
+22.9037 0.00148355
+22.9349 0.00145404
+22.9662 0.0014233
+22.9975 0.00139134
+23.0289 0.00135822
+23.0602 0.00132398
+23.0913 0.00128863
+23.1227 0.00125224
+23.154 0.00121483
+23.1853 0.00117645
+23.2166 0.00113714
+23.2478 0.00109694
+23.2791 0.00105589
+23.3104 0.00101404
+23.3418 0.000971429
+23.3729 0.000928104
+23.4043 0.000884109
+23.4356 0.000839489
+23.4669 0.000794289
+23.4982 0.000748556
+23.5294 0.000702336
+23.5607 0.000655676
+23.592 0.000608621
+23.6234 0.000561219
+23.6547 0.000513517
+23.6859 0.000465562
+23.7172 0.0004174
+23.7485 0.000369079
+23.7798 0.000320645
+23.811 0.000272146
+23.8423 0.000223628
+23.8736 0.000175137
+23.905 0.000126719
+23.9363 7.84201e-05
+23.9674 3.02862e-05
+23.9988 1.7638e-05
+24.0301 6.53077e-05
+24.0614 0.000112679
+24.0927 0.000159707
+24.1239 0.00020635
+24.1552 0.000252565
+24.1865 0.00029831
+24.2179 0.000343542
+24.249 0.000388223
+24.2804 0.000432312
+24.3117 0.000475769
+24.343 0.000518557
+24.3743 0.000560638
+24.4055 0.000601974
+24.4368 0.000642531
+24.4681 0.000682274
+24.4995 0.000721168
+24.5308 0.00075918
+24.562 0.00079628
+24.5933 0.000832435
+24.6246 0.000867615
+24.6559 0.000901793
+24.6871 0.00093494
+24.7184 0.000967031
+24.7497 0.000998038
+24.7811 0.00102794
+24.8124 0.00105671
+24.8435 0.00108433
+24.8749 0.00111077
+24.9062 0.00113603
+24.9375 0.00116007
+24.9688 0.00118289
+25 0.00120446
diff --git a/test/template.tex b/test/template.tex
index 6d780d1..fc4526b 100644
--- a/test/template.tex
+++ b/test/template.tex
@@ -72,6 +72,7 @@ current stable branch of the version-controlled source code.
 \input{spurious/spurious.tex}
 \input{capwave/capwave.tex}
 \input{capwave/density/density.tex}
+\input{capwave/air-water/air-water.tex}
 \input{capwave/gravity/gravity.tex}
 \input{oscillation/oscillation.tex}
 

-- 
Gerris Flow Solver

More information about the debian-science-commits mailing list