max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,167 Commits 6 Branches 4 Tags
Commit Graph

1167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David L Parkhurst
6067ce8ce5 Merge branch 'implicit3' into 'master' 
Fixed more compile warnings. Removed andra_kin_ss from testing, results are...

See merge request coupled/phreeqc3!45
 2019-11-19 19:45:58 -07:00
David Parkhurst
21bd20f567 Fixed more compile warnings. Removed andra_kin_ss from testing, results are inconsistent between Linux and Windows, presumably the ifs in RATES 2019-11-19 19:39:09 -07:00
David L Parkhurst
97b9c5848e Merge branch 'implicit3' into 'master' 
Another Linux warning, lower tol on andra_kin_ss.

See merge request coupled/phreeqc3!44
 2019-11-19 14:17:45 -07:00
David Parkhurst
45db5cf084 Another Linux warning, lower tol on andra_kin_ss. 2019-11-19 14:15:22 -07:00
David L Parkhurst
443be1cdb1 Merge branch 'implicit3' into 'master' 
Last Linux compile warnings. Added more precision to andra_kin_ss.

See merge request coupled/phreeqc3!43
 2019-11-19 12:36:06 -07:00
David Parkhurst
9a29aaf83d Last Linux compile warnings. Added more precision to andra_kin_ss. 2019-11-19 12:33:58 -07:00
David L Parkhurst
6dafd7d75e Merge branch 'implicit3' into 'master' 
Fixing Linux compiler warnings, checking in new regression test files.

See merge request coupled/phreeqc3!42
 2019-11-19 09:33:31 -07:00
David Parkhurst
fbde6338ec Fixing Linux compiler warnings, checking in new regression test files. 2019-11-19 09:31:10 -07:00
David L Parkhurst
22077113d6 Merge branch 'implicit3' into 'master' 
Implicit3

See merge request coupled/phreeqc3!41
 2019-11-18 22:21:38 -07:00
David Parkhurst
77e36a2394 Tony fixed some transport, revised colloid_U. New cases added to Makefile. 2019-11-18 22:08:46 -07:00
David Parkhurst
f07caf973b Changed back print to allow incremental_reactions to work correctly 2019-11-18 20:32:46 -07:00
Scott R Charlton
beadd0738b Merge commit '5947da90657d1cb8f832152b4573dca0bbefb49e' 2019-10-30 11:12:18 -06:00
David Parkhurst
6a49d41253 changes to make related and mixing items independent of case. surface_mix test case. 2019-10-28 18:21:57 -06:00
David Parkhurst
5947da9065 initial Tony changes 2019-10-22 16:36:15 -06:00
David Parkhurst
8089c10273 initial Tony changes 2019-10-22 16:36:15 -06:00
David Parkhurst
009aec74d1 Merge remote-tracking branch 'coupled/master' 2019-10-20 12:40:56 -06:00
David Parkhurst
4676ee4de7 added more P-R gas paramteters 2019-10-20 12:27:48 -06:00
Scott R Charlton
c07314c7e5 Merge commit '492a4d257f300b7a9e0b5dc7e212c8f85ecb7f6e' 2019-08-19 11:27:13 -06:00
Scott R Charlton
492a4d257f Merge remote-tracking branch 'coupled/master' 2019-08-19 10:48:19 -06:00
Scott R Charlton
81ca6334dc Merge remote-tracking branch 'coupled/master' 2019-08-19 10:48:19 -06:00
Scott R Charlton
950fca2417 CRAN: replaced deprecated std::ptr_fun with lambda function 2019-08-19 10:40:46 -06:00
Scott R Charlton
597bcd76a2 CRAN: replaced deprecated std::ptr_fun with lambda function 2019-08-19 10:40:46 -06:00
David Parkhurst
044e0ea2c0 phreeqc_ptr bug in internal copy 2019-06-18 18:20:30 -06:00
Scott R Charlton
59342977ed Merge commit '5c53fb207238bc0e846123a7e0d71a48bd9976ab' 2019-06-17 17:34:25 -06:00
Scott R Charlton
5c53fb2072 Merge commit '1327e93127e40e7a55ec629dcc9dd91ec29e77fe' 2019-06-17 17:34:12 -06:00
David Parkhurst
c117e182f8 Tony fix of index error 2019-06-12 05:20:02 -06:00
David Parkhurst
b90ddb5651 Fixed Tony's fix, added implicit_as example 2019-06-11 15:52:10 -06:00
David Parkhurst
03acc3f78f changed abs to fabs 2019-06-09 22:11:54 -06:00
David Parkhurst
1fef40e188 added implicit, max_mixf to internal copy 2019-06-06 09:27:46 -06:00
Scott R Charlton
32939bae4b Merge commit '1327e93127e40e7a55ec629dcc9dd91ec29e77fe' 2019-06-05 20:59:15 -06:00
David Parkhurst
b3bf691b49 fixed > > in templates for gcc 2019-06-03 21:05:15 -06:00
David Parkhurst
c92911348b Tony fix May 31 2019-06-01 10:32:24 -06:00
David Parkhurst
1327e93127 Implicit seems to be working with Tony's latest changes 2019-05-30 22:03:38 -06:00
David Parkhurst
55ea163dd0 Implicit seems to be working with Tony's latest changes 2019-05-30 22:03:38 -06:00
David Parkhurst
c7111f77b2 Sort of works, still bugs and serious errors compared to explicit 2019-05-28 17:05:02 -06:00
David Parkhurst
600c7ee572 Fixed some bugs with iso.dat inverse modeling, added test case. Still does not generate [13C](4) and [13C](-4) from SOLUTION 2019-05-06 15:22:52 -06:00
David Parkhurst
2291700eeb Fixed gas_phase_mix bug, added test case 2019-02-05 13:45:02 -07:00
David Parkhurst
035a4e0f7d Tony tweak to transport.cpp 2019-02-04 21:07:09 -07:00
David L Parkhurst
bd4fc256a6 Merge branch 'tony20190117' into 'master' 
skipping restart

See merge request coupled/phreeqc3!21
 2019-01-30 21:32:16 -07:00
David Parkhurst
71c994b6d4 skipping restart 2019-01-30 21:29:11 -07:00
Scott R Charlton
1257f8c7c9 Merge branch 'issue-3' into 'master' 
Fixed -Wcatch-value warnings reported by CRAN

Closes #3

See merge request coupled/IPhreeqc!8
 2019-01-30 18:12:57 -07:00
Scott Charlton
ce33478c29 Fixed -Wcatch-value warnings reported by CRAN 2019-01-29 16:04:01 -08:00
David Parkhurst
040fd95fad include restart, remove ex20_debug 2019-01-29 11:03:15 -07:00
David Parkhurst
d57264d973 2. changes to solid solution numerical method 2019-01-28 22:08:04 -07:00
David Parkhurst
3fd8155d56 changes to solid solution numerical method 2019-01-28 21:08:54 -07:00
David Parkhurst
2b14a9475c Tony's changes 20190117 2019-01-28 17:24:59 -07:00
David Parkhurst
ae6e8b0544 added modify methods for restart files 2018-12-11 17:17:49 -07:00
David Parkhurst
b500c5448b changed restart file to include UZ 2018-11-30 17:41:13 -07:00
David Parkhurst
fffac6d359 another try for ex20_debug 2018-11-07 23:04:05 -07:00
David Parkhurst
fa5ee50494 fix problem with ex20_debug 2018-11-07 20:03:36 -07:00