Darth Vader
8c967b1c0e
Merge commit 'd6b316ba3181d5e31486a0db01b13621ba293971'
2024-05-09 19:46:53 +00:00
Darth Vader
3587ae28e5
Merge commit '9882e3df3cca85659da2a430ffe240f895cdb272'
2024-05-09 19:46:51 +00:00
Darth Vader
9882e3df3c
Squashed 'src/' changes from c767e9c6..edd80cec
...
edd80cec Merge commit 'bacfb0ea50c83434d21d3b0c8eda18543ee8b89a'
bacfb0ea Squashed 'phreeqcpp/' changes from 60ccbf8..c035d9c
git-subtree-dir: src
git-subtree-split: edd80cecf2ebc91f889e31872355bb6450bc9c0a
2024-05-09 19:46:50 +00:00
Darth Vader
c276bbc3d1
Squashed 'database/' changes from 49d82d37..0d58080e
...
0d58080e fixed case of Kinec.v2.dat
71e10f57 Removed CALCULATE_VALUES, added MEAN_GAMMAS, made phreeqc_rates.dat, updated CMakeLists, ran all examples, added test case ss_kinetics
93ba7f97 Tony's latest databases
b6ecf248 added Kinec.v2.dat and updated RELEASE.TXT
git-subtree-dir: database
git-subtree-split: 0d58080e75184dc9c9020204ae6a2c300d0c7f02
2024-05-07 22:42:04 +00:00
Darth Vader
8f449a2172
Merge commit 'c276bbc3d1b583f58993073a7769447c0003fbac'
2024-05-07 22:42:04 +00:00
Darth Vader
a159b5af31
Squashed 'src/' changes from 8acfbb38..c767e9c6
...
c767e9c6 Merge commit '4a24a89572cca75b5919dabde3ac798c175bf899'
4a24a895 Squashed 'phreeqcpp/' changes from 0243c90..60ccbf8
git-subtree-dir: src
git-subtree-split: c767e9c6a1847ed4e968b2f45b5d9e4c7f69d429
2024-05-07 22:42:01 +00:00
Darth Vader
ac0a959f1b
Merge commit 'a159b5af317ba8b61dd3a6c9242a98e76829467d'
2024-05-07 22:42:01 +00:00
Darth Vader
4870c6a2e8
Merge commit '4a52c4cc317699d3d83723c7e3ea131dca7c4dd8'
2024-05-07 22:41:59 +00:00
Darth Vader
4a52c4cc31
Squashed 'phreeqc3-doc/' changes from 36acf3ff..54237d62
...
54237d62 removed CALCULATE_VALUES description
aaefea95 Removed CALCULATE_VALUES, added MEAN_GAMMAS, made phreeqc_rates.dat, updated CMakeLists, ran all examples, added test case ss_kinetics
e37ae0af Word from PDF for documentation
de06166d added put$ and get$ Basic functions. Added test cases get_put_ to test get$ and put$. Added kinetic_rates_carbfix to use new database kinec.v2.dat. Fixed pad$ to use strexpr.
543816f0 added Kinec.v2.dat and updated RELEASE.TXT
git-subtree-dir: phreeqc3-doc
git-subtree-split: 54237d62fcb0201e2c57889da9d284c6e3405431
2024-05-07 22:41:58 +00:00
Max Lübke
9df449db4f
Merge branch 'ml/fix-chemistry' into 'poet'
...
fix: Add missing "H" and "O" primaries
See merge request naaice/iphreeqc!5
2024-05-07 12:29:52 +02:00
Max Lübke
e6e5e0d515
fix: Add missing "H" and "O" primaries
2024-05-07 09:52:22 +00:00
Max Lübke
749fdbc2e9
Merge branch 'ml/add_wrapper' into 'poet'
...
Add wrapper classes to get/set values of Phreeqc Instance
See merge request naaice/iphreeqc!4
2024-05-06 11:56:05 +02:00
Max Lübke
9ef1111a39
Update Documentation
2024-05-06 09:53:13 +00:00
Max Luebke
8bdbb7bf6b
BREAKING CHANGE: Add wrappers for reactants to get/set values
2024-05-06 09:53:00 +00:00
Charlton, Scott R
5f00edf1ab
Use phreeqc.dat from 90a6449 for TestMultiPunchCSelectedOutput tests
2024-04-19 16:37:58 -06:00
Darth Vader
5898c60f38
Merge commit 'b1888bb5d68d0ae9736556acd5702d44448eb492'
2024-04-19 19:50:20 +00:00
Darth Vader
b1888bb5d6
Squashed 'src/' changes from 478318af..8acfbb38
...
8acfbb38 Merge branch 'master' into module
666e4b81 Issue 160 in phreeqc. llnl minimum temperature problem. There are several places where a SOLUTION is constructed to get lists or test the database. By default the SOLUTION is 25C, so if llnl has a minimum temperature greater (or maximum temperature less) than 25, an error is encountered. The fix is to change the temperature of the SOLUTIONs to the minimum temperature of the llnl grid if llnl is being used.
git-subtree-dir: src
git-subtree-split: 8acfbb384a34dead1b805f5ee33d7dcd6c0b3a13
2024-04-19 19:50:19 +00:00
Darth Vader
abbac3bb03
Merge commit '799a4e7ee471ab80ac21f4dceb7233324576c6da'
2024-04-18 21:18:02 +00:00
Darth Vader
799a4e7ee4
Squashed 'src/' changes from e8c03d16..478318af
...
478318af Merge commit 'f100f492a5750d4998da1daa4a3e9b14b245a0e8'
f100f492 Squashed 'phreeqcpp/' changes from 89d028d..0243c90
git-subtree-dir: src
git-subtree-split: 478318affeece3b1026a8c6a9d44264d61766bfa
2024-04-18 21:18:01 +00:00
Darth Vader
9d0b5a7440
Squashed 'phreeqc3-examples/' changes from fbe17c9e..a9d1de8f
...
a9d1de8f Updated output files (from windows)
47ace2e0 Changed examples/ex21 encoding to UTF-8
git-subtree-dir: phreeqc3-examples
git-subtree-split: a9d1de8fa2842e839fabadc1f4a49fe3afb23ab1
2024-04-18 20:08:49 +00:00
Darth Vader
8bd2c62315
Merge commit '9d0b5a7440499bf4adb70d39e2a743cc07f2380a'
2024-04-18 20:08:49 +00:00
Darth Vader
e53806d156
Squashed 'phreeqc3-examples/' changes from 5fe290be..fbe17c9e
...
fbe17c9e Tony's update to example 21
git-subtree-dir: phreeqc3-examples
git-subtree-split: fbe17c9e10e5d468a074faab593e07b63dda68fe
2024-04-18 18:17:14 +00:00
Darth Vader
e64f73da33
Merge commit 'e53806d1564015bc179c2b479c305c5ac8a279b3'
2024-04-18 18:17:14 +00:00
Darth Vader
519b2e6b4c
Squashed 'database/' changes from bae20ea7..49d82d37
...
49d82d37 fix for new Valgrind problem. Added a newer CEMDATA database for the database collection.
ad2440a3 Tony changes 20240414, with correction to CH4 Vm. Changes to src. seaw_SC expanded.
b3469711 Merge branch 'master' into viscosity
87eeeec8 Merge branch 'master' into viscosity
git-subtree-dir: database
git-subtree-split: 49d82d37607fa4814aa4f13df0960ffd36e8fdcf
2024-04-18 18:17:13 +00:00
Darth Vader
4080dd2f0c
Merge commit '519b2e6b4c364a454a491ad8791473097fbd370c'
2024-04-18 18:17:13 +00:00
Darth Vader
1d8783186c
Squashed 'src/' changes from b4a42445..e8c03d16
...
e8c03d16 Merge commit 'c378c74d7f2510092a8fca311f7ffbbb7ed96f1d'
c378c74d Squashed 'phreeqcpp/' changes from 7284fed..89d028d
git-subtree-dir: src
git-subtree-split: e8c03d169346861db62629edb0ca43e1fd688be9
2024-04-18 18:17:11 +00:00
Darth Vader
c76339d766
Merge commit '1d8783186c3d231e5ca909a0427cb33b2c29d558'
2024-04-18 18:17:11 +00:00
Darth Vader
6bfe0dbbab
Squashed 'phreeqc3-doc/' changes from e30aa466..36acf3ff
...
36acf3ff updated RELEASE.TXT
git-subtree-dir: phreeqc3-doc
git-subtree-split: 36acf3ff50e03e7985f71c24eb196e8f43e875c7
2024-04-18 18:17:09 +00:00
Darth Vader
0cec5dbf66
Merge commit '6bfe0dbbabf4a194c69c3f32bf7314896e3efcc9'
2024-04-18 18:17:09 +00:00
Darth Vader
4a0af1be39
Squashed 'database/' changes from 22eb9506..bae20ea7
...
bae20ea7 Merge pull request #45 from dlparkhurst/viscosity
d18452f3 All test cases run. Fixed CALCULATED_VALUES and RATES in Amm.dat and phreeqc.dat
5c6d1c5a Tony's changes Mar 15, 2024
39130824 Tony's changes Mar 15, 2024
bc1f8f86 Tony's changes Mar 15, 2024
3318883e Tony's Mar 15, changes.
77038cb6 modified NH3 from Tony's Amm.dat
e510f752 Tony's changes 2/12/2024
git-subtree-dir: database
git-subtree-split: bae20ea7e849a914e6abea15c71cdad69db68db7
2024-04-17 00:17:32 +00:00
Darth Vader
492db1c5b2
Merge commit '4a0af1be39596d05b048931f9b3f25b1ae93e4b1'
2024-04-17 00:17:32 +00:00
Darth Vader
ccdbd0ce20
Squashed 'src/' changes from 2dcf4062..b4a42445
...
b4a42445 Merge commit '1ebe8191c254ea7a50f20876ef1bf21450f7887a'
1ebe8191 Squashed 'phreeqcpp/' changes from 87919a0..7284fed
git-subtree-dir: src
git-subtree-split: b4a424453b03269c6af9be2fd5f0d7a7e63b5eb4
2024-04-17 00:17:30 +00:00
Darth Vader
a9dc9b84f8
Merge commit 'ccdbd0ce2040eb00006775fe0cf2ab2faf4138b5'
2024-04-17 00:17:30 +00:00
Darth Vader
80ab6f112d
Squashed 'phreeqc3-doc/' changes from f289b94c..e30aa466
...
e30aa466 merged master into viscosity
c86d4366 release.txt
git-subtree-dir: phreeqc3-doc
git-subtree-split: e30aa466d8b6ef81ec0543f481d885ee0bbe992f
2024-04-17 00:17:29 +00:00
Darth Vader
be441d7f80
Merge commit '80ab6f112d777072ba8708838991b3d00ee7bb2d'
2024-04-17 00:17:29 +00:00
Darth Vader
8e1a4d0836
Squashed 'database/' changes from 976555e2..22eb9506
...
22eb9506 normalized text files
git-subtree-dir: database
git-subtree-split: 22eb9506866dbce35ae69811760e51e5fc785b5c
2024-04-05 17:14:37 +00:00
Darth Vader
6fb40a2b32
Merge commit '8e1a4d08360d4dbfa1505460fa5323ca24085528'
2024-04-05 17:14:37 +00:00
Darth Vader
63ca4c7ef4
Squashed 'src/' changes from 6fd34ae3..2dcf4062
...
2dcf4062 normalized text files
git-subtree-dir: src
git-subtree-split: 2dcf40623ff462e2b379cd5f8ed8299928d0a6fd
2024-04-05 17:14:35 +00:00
Darth Vader
894d25fb5a
Merge commit '63ca4c7ef4b0202b4b6c6cd3463158dc10bfa758'
2024-04-05 17:14:35 +00:00
Max Lübke
4ec8b7006c
Merge branch 'add-solution-names-func' into 'poet'
...
Add getSolutionNames() method to IPhreeqcPOET.hpp
See merge request naaice/iphreeqc!3
2024-04-03 14:28:19 +02:00
Max Luebke
c645eea842
Add getSolutionNames() method to IPhreeqcPOET.hpp
2024-04-03 12:28:08 +00:00
Max Lübke
c0c830eab7
Merge branch 'fix-cell-queuing' into 'poet'
...
Fix reset of cell queue pointer
See merge request naaice/iphreeqc!2
2024-04-03 12:45:57 +02:00
Max Luebke
a554c3fa4f
Fix reset of cell queue pointer
2024-04-03 10:45:41 +00:00
Max Lübke
daeecf1126
Merge branch 'tmp/ml' into 'poet'
...
Add Run_Cells functionality
See merge request naaice/iphreeqc!1
2024-04-02 13:34:28 +02:00
Max Luebke
3e43e0e6db
Fix cell copy functionality in constructor
2024-04-02 11:33:14 +00:00
Max Lübke
f695619875
Add queueCell, dequeueCells, runQueuedCells, setCell, and getCell methods
2024-03-28 14:23:05 +00:00
Max Lübke
d6e7130746
Update IPhreeqcPOET constructor to use LoadDatabaseString and RunString methods
2024-03-19 13:11:33 +00:00
Max Lübke
b34c327377
Refactor getModuleSizes method and remove commented code
2024-03-19 08:57:53 +00:00
Max Luebke
d92ab31765
Refactor API
2024-03-18 23:05:59 +01:00
Scott R Charlton
a0f62fd540
increased the number of lines
2024-03-14 17:01:29 -06:00
