2201 Commits

Author SHA1 Message Date
SpaceIm
c244641700 add missing include of stddef.h in IPhreeqc.h if no fortran module
when IPHREEQC_NO_FORTRAN_MODULE is defined, the type of the last parameter of SetBasicFortranCallback is size_t, which is defined in stddef.h
2024-08-11 20:55:26 +02:00
Darth Vader
4c58a0f6b7 Merge commit '7c714dfbd3c917247c9c9346799bb3fa1b9dee16' 2024-07-11 17:09:41 +00:00
Darth Vader
178b05c251 Merge commit '9a4caf7def182e3f6aa3caa5024c7af821663b65' 2024-07-11 17:08:34 +00:00
Darth Vader
9a4caf7def Squashed 'phreeqcpp/' changes from e4c4cf3..587223f
587223f Extra check to not dump negative user numbers

git-subtree-dir: phreeqcpp
git-subtree-split: 587223f4d35ddca5105498f1f0ef31638f748562
2024-07-11 17:08:34 +00:00
Darth Vader
78f374b831 Merge commit '0e2456f051d9e2ad6f61f899721fa8ab2db1a30c' 2024-06-20 21:53:22 +00:00
Darth Vader
0da302aedf Merge commit '2abb0b0bcd4bcae42f84ff001aba7f2ab6df2af7' 2024-06-20 21:52:29 +00:00
Darth Vader
2abb0b0bcd Squashed 'phreeqcpp/' changes from 798f8f9..e4c4cf3
e4c4cf3 Added functions SPECIES_EQUATION and PHASE_EQUATION, and species_equation test case.

git-subtree-dir: phreeqcpp
git-subtree-split: e4c4cf31fb54a3546e6bdbb1fda762952803fd82
2024-06-20 21:52:29 +00:00
Darth Vader
0517529467 Merge commit '231f8e36589ed86c2270d0915bb91cc74b4a15ef' 2024-06-11 00:59:17 +00:00
Darth Vader
1a84cced60 Merge commit 'a9c4ef8324b6c59ba5cf0d78fc0d8ef93b33923f' 2024-06-11 00:58:18 +00:00
Darth Vader
a9c4ef8324 Squashed 'phreeqcpp/' changes from ceab9a1..798f8f9
798f8f9 Merge commit '3eaa057b5d2bbc9327f2ab3adfd52577c687cfca'
3eaa057 Squashed 'common/' changes from 6abe004..399aba2
4cad3d5 [iphreeqc] Fixed for R

git-subtree-dir: phreeqcpp
git-subtree-split: 798f8f9d827d6ba7cf6a6d0c9a1fd3c7e806c72c
2024-06-11 00:58:17 +00:00
Darth Vader
ab92280593 Merge commit '1ec7448cb08f1cc2917b33e3337946a8da23208f' 2024-06-11 00:57:31 +00:00
Charlton, Scott R
279b84357d [iphreeqc] Fixed for R 2024-06-10 18:55:01 -06:00
Charlton, Scott R
a8ac479491 [iphreeqc] Fixed for R 2024-06-10 18:55:01 -06:00
Darth Vader
ca0ba8d528 Merge commit 'ed24ec246bbfdcd57adbd0d4a9e8fe088a5de5b7' 2024-06-07 21:56:59 +00:00
Darth Vader
8024ee1289 Squashed 'phreeqcpp/' changes from e2f4d06..ceab9a1
ceab9a1 Tony's change to Sr and NH4, SC_Ohm and rate_xmpls, basicsubs.cpp error

git-subtree-dir: phreeqcpp
git-subtree-split: ceab9a1033d2046c72a6bcf19c2c2244e8b23f97
2024-06-07 21:56:13 +00:00
Darth Vader
2b17f7ca91 Merge commit '8024ee12891fde0332b86544b2b18010a91fde15' 2024-06-07 21:56:13 +00:00
Darth Vader
051687d391 Merge commit '9ba726de0f8b36a9143922bf148f6a259982756a' 2024-05-29 19:06:22 +00:00
Darth Vader
067a8b1aaa Squashed 'phreeqcpp/' changes from 3d5242f..e2f4d06
e2f4d06 updated InternalCopy
d8abe83 Fixed problem with N vs NO3, for example, converting units with calculated density. Now gives same result for N or NO3.

git-subtree-dir: phreeqcpp
git-subtree-split: e2f4d060cd01b0b9912f0da7aa6c7cc20f77a9c5
2024-05-29 19:05:39 +00:00
Darth Vader
795112031b Merge commit '067a8b1aaa326cecf6a1b5a167fe88448ef1e0b2' 2024-05-29 19:05:39 +00:00
Darth Vader
967cc4e68e Merge commit '7552f8f680a41d12454080cc1174765c86bb6354' 2024-05-27 19:32:06 +00:00
Darth Vader
fb3f60ce26 Merge commit '09af2d5b127a8efe403f47751c7c8465ec94874d' 2024-05-27 19:31:41 +00:00
Darth Vader
09af2d5b12 Squashed 'phreeqcpp/' changes from cb6d9f4..3d5242f
3d5242f bug in processing ISOTOPE_RATIOS
034e921 added commented code to check e- in non-master species.

git-subtree-dir: phreeqcpp
git-subtree-split: 3d5242f5ccaf56cbcad48d33caee0340fb97da65
2024-05-27 19:31:40 +00:00
Darth Vader
bbcb4c0ec7 Merge commit '06332bcb62daece34f3818f46e11064a56799f23' 2024-05-16 01:05:21 +00:00
Darth Vader
70e32eba2f Merge commit '0b3f349ad3bb84d493fc4d54bb6537a1fcafbc15' 2024-05-16 01:04:33 +00:00
Darth Vader
0b3f349ad3 Squashed 'phreeqcpp/' changes from 07c887a..cb6d9f4
cb6d9f4 [phreeqci] Fixed phreeqci memory leaks
77df73c [phreeqci] Fixed memory leak for phreeqci
38a34f7 [phreeqci] Removed trailing whitespace

git-subtree-dir: phreeqcpp
git-subtree-split: cb6d9f49b0957bc431c0eca2c21711bfde4411e7
2024-05-16 01:04:33 +00:00
Darth Vader
ad75e79efe Merge commit '51648664f6f6550440d014f3a985ef9d575c02bd' 2024-05-13 18:46:19 +00:00
Darth Vader
e871614214 Merge commit '1efeb356693a42a67a7d7ccf60982c06e882dfdf' 2024-05-13 18:45:27 +00:00
Darth Vader
1efeb35669 Squashed 'phreeqcpp/' changes from 8f6cb45..07c887a
07c887a [phreeqci] Removed assert since svn -r8264(3.1.0 -- 2013-11-27) fails opening ex6

git-subtree-dir: phreeqcpp
git-subtree-split: 07c887a02026b1c0bfc6019d09b8ed45e22bb678
2024-05-13 18:45:27 +00:00
Darth Vader
a162eb9ebb Merge commit 'fff75534d73a06719ce2fbb482f843e0fb9dc4c6' 2024-05-10 20:36:55 +00:00
Darth Vader
78fa3ba34e Merge commit '97a4237601d215dd712df5fee01399c9c2841ff8' 2024-05-10 20:36:07 +00:00
Darth Vader
97a4237601 Squashed 'phreeqcpp/' changes from c035d9c..8f6cb45
8f6cb45 Pad needed a free. Ran all test cases.
56ba680 Freed result from strexpr

git-subtree-dir: phreeqcpp
git-subtree-split: 8f6cb45a04ca40ea253c0f3ca90f52427d99592d
2024-05-10 20:36:07 +00:00
Darth Vader
fcaf4393f9 Merge commit '9882e3df3cca85659da2a430ffe240f895cdb272' 2024-05-09 19:46:51 +00:00
Darth Vader
edd80cecf2 Merge commit 'bacfb0ea50c83434d21d3b0c8eda18543ee8b89a' 2024-05-09 19:46:42 +00:00
Darth Vader
bacfb0ea50 Squashed 'phreeqcpp/' changes from 60ccbf8..c035d9c
c035d9c Tony updates to phreeqc_rates.dat. Added albite_rates. Copy/paste error in read.cpp
fcec621 basicsubs.cpp fix from Tony
e5b4b11 Fixed some HTML, still a problem with colors of links.

git-subtree-dir: phreeqcpp
git-subtree-split: c035d9c3b76f807db7d87066c235c9f6867e5497
2024-05-09 19:46:42 +00:00
Darth Vader
894d1c4dbf Merge commit 'a159b5af317ba8b61dd3a6c9242a98e76829467d' 2024-05-07 22:42:01 +00:00
Darth Vader
c767e9c6a1 Merge commit '4a24a89572cca75b5919dabde3ac798c175bf899' 2024-05-07 22:41:18 +00:00
Darth Vader
4a24a89572 Squashed 'phreeqcpp/' changes from 0243c90..60ccbf8
60ccbf8 Removed CALCULATE_VALUES, added MEAN_GAMMAS, made phreeqc_rates.dat, updated CMakeLists, ran all examples, added test case ss_kinetics
baa0eee Added a little error checking to tokrate_pk
50d999b Tony added table numbers, kinetic_rates_plus has complete tables.
bf054e3 Finished up mean_gammas keyword and test case. Tony has some new changes I need to add.
8c561f0 Implemented rate parameters PK, SVD, Hermanska
5998b71 Added Basic function RATE_PK and RATE_SVERDRUP
c881283 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.

git-subtree-dir: phreeqcpp
git-subtree-split: 60ccbf83563b6f60011e37200b0357361e9e6379
2024-05-07 22:41:18 +00:00
Darth Vader
01a8b140bc Merge commit 'b1888bb5d68d0ae9736556acd5702d44448eb492' 2024-04-19 19:50:20 +00:00
David Parkhurst
8acfbb384a Merge branch 'master' into module 2024-04-18 17:20:59 -06:00
Darth Vader
1ba2653786 Merge commit '799a4e7ee471ab80ac21f4dceb7233324576c6da' 2024-04-18 21:18:02 +00:00
Darth Vader
f100f492a5 Squashed 'phreeqcpp/' changes from 89d028d..0243c90
0243c90 Updated to build in vs2005

git-subtree-dir: phreeqcpp
git-subtree-split: 0243c905af6767a3777640ad6b89de56ec5ab4b7
2024-04-18 21:17:18 +00:00
Darth Vader
478318affe Merge commit 'f100f492a5750d4998da1daa4a3e9b14b245a0e8' 2024-04-18 21:17:18 +00:00
Darth Vader
ff96607411 Merge commit '1d8783186c3d231e5ca909a0427cb33b2c29d558' 2024-04-18 18:17:11 +00:00
Darth Vader
c378c74d7f Squashed 'phreeqcpp/' changes from 7284fed..89d028d
89d028d Tony's fix for Valgrind error in Debye1.
9716b89 fix for new Valgrind problem. Added a newer CEMDATA database for the database collection.
eee3969 Merge branch 'master' into viscosity
b575463 Merge branch 'master' into viscosity
b74423e Issue resolution to be tested: Valgrind-Conditional jump or move depends on uninitialised value (SC) #48
67a69ae Tony changes 20240414, with correction to CH4 Vm. Changes to src. seaw_SC expanded.
34b880c Merge branch 'master' into viscosity
1819d3a Merge branch 'master' into viscosity

git-subtree-dir: phreeqcpp
git-subtree-split: 89d028d8321339d90539869f46da1143f23d4025
2024-04-18 18:16:55 +00:00
Darth Vader
e8c03d1693 Merge commit 'c378c74d7f2510092a8fca311f7ffbbb7ed96f1d' 2024-04-18 18:16:55 +00:00
Darth Vader
f23a7381b2 Merge commit 'ccdbd0ce2040eb00006775fe0cf2ab2faf4138b5' 2024-04-17 00:17:30 +00:00
Darth Vader
1ebe8191c2 Squashed 'phreeqcpp/' changes from 87919a0..7284fed
7284fed Fixed alignment for some of the utf-8
7babc4b Changed sprintf to snprintf
0d90285 Changed encoding to utf-8
3e00b23 Merge pull request #45 from dlparkhurst/viscosity
4aa8034 merged master into viscosity
166aec1 Tony tweak of t3 in transport.cpp
6a4443d used density_x. Added xsoln_visc test case
4ad0613 removed viscos_x and density_x
269d107 Tony's changes Mar 15, 2024
f50111a Tony's changes with added test cases. All test cases run

git-subtree-dir: phreeqcpp
git-subtree-split: 7284fed50f48610d24dc565cb530f6444940b4a3
2024-04-17 00:16:57 +00:00
Darth Vader
b4a424453b Merge commit '1ebe8191c254ea7a50f20876ef1bf21450f7887a' 2024-04-17 00:16:57 +00:00
David Parkhurst
666e4b813e 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. 2024-04-15 18:21:29 -06:00
Darth Vader
15388e0f19 Merge commit '63ca4c7ef4b0202b4b6c6cd3463158dc10bfa758' 2024-04-05 17:14:35 +00:00