2012 Commits

Author SHA1 Message Date
Darth Vader
eaff17f8a7 Merge commit 'f715edb5897985acf0692d2b0bde4ab34379469f' 2021-09-29 23:26:31 +00:00
Darth Vader
f715edb589 Merge commit '2243d25babbc524e7875b3d591bb6b91c4399a95' 2021-09-29 23:26:01 +00:00
Darth Vader
2af383aa76 Merge commit '6e8b89a2ef1547d485ca8bd59016646bedbf746f' 2021-09-27 18:23:26 +00:00
Darth Vader
6e8b89a2ef Merge commit '2243d25babbc524e7875b3d591bb6b91c4399a95' 2021-09-27 18:23:14 +00:00
Darth Vader
2243d25bab Merge commit '013c822f76e5dc2e4fc19e87c6e5777aea6151d2' 2021-09-27 18:22:25 +00:00
Darth Vader
f8b289df8e Merge commit 'c1af6f3585142e84fc40ec2c74914ef4a3b5da8b' 2021-09-27 18:21:19 +00:00
Darth Vader
1c92ac16ba Merge commit 'd3bdd8b54a3af64f157001e84f1f46cd1c4c89fc' 2021-09-27 16:26:19 +00:00
Charlton, Scott R
c1af6f3585 added newlines for CRAN 2021-09-23 06:37:13 -07:00
Charlton, Scott R
013c822f76 added newlines for CRAN 2021-09-23 06:37:13 -07:00
Charlton, Scott R
d3bdd8b54a added newlines for CRAN 2021-09-23 06:37:13 -07:00
Charlton, Scott R
c7dfbb5f60 added newlines for CRAN 2021-09-23 06:37:13 -07:00
Darth Vader
6f21dae9bd Merge commit '60ad724c7a34fdd7a075e70da0e99a026d689bc2' 2021-09-08 14:36:16 +00:00
Darth Vader
60ad724c7a Merge commit 'e4bd9bafb40c82bff5ef275528ca3dd2836672e5' 2021-09-08 14:35:13 +00:00
Charlton, Scott R
e4bd9bafb4 [phreeqc3] fixes -Wclass-memaccess warnings for CRAN 2021-09-07 19:30:34 -07:00
Darth Vader
91823dd276 Merge commit '33f5157d8b000ea2b29ff1eef64e57761723ea31' 2021-08-31 13:54:19 +00:00
Darth Vader
33f5157d8b Merge commit '29f06d269c189449f230e15761d01381cfd51de2' 2021-08-31 13:52:37 +00:00
Charlton, Scott R
29f06d269c fixed alignment in Description of solution 2021-08-31 07:47:49 -06:00
Darth Vader
af0c0b0e86 Merge commit 'ae41a1ffa67d7b4bf60373a164e24802cb7a1797' 2021-08-31 00:05:55 +00:00
Darth Vader
ae41a1ffa6 Merge commit '09a2680a6ec98cfd9d59e5b40b1594edfd6b4eff' 2021-08-31 00:04:03 +00:00
Charlton, Scott R
09a2680a6e guarded write_banner with NO_UTF8_ENCODING 2021-08-30 17:46:49 -06:00
Charlton, Scott R
082edbb51d changed src/print.cpp back to windows-1252 encoding; updated check_utf.sh 2021-08-30 17:36:40 -06:00
Darth Vader
b135aab84f Merge commit 'fd78a499d084fc606f2df44065602e4017a895e0' 2021-08-27 16:06:26 +00:00
Darth Vader
fd78a499d0 Merge commit '8d7c1fce37a929778a2c34ee19c29933529f46bc' 2021-08-27 16:05:15 +00:00
David Parkhurst
8d7c1fce37 adding mcd_Jtot and mcd_Jconc 2021-08-25 20:22:42 -06:00
David Parkhurst
9f0f6225cc Merge branch 'master' of github.com:usgs-coupled/phreeqc3 2021-08-25 20:16:20 -06:00
Darth Vader
75c4938ffc Merge commit '47a8b4e3d826313c9c42fd3e74472574fedb4b84' 2021-08-17 19:49:43 +00:00
Darth Vader
47a8b4e3d8 Merge commit '1040066da8c5dea10f0b29ece9e43082cd745fd8' 2021-08-17 19:48:47 +00:00
Charlton, Scott R
1040066da8 Merge remote-tracking branch 'usgs-coupled/master' 2021-08-17 13:44:03 -06:00
Charlton, Scott R
d19961bf85 Merge remote-tracking branch 'usgs-coupled/master' 2021-08-17 13:44:03 -06:00
Darth Vader
893faff974 Merge commit 'd4dfe590eb539c35219174adf5314480eebdf7f8' 2021-08-17 15:36:31 +00:00
Darth Vader
d4dfe590eb Merge commit '07a864d1a6ed582ddfae5e1c3bf5b0620c3dd75c' 2021-08-17 15:35:22 +00:00
David Parkhurst
2a9464430b cleaned up to eliminate some prints 2021-08-05 15:34:57 -06:00
David Parkhurst
07a864d1a6 all jacobians are consistent. Looks pretty good. 2021-07-17 12:21:02 -06:00
David Parkhurst
56975a7e0c Saved surface for numerical derivatives 2021-07-17 08:49:17 -06:00
David Parkhurst
df0d68b9d5 Runs all the test cases. Numerical derivatives work, but still some changes in residuals before and after jacobian calculations. 2021-07-16 22:27:03 -06:00
David Parkhurst
6bd936e0d7 Fixed numerical derivative (non-pitzer) 2021-07-15 20:37:58 -06:00
David Parkhurst
0dde2b010f removed comments 2021-07-15 11:44:28 -06:00
David Parkhurst
aef51fa3e6 Finally have derivatives right, I think 2021-07-15 11:38:17 -06:00
David Parkhurst
20281a0e7a always reset gases 2021-07-14 13:53:28 -06:00
David Parkhurst
13ec2fcd3e best I could do for H2S while maintaining old tests. Used INCREMENTAL reactions 2021-07-13 14:24:00 -06:00
David Parkhurst
8be1ba8327 revised jacobian_pz with new logic. Works with fixed_pressure examples H2S, H2S_pz, H2S_pz_appt, H2S_NaCl_Na2SO4. 2021-07-10 16:37:37 -06:00
David Parkhurst
71cf2a97b7 still produces different residuals 2021-07-07 23:55:03 -06:00
David Parkhurst
9022ded877 Tony H2S. Amm.dat, phreeqc.dat, pitzer.dat, utf8, updated test cases 2021-07-06 21:52:06 -06:00
Darth Vader
48f9f227b5 Merge commit 'afff58ffb022065fab2fe9b960633f0b86e2066b' 2021-06-24 18:32:58 +00:00
Darth Vader
afff58ffb0 Merge commit '48cb5e8969285f6d6e54955b6b7f8db76b2ec99f' 2021-06-24 18:31:49 +00:00
David Parkhurst
cb1f9afc17 Finished up C, Fortran, documentation. Need to check DOxygen 2021-06-14 09:38:48 -06:00
David Parkhurst
524bfc46cc Finished up C, Fortran, documentation. Need to check DOxygen 2021-06-14 09:38:48 -06:00
David Parkhurst
9dad4471c2 Merge remote-tracking branch 'origin/master' into state 2021-06-13 07:37:50 -06:00
David Parkhurst
26c71a359b Merge remote-tracking branch 'origin/master' into state 2021-06-13 07:37:50 -06:00
David Parkhurst
d647eec2ef Added StateSave, StateApply, StateDelete with documentation for C++. Need testing, Fortran, and C 2021-06-13 07:37:41 -06:00