Skip to content

Commit

Permalink
[phreeqc] Updated for latest databases
Browse files Browse the repository at this point in the history 
From merge pull request #65 from dlparkhurst/viscosity
  • Loading branch information
@scharlton2
scharlton2 committed Jun 7, 2024
1 parent 8b00f12 commit 1483320
Show file tree
Hide file tree
Showing 76 changed files with 16,198 additions and 16,195 deletions.
11 changes: 6 additions & 5 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,17 @@
/diffs
/examples/ex21.log
/examples/phreeqc.log
/mytest_tony.zip
/mytest_tony/
/mytest/.gitignore
/mytest/*_101.sel.expected
/mytest/DFmodel7.xls
/mytest/ILLITIZATION test.xls
/mytest/Zn1e_4
/mytest/Zn1e_7
/mytest/dump
/mytest/error.inp
/mytest/ILLITIZATION test.xls
/mytest/t
/mytest_tony.zip
/mytest_tony/
/mytest/Zn1e_4
/mytest/Zn1e_7
/phreeqcpp.VC.db
/phreeqcpp2015.VC.db
/src/phreeqc.aps
Expand Down
2 changes: 1 addition & 1 deletion examples/ex21.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ WARNING: USER_PUNCH: Headings count does not match number of calls to PUNCH.

pH = 7.600
pe = 13.120 Equilibrium with O2(g)
Specific Conductance (µS/cm, 23°C) = 29069
Specific Conductance (µS/cm, 23°C) = 29068
Density (g/cm³) = 1.01168
Volume (L) = 0.20147
Viscosity (mPa s) = 0.96935
Expand Down
36 changes: 18 additions & 18 deletions mytest/Goldsack.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ Initial solution 13.

pH = 5.294 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 111968
Specific Conductance (µS/cm, 25°C) = 127099
Density (g/cm³) = 1.08819
Volume (L) = 1.04494
Viscosity (mPa s) = 1.21496
Expand Down Expand Up @@ -959,7 +959,7 @@ Initial solution 14.

pH = 5.186 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 153898
Specific Conductance (µS/cm, 25°C) = 187207
Density (g/cm³) = 1.11562
Volume (L) = 1.07847
Viscosity (mPa s) = 1.34332
Expand Down Expand Up @@ -1028,7 +1028,7 @@ Initial solution 15.

pH = 5.121 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 197400
Specific Conductance (µS/cm, 25°C) = 254456
Density (g/cm³) = 1.16279
Volume (L) = 1.12208
Viscosity (mPa s) = 1.66915
Expand Down Expand Up @@ -1097,7 +1097,7 @@ Initial solution 16.

pH = 5.072 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 239622
Specific Conductance (µS/cm, 25°C) = 318892
Density (g/cm³) = 1.20404
Volume (L) = 1.16801
Viscosity (mPa s) = 2.07271
Expand Down Expand Up @@ -1166,7 +1166,7 @@ Initial solution 17.

pH = 5.039 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 251640
Specific Conductance (µS/cm, 25°C) = 337302
Density (g/cm³) = 1.18230
Volume (L) = 1.18530
Viscosity (mPa s) = 1.75024
Expand Down Expand Up @@ -1235,7 +1235,7 @@ Initial solution 18.

pH = 5.076 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 221516
Specific Conductance (µS/cm, 25°C) = 291183
Density (g/cm³) = 1.16233
Volume (L) = 1.14882
Viscosity (mPa s) = 1.61888
Expand Down Expand Up @@ -1304,7 +1304,7 @@ Initial solution 19.

pH = 5.370 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 141154
Specific Conductance (µS/cm, 25°C) = 152591
Density (g/cm³) = 1.09561
Volume (L) = 1.05257
Viscosity (mPa s) = 1.10499
Expand Down Expand Up @@ -1371,7 +1371,7 @@ Initial solution 20.

pH = 5.345 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 195726
Specific Conductance (µS/cm, 25°C) = 213997
Density (g/cm³) = 1.14083
Volume (L) = 1.07800
Viscosity (mPa s) = 1.17995
Expand Down Expand Up @@ -1438,7 +1438,7 @@ Initial solution 21.

pH = 5.330 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 247480
Specific Conductance (µS/cm, 25°C) = 269175
Density (g/cm³) = 1.18293
Volume (L) = 1.10438
Viscosity (mPa s) = 1.16564
Expand Down Expand Up @@ -1505,7 +1505,7 @@ Initial solution 22.

pH = 5.304 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 165315
Specific Conductance (µS/cm, 25°C) = 183442
Density (g/cm³) = 1.11041
Volume (L) = 1.06829
Viscosity (mPa s) = 1.14441
Expand Down Expand Up @@ -1572,7 +1572,7 @@ Initial solution 23.

pH = 5.418 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 172862
Specific Conductance (µS/cm, 25°C) = 184938
Density (g/cm³) = 1.12682
Volume (L) = 1.06208
Viscosity (mPa s) = 1.15495
Expand Down Expand Up @@ -1639,7 +1639,7 @@ Initial solution 24.

pH = 5.256 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 186890
Specific Conductance (µS/cm, 25°C) = 211742
Density (g/cm³) = 1.12426
Volume (L) = 1.08452
Viscosity (mPa s) = 1.17833
Expand Down Expand Up @@ -1709,7 +1709,7 @@ Initial solution 25.

pH = 5.164 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 150410
Specific Conductance (µS/cm, 25°C) = 161855
Density (g/cm³) = 1.08944
Volume (L) = 1.05999
Viscosity (mPa s) = 1.01578
Expand Down Expand Up @@ -1793,7 +1793,7 @@ Initial solution 26.

pH = 5.079 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 231843
Specific Conductance (µS/cm, 25°C) = 266528
Density (g/cm³) = 1.16614
Volume (L) = 1.12301
Viscosity (mPa s) = 1.23281
Expand Down Expand Up @@ -1877,7 +1877,7 @@ Initial solution 27.

pH = 5.040 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 272579
Specific Conductance (µS/cm, 25°C) = 334020
Density (g/cm³) = 1.22912
Volume (L) = 1.19141
Viscosity (mPa s) = 1.58623
Expand Down Expand Up @@ -1961,7 +1961,7 @@ Initial solution 28.

pH = 5.140 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 192544
Specific Conductance (µS/cm, 25°C) = 207111
Density (g/cm³) = 1.12348
Volume (L) = 1.08037
Viscosity (mPa s) = 1.06586
Expand Down Expand Up @@ -2045,7 +2045,7 @@ Initial solution 29.

pH = 5.163 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 189309
Specific Conductance (µS/cm, 25°C) = 201390
Density (g/cm³) = 1.12617
Volume (L) = 1.07825
Viscosity (mPa s) = 1.01592
Expand Down Expand Up @@ -2129,7 +2129,7 @@ Initial solution 30.

pH = 5.066 Charge balance
pe = 4.000
Specific Conductance (µS/cm, 25°C) = 243733
Specific Conductance (µS/cm, 25°C) = 292631
Density (g/cm³) = 1.17604
Volume (L) = 1.14489
Viscosity (mPa s) = 1.30944
Expand Down
36 changes: 18 additions & 18 deletions mytest/Goldsack_101.sel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
4.000000157764 288120.1062741245 1.0642413678
3.000000156681 207220.1936713207 1.1292887983
3.000000157857 264557.4470803356 0.8973480402
1.563224081892 111968.6702431299 1.2149573400
2.222017027728 153898.3698556124 1.3433203564
3.094258770377 197400.6940837194 1.6691524140
3.915507695684 239622.7082662762 2.0727059410
3.985848388425 251640.1713576086 1.7502361940
3.422991626001 221516.5804727757 1.6188777422
1.794778033675 141154.3304914952 1.1049917511
2.611188227098 195726.9905357990 1.1799548775
3.417021882613 247480.3554042355 1.1656425305
2.152855659898 165315.7345589669 1.1444092896
2.262837484641 172862.1401477423 1.1549496771
2.490497934628 186890.6557892666 1.1783331163
1.787582727362 150410.9230833254 1.0157752749
3.405353359221 231843.9351707701 1.2328106491
4.956719314079 272579.2991272743 1.5862270470
2.477685760903 192544.0637346264 1.0658610002
2.279946190134 189309.9236164440 1.0159248928
3.641777952830 243733.3686806768 1.3094351185
1.563224081892 127099.6357694251 1.2149573400
2.222017027728 187207.0669577063 1.3433203564
3.094258770377 254456.2641834438 1.6691524140
3.915507695684 318892.8498841393 2.0727059410
3.985848388425 337302.5882652944 1.7502361940
3.422991626001 291183.0459431470 1.6188777422
1.794778033675 152591.7448587659 1.1049917511
2.611188227098 213997.7704486150 1.1799548775
3.417021882613 269175.1333004005 1.1656425305
2.152855659898 183442.1569761938 1.1444092896
2.262837484641 184938.9651877409 1.1549496771
2.490497934628 211742.7466706206 1.1783331163
1.787582727362 161855.3373382548 1.0157752749
3.405353359221 266528.2354445464 1.2328106491
4.956719314079 334020.1056707833 1.5862270470
2.477685760903 207111.8149712472 1.0658610002
2.279946190134 201390.6563645338 1.0159248928
3.641777952830 292631.6789339752 1.3094351185
Loading

0 comments on commit 1483320

Please # to comment.