2004 Commits

Author SHA1 Message Date
Darth Vader
1f19e9893b Merge commit '9172a45eb2d9bc13d777272d8320ebda14e78937' 2024-10-11 19:12:45 +00:00
Darth Vader
9172a45eb2 Squashed 'phreeqcpp/' changes from ead498a..8c0d001
8c0d001 Changed Lamda to Lambda, but retained backward compatibility

git-subtree-dir: phreeqcpp
git-subtree-split: 8c0d00166b66af612f75b87eebc47f0badc6ce37
2024-10-11 19:12:45 +00:00
Darth Vader
4f8c3967aa Merge commit '792cdda06002b1ebc354b23ca1af4edcdbd24c26' 2024-10-08 22:02:03 +00:00
Darth Vader
792cdda060 Squashed 'phreeqcpp/' changes from c876219..ead498a
ead498a Merge pull request #79 from dlparkhurst/mix_error
4409349 fixed error with MIX that Scott found on merge.

git-subtree-dir: phreeqcpp
git-subtree-split: ead498ab60e71b7175c0e4bc6468a0804851ac20
2024-10-08 22:02:03 +00:00
Darth Vader
d6a74675d7 Merge commit '4e80a54467a084df3b666c7d6fc56a4798fd3301' 2024-10-08 20:05:00 +00:00
Darth Vader
4e80a54467 Squashed 'phreeqcpp/' changes from 7c7fafd..c876219
c876219 Merge commit '64310ada821d1cc387af4507db7029fe3326784b'
64310ad Squashed 'common/' changes from 399aba2..648db22

git-subtree-dir: phreeqcpp
git-subtree-split: c876219b1b064ab7c17e0bc4ad8bff13e0aeb108
2024-10-08 20:05:00 +00:00
Darth Vader
0209fdf9c7 Merge commit 'b537589773f4819fe97ff8e5322bcd38c54b63f7' 2024-10-08 20:04:33 +00:00
Darth Vader
b537589773 Squashed 'phreeqcpp/' changes from e317dd0..7c7fafd
7c7fafd Merge pull request #78 from dlparkhurst/mix_error
eb0591c Merge pull request #74 from mwtoews/fix-typos
334df5e Tony's fix in heat transport
bf897a2 Marked old error in mix. Updated test case.
58566a6 Fix ah2o in adding a solution. Fixed bad_graph database.
75effd0 Merge branch 'viscosity' into mix_error
f4708df account for water mass in addition to mixing fractions
70954c6 mixing by water mass times mixing fraction
84b59ab Fix typos

git-subtree-dir: phreeqcpp
git-subtree-split: 7c7fafd686d7c41753132a978a1d55d4d25b601b
2024-10-08 20:04:33 +00:00
Darth Vader
ac39375609 Merge commit 'c155685f6393b3cd780a56e72651eb79ea5f4bc1' 2024-09-24 22:02:30 +00:00
Darth Vader
c155685f63 Squashed 'phreeqcpp/' changes from fdc0bb5..e317dd0
e317dd0 Guarded case with no points in curves for log axes. Added bad_graph test case.

git-subtree-dir: phreeqcpp
git-subtree-split: e317dd0e41bbfd18abd2255ab5f2cf3933cd4c69
2024-09-24 22:02:30 +00:00
Darth Vader
a0bffdbc3f Merge commit '8f7d206a800852d06bc9a1230320fd670dd34473' 2024-08-29 21:04:42 +00:00
Darth Vader
8f7d206a80 Squashed 'phreeqcpp/' changes from c477ba1..fdc0bb5
fdc0bb5 fixed nullptr for pre-c++11

git-subtree-dir: phreeqcpp
git-subtree-split: fdc0bb51869877771df528f727fe577f58877c7d
2024-08-29 21:04:42 +00:00
Darth Vader
7e60110c31 Merge commit '45befa710880429a2a04cbc0294e83e0f2ce66b9' 2024-08-29 19:02:04 +00:00
Darth Vader
45befa7108 Squashed 'phreeqcpp/' changes from faf8144..c477ba1
c477ba1 Converted to utf-8
53b14b4 Tony fixed latest viscosity bug in surface calculations
2375f7b fixed mismatched ifdef
84ad1ce Tony's changes. [200~Added variable viscos_DDL in EDL(viscos_DDL, surface_name) to give the viscosity of a Donnan layer on a surface in BASIC. Note that the surface_name should not contain an underscore _, the Donnan properties are for the surface, not for surface charge, thus use the surface name Hfo, not Hfo_w. If surface_name is omitted, the viscosity is given for the first surface in the alphabetical order.

git-subtree-dir: phreeqcpp
git-subtree-split: c477ba119a0ecfa4361b88f0b49523847a1a03bc
2024-08-29 19:02:04 +00:00
Darth Vader
f627828fb5 Merge commit 'c1c1f286b61ca73ae3204c7fa4831bb2e3066070' 2024-08-15 17:08:49 +00:00
Darth Vader
c1c1f286b6 Squashed 'phreeqcpp/' changes from b6a23a2..faf8144
faf8144 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57)

git-subtree-dir: phreeqcpp
git-subtree-split: faf81447ee82e86ce3b2cb9d71fd81316cccfd9f
2024-08-15 17:08:49 +00:00
Charlton, Scott R
d051e14c0b Merge remote-tracking branch 'usgs-coupled/master' 2024-08-15 11:04:30 -06:00
Charlton, Scott R
7ad5a592a7 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57)
Change char* -> const char* for callbacks
2024-08-15 10:12:44 -06:00
Darth Vader
88d5ec2035 Squashed 'phreeqcpp/' changes from 587223f..b6a23a2
b6a23a2 reorder classes in global_structures.h to avoid incomplete definitions

git-subtree-dir: phreeqcpp
git-subtree-split: b6a23a2457530f9ca6e13fe4f0c226db3bba48af
2024-08-14 21:44:26 +00:00
Darth Vader
2bcb24a86a Merge commit '88d5ec20353fab67149768c11765c3c248ee0cea' 2024-08-14 21:44:26 +00:00
Charlton, Scott R
d3b4b10b79 Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran
Add missing include of stddef.h in IPhreeqc.h when IPHREEQC_NO_FORTRAN_MODULE is defined
2024-08-14 13:49:05 -06:00
SpaceIm
128b7a1109 reorder classes in global_structures.h to avoid incomplete definitions 2024-08-11 21:08:04 +02:00
SpaceIm
8bf2d2989c 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
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
178b05c251 Merge commit '9a4caf7def182e3f6aa3caa5024c7af821663b65' 2024-07-11 17:08:34 +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
0da302aedf Merge commit '2abb0b0bcd4bcae42f84ff001aba7f2ab6df2af7' 2024-06-20 21:52:29 +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
Charlton, Scott R
279b84357d [iphreeqc] Fixed for R 2024-06-10 18:55:01 -06: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
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
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
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
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
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
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
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
David Parkhurst
8acfbb384a Merge branch 'master' into module 2024-04-18 17:20:59 -06: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
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