Skip to content

Commit

Permalink
Squashed 'examples/' changes from 4a0d366e..8d50b95a
Browse files Browse the repository at this point in the history
8d50b95a Updated output files for current version

git-subtree-dir: examples
git-subtree-split: 8d50b95a9fe30f7fedc2d189b361c7849a68df01
  • Loading branch information
Darth Vader committed Sep 24, 2024
1 parent f3b88ea commit 717e7c1
Show file tree
Hide file tree
Showing 24 changed files with 433 additions and 502 deletions.
3 changes: 1 addition & 2 deletions ex1.out
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Initial solution 1. SEAWATER FROM NORDSTROM AND OTHERS (1979)
Specific Conductance (µS/cm, 25°C) = 52856
Density (g/cm³) = 1.02328
Volume (L) = 1.01278
Viscosity (mPa s) = 0.96029
Viscosity (mPa s) = 0.96030
Activity of water = 0.981
Ionic strength (mol/kgw) = 6.704e-01
Mass of water (kg) = 1.000e+00
Expand Down Expand Up @@ -248,7 +248,6 @@ Na 4.854e-01
Na+ 4.712e-01 3.381e-01 -0.327 -0.471 -0.144 -0.51
NaSO4- 1.396e-02 9.473e-03 -1.855 -2.024 -0.168 8.22
NaHCO3 2.252e-04 3.066e-04 -3.647 -3.513 0.134 31.73
NaOH 4.773e-17 5.570e-17 -16.321 -16.254 0.067 (0)
O(0) 4.381e-04
O2 2.190e-04 2.556e-04 -3.659 -3.592 0.067 30.40
S(6) 2.926e-02
Expand Down
6 changes: 3 additions & 3 deletions ex10.out
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Initial solution 1.
Specific Conductance (µS/cm, 25°C) = 701
Density (g/cm³) = 0.99755
Volume (L) = 1.00310
Viscosity (mPa s) = 0.89435
Viscosity (mPa s) = 0.89463
Activity of water = 1.000
Ionic strength (mol/kgw) = 1.134e-02
Mass of water (kg) = 1.000e+00
Expand Down Expand Up @@ -206,10 +206,10 @@ CO2(g) -0.01 -1.48 -1.47 1.000e+01 9.961e+00 -3.875e-02

pH = 6.058 Charge balance
pe = 11.902 Adjusted to redox equilibrium
Specific Conductance (µS/cm, 25°C) = 1708
Specific Conductance (µS/cm, 25°C) = 1684
Density (g/cm³) = 0.99860
Volume (L) = 1.00434
Viscosity (mPa s) = 0.89962
Viscosity (mPa s) = 0.92188
Activity of water = 0.999
Ionic strength (mol/kgw) = 2.900e-02
Mass of water (kg) = 9.999e-01
Expand Down
3 changes: 1 addition & 2 deletions ex11.out
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Initial solution 1. Initial solution for column
Activity of water = 1.000
Ionic strength (mol/kgw) = 1.200e-03
Mass of water (kg) = 1.000e+00
Total alkalinity (eq/kg) = -1.017e-18
Total alkalinity (eq/kg) = -1.027e-18
Temperature (°C) = 25.00
Electrical balance (eq) = -9.088e-17
Percent error, 100*(Cat-|An|)/(Cat+|An|) = -0.00
Expand All @@ -150,7 +150,6 @@ N(5) 1.200e-03
NO3- 1.200e-03 1.154e-03 -2.921 -2.938 -0.017 29.49
Na 1.000e-03
Na+ 1.000e-03 9.621e-04 -3.000 -3.017 -0.017 -1.47
NaOH 9.666e-21 9.668e-21 -20.015 -20.015 0.000 (0)
O(0) 5.351e-04
O2 2.676e-04 2.676e-04 -3.573 -3.572 0.000 30.40

Expand Down
38 changes: 19 additions & 19 deletions ex11trn.sel
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,27 @@
55 8.344533301406e-04 1.131625845338e-03 3.655466698441e-04 0.000000000000e+00 1.387500000000e+00
56 7.847919650475e-04 1.142020362045e-03 4.152080349369e-04 0.000000000000e+00 1.412500000000e+00
57 7.284538372959e-04 1.150973656035e-03 4.715461626881e-04 3.531139650212e-28 1.437500000000e+00
58 6.674661295231e-04 1.158656441394e-03 5.325338704605e-04 4.216133178351e-26 1.462500000000e+00
58 6.674661295231e-04 1.158656441394e-03 5.325338704605e-04 4.216133178352e-26 1.462500000000e+00
59 6.042301758578e-04 1.165225432017e-03 5.957698241254e-04 2.112623929847e-24 1.487500000000e+00
60 5.410707042902e-04 1.170823053923e-03 6.589292956926e-04 9.154192241146e-23 1.512500000000e+00
60 5.410707042902e-04 1.170823053923e-03 6.589292956926e-04 9.154192241147e-23 1.512500000000e+00
61 4.799177066706e-04 1.175577598779e-03 7.200822933118e-04 3.514353871101e-21 1.537500000000e+00
62 4.221746364521e-04 1.179603706071e-03 7.778253635299e-04 1.207213754641e-19 1.562500000000e+00
63 3.687296865690e-04 1.183003078326e-03 8.312703134126e-04 3.694071268300e-18 1.587500000000e+00
64 3.200378094467e-04 1.185865350144e-03 8.799621905343e-04 1.035721724513e-16 1.612500000000e+00
65 2.762284431584e-04 1.188269047043e-03 9.237715568171e-04 2.657316487699e-15 1.637500000000e+00
66 2.371960440990e-04 1.190282583741e-03 9.628039557559e-04 6.272120678983e-14 1.662500000000e+00
62 4.221746364521e-04 1.179603706071e-03 7.778253635299e-04 1.207213754642e-19 1.562500000000e+00
63 3.687296865690e-04 1.183003078326e-03 8.312703134126e-04 3.694071268301e-18 1.587500000000e+00
64 3.200378094467e-04 1.185865350144e-03 8.799621905343e-04 1.035721724514e-16 1.612500000000e+00
65 2.762284431584e-04 1.188269047043e-03 9.237715568171e-04 2.657316487700e-15 1.637500000000e+00
66 2.371960440990e-04 1.190282583741e-03 9.628039557559e-04 6.272120678986e-14 1.662500000000e+00
67 2.026802660677e-04 1.191965263410e-03 9.973197311041e-04 1.404108206640e-12 1.687500000000e+00
68 1.723175379753e-04 1.193368249524e-03 1.027682402586e-03 2.970943178733e-11 1.712500000000e+00
69 1.456986526365e-04 1.194535490349e-03 1.054300174205e-03 5.865691832664e-10 1.737500000000e+00
70 1.223834694923e-04 1.195504582884e-03 1.077593516927e-03 1.150677988345e-08 1.762500000000e+00
71 1.019262303182e-04 1.196307568531e-03 1.097657241059e-03 2.082643005567e-07 1.787500000000e+00
72 8.381480436917e-05 1.196971656899e-03 1.109525476375e-03 3.329859617447e-06 1.812500000000e+00
73 6.668225222783e-05 1.197519877322e-03 1.024937206784e-03 5.419027048444e-05 1.837500000000e+00
68 1.723175379753e-04 1.193368249524e-03 1.027682402586e-03 2.970943178734e-11 1.712500000000e+00
69 1.456986526365e-04 1.194535490349e-03 1.054300174205e-03 5.865691832667e-10 1.737500000000e+00
70 1.223834694923e-04 1.195504582884e-03 1.077593516927e-03 1.150677988346e-08 1.762500000000e+00
71 1.019262303182e-04 1.196307568531e-03 1.097657241059e-03 2.082643005568e-07 1.787500000000e+00
72 8.381480436917e-05 1.196971656899e-03 1.109525476375e-03 3.329859617448e-06 1.812500000000e+00
73 6.668225222783e-05 1.197519877322e-03 1.024937206784e-03 5.419027048446e-05 1.837500000000e+00
74 5.053198367604e-05 1.197971659937e-03 7.350507107061e-04 2.072086528030e-04 1.862500000000e+00
75 3.879701357395e-05 1.198343349753e-03 5.356918142768e-04 3.127555860708e-04 1.887500000000e+00
75 3.879701357395e-05 1.198343349753e-03 5.356918142767e-04 3.127555860708e-04 1.887500000000e+00
76 3.007678322722e-05 1.198648658204e-03 4.021188008094e-04 3.839022079790e-04 1.912500000000e+00
77 2.344463549483e-05 1.198899057198e-03 3.068522371412e-04 4.348515636801e-04 1.937500000000e+00
78 1.834047972307e-05 1.199104120993e-03 2.366187847945e-04 4.725203677398e-04 1.962500000000e+00
77 2.344463549483e-05 1.198899057198e-03 3.068522371411e-04 4.348515636801e-04 1.937500000000e+00
78 1.834047972307e-05 1.199104120993e-03 2.366187847944e-04 4.725203677398e-04 1.962500000000e+00
79 1.438416333582e-05 1.199271821253e-03 1.838015689086e-04 5.009071338768e-04 1.987500000000e+00
80 1.130287552755e-05 1.199408780437e-03 1.435541337153e-04 5.225714953778e-04 2.012500000000e+00
81 8.894854154099e-06 1.199520488471e-03 1.125953626079e-04 5.392548916185e-04 2.037500000000e+00
Expand All @@ -86,13 +86,13 @@
84 4.362237388672e-06 1.199745698858e-03 5.532050326743e-05 5.701586296717e-04 2.112500000000e+00
85 3.445231625616e-06 1.199794545990e-03 4.384740222256e-05 5.763536830758e-04 2.137500000000e+00
86 2.722483623513e-06 1.199834157394e-03 3.481279241283e-05 5.812323619826e-04 2.162500000000e+00
87 2.152343734153e-06 1.199866246232e-03 2.768046312193e-05 5.850835965725e-04 2.187500000000e+00
87 2.152343734153e-06 1.199866246232e-03 2.768046312192e-05 5.850835965725e-04 2.187500000000e+00
88 1.702259902002e-06 1.199892215323e-03 2.203774543638e-05 5.881299973317e-04 2.212500000000e+00
89 1.346733078607e-06 1.199913211686e-03 1.756522033724e-05 5.905440232928e-04 2.237500000000e+00
90 1.065752199293e-06 1.199930171882e-03 1.401446577327e-05 5.924598910143e-04 2.262500000000e+00
91 8.435890597776e-07 1.199943859609e-03 1.119149963194e-05 5.939824556550e-04 2.287500000000e+00
92 6.678659094764e-07 1.199954896813e-03 8.944331673377e-06 5.951939012093e-04 2.312500000000e+00
93 5.288312745990e-07 1.199963789378e-03 7.153523668295e-06 5.961588225292e-04 2.337500000000e+00
92 6.678659094763e-07 1.199954896813e-03 8.944331673377e-06 5.951939012093e-04 2.312500000000e+00
93 5.288312745990e-07 1.199963789378e-03 7.153523668294e-06 5.961588225292e-04 2.337500000000e+00
94 4.187957414427e-07 1.199970948301e-03 5.724978921457e-06 5.969281126691e-04 2.362500000000e+00
95 3.316912256408e-07 1.199976707113e-03 4.584400974714e-06 5.975419539002e-04 2.387500000000e+00
96 2.627259549757e-07 1.199981336185e-03 3.673012861562e-06 5.980321305921e-04 2.412500000000e+00
Expand Down
4 changes: 2 additions & 2 deletions ex12.sel
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
2.83333 1.078314727713e+00 1.077198297073e+00 2.292280169464e+01 5.933476222844e+00
3.16666 6.047305557783e-01 6.039382767914e-01 2.339606171644e+01 4.701379781820e+00
3.5 3.237709470080e-01 3.232490525632e-01 2.367675094204e+01 3.667800399953e+00
3.83333 1.655104664086e-01 1.651896628001e-01 2.383481033299e+01 2.816701882844e+00
3.83333 1.655104664086e-01 1.651896628002e-01 2.383481033299e+01 2.816701882844e+00
4.16666 8.080257204240e-02 8.061777229753e-02 2.391938222449e+01 2.128773573946e+00
4.5 3.768568646672e-02 3.758557520676e-02 2.396241442239e+01 1.582986272153e+00
4.83333 1.679767756894e-02 1.674652868459e-02 2.398325346955e+01 1.157966472262e+00
Expand Down Expand Up @@ -107,7 +107,7 @@
13.5 1.456506511045e-03 1.450373187822e-03 2.399854962640e+01 2.689568433456e-01
13.8333 3.570772369452e-03 3.557230846966e-03 2.399644276858e+01 3.761696764504e-01
14.1667 8.372702446682e-03 8.344318209114e-03 2.399165568100e+01 5.167554989993e-01
14.5 1.876668623423e-02 1.871028306261e-02 2.398128971588e+01 6.972801618698e-01
14.5 1.876668623423e-02 1.871028306262e-02 2.398128971588e+01 6.972801618698e-01
14.8333 4.018855158439e-02 4.008246069532e-02 2.395991753791e+01 9.242091443386e-01
15.1667 8.218587185627e-02 8.199729506180e-02 2.391800270313e+01 1.203352315083e+00
15.5 1.604262488969e-01 1.601100284715e-01 2.383988996925e+01 1.539191520808e+00
Expand Down
12 changes: 6 additions & 6 deletions ex12a.sel
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,16 @@
0.5 1.732877230198e+01 1.732818349806e+01 6.671816494265e+00 2.011806700218e+01 9.000885944563e-08 3.998622946029e-05
0.833333 1.328083118787e+01 1.327977600374e+01 1.072022398538e+01 1.760855984595e+01
1.16667 9.764783869793e+00 9.763295612551e+00 1.423670437487e+01 1.521226338238e+01
1.5 6.876979954453e+00 6.875203671273e+00 1.712479631572e+01 1.296594983169e+01 1.040652470946e-06 5.706265744742e-05
1.5 6.876979954453e+00 6.875203671273e+00 1.712479631572e+01 1.296594983169e+01 1.040652470925e-06 5.706265744742e-05
1.83333 4.633445178532e+00 4.631592230628e+00 1.936840775690e+01 1.089878644681e+01
2.16667 2.983957613764e+00 2.982233846716e+00 2.101776614197e+01 9.031332911150e+00
2.5 1.835670035272e+00 1.834219344984e+00 2.216578064517e+01 7.375218041922e+00 3.202792299459e-06 1.617537638526e-05
2.5 1.835670035272e+00 1.834219344984e+00 2.216578064517e+01 7.375218041922e+00 3.202792299443e-06 1.617537638526e-05
2.83333 1.078309641703e+00 1.077193213980e+00 2.292280677773e+01 5.933464823767e+00
3.16667 6.047271172834e-01 6.039348411906e-01 2.339606515204e+01 4.701369003156e+00
3.5 3.237687663205e-01 3.232468743679e-01 2.367675312023e+01 3.667790507028e+00 5.217031892205e-06 -3.366526094913e-06
3.5 3.237687663205e-01 3.232468743679e-01 2.367675312023e+01 3.667790507028e+00 5.217031892201e-06 -3.366526094913e-06
3.83333 1.655091653734e-01 1.651883636811e-01 2.383481163211e+01 2.816693051604e+00
4.16667 8.080184009388e-02 8.061704168687e-02 2.391938295510e+01 2.128765894911e+00
4.5 3.768529738011e-02 3.758518697824e-02 2.396241481061e+01 1.582979760724e+00 5.639342372489e-06 -2.476867168243e-06
4.5 3.768529738011e-02 3.758518697824e-02 2.396241481061e+01 1.582979760724e+00 5.639342372485e-06 -2.476867168242e-06
4.83333 1.679748179371e-02 1.674633341902e-02 2.398325366481e+01 1.157961083143e+00
5.16667 7.158658672534e-03 7.133952391643e-03 2.399286604633e+01 8.331082803354e-01
5.5 2.918406916536e-03 2.907101078212e-03 2.399709289802e+01 5.894142528789e-01 4.455972089510e-06 -4.912290758279e-07
Expand All @@ -123,10 +123,10 @@
6.5 1.523110828883e-04 1.515144739607e-04 2.399984848524e+01 1.884278508358e-01 2.697942283073e-06 -4.814123673546e-08
6.83333 5.227158933236e-05 5.197321123247e-05 2.399994802660e+01 1.244614394110e-01
7.16667 1.720693831522e-05 1.710029263504e-05 2.399998289958e+01 8.078687428981e-02
7.5 5.436060934909e-06 5.399649415897e-06 2.399999460027e+01 5.153218579103e-02 1.262649985251e-06 -2.664487783140e-09
7.5 5.436060934909e-06 5.399649415897e-06 2.399999460027e+01 5.153218579103e-02 1.262649985252e-06 -2.664487783140e-09
7.83333 1.649088195275e-06 1.637200882995e-06 2.399999836275e+01 3.231618817631e-02
8.16667 4.806358157844e-07 4.769214798034e-07 2.399999952305e+01 1.995341519604e-02
8.5 1.346685590700e-07 1.335566766312e-07 2.399999986642e+01 1.218943044882e-02 2.986653145795e-07 -8.898265268245e-11
8.5 1.346685590700e-07 1.335566766312e-07 2.399999986642e+01 1.218943044882e-02 2.986653145795e-07 -8.898265268244e-11
8.83333 3.634651793240e-08 3.602679113544e-08 2.399999996396e+01 7.477181955864e-03
9.16667 9.688299803978e-09 9.597461159243e-09 2.399999999040e+01 4.798414843917e-03
9.5 3.521245209155e-09 3.486098607350e-09 2.399999999651e+01 3.529705336616e-03
Expand Down
1 change: 0 additions & 1 deletion ex13a.out
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ N(5) 1.000e-03
NO3- 1.000e-03 9.572e-04 -3.000 -3.019 -0.019 29.50
Na 1.000e-03
Na+ 1.000e-03 9.580e-04 -3.000 -3.019 -0.019 -1.47
NaOH 9.693e-21 9.696e-21 -20.014 -20.013 0.000 (0)
O(0) 5.110e-04
O2 2.555e-04 2.556e-04 -3.593 -3.592 0.000 30.40

Expand Down
1 change: 0 additions & 1 deletion ex13ac.out
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ N(5) 1.000e-03
NO3- 1.000e-03 9.572e-04 -3.000 -3.019 -0.019 29.50
Na 1.000e-03
Na+ 1.000e-03 9.580e-04 -3.000 -3.019 -0.019 -1.47
NaOH 9.693e-21 9.696e-21 -20.014 -20.013 0.000 (0)
O(0) 5.110e-04
O2 2.555e-04 2.556e-04 -3.593 -3.592 0.000 30.40

Expand Down
1 change: 0 additions & 1 deletion ex13b.out
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ N(5) 1.000e-03
NO3- 1.000e-03 9.572e-04 -3.000 -3.019 -0.019 29.50
Na 1.000e-03
Na+ 1.000e-03 9.580e-04 -3.000 -3.019 -0.019 -1.47
NaOH 9.693e-21 9.696e-21 -20.014 -20.013 0.000 (0)
O(0) 5.110e-04
O2 2.555e-04 2.556e-04 -3.593 -3.592 0.000 30.40

Expand Down
1 change: 0 additions & 1 deletion ex13c.out
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ N(5) 1.000e-03
NO3- 1.000e-03 9.572e-04 -3.000 -3.019 -0.019 29.50
Na 1.000e-03
Na+ 1.000e-03 9.580e-04 -3.000 -3.019 -0.019 -1.47
NaOH 9.693e-21 9.696e-21 -20.014 -20.013 0.000 (0)
O(0) 5.110e-04
O2 2.555e-04 2.556e-04 -3.593 -3.592 0.000 30.40

Expand Down
Loading

0 comments on commit 717e7c1

Please # to comment.