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,128 Commits 6 Branches 4 Tags
Commit Graph

1128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
597bcd76a2 CRAN: replaced deprecated std::ptr_fun with lambda function 2019-08-19 10:40:46 -06: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
David Parkhurst
d993901130 encoding, limit.h 2018-11-07 15:41:07 -07:00
David Parkhurst
92c81f9fdd Revised logic for nmix 2018-11-07 15:04:54 -07:00
David Parkhurst
3cc84da8ce Merge remote-tracking branch 'coupled/master' into ss_trans 2018-11-07 14:33:17 -07:00
Scott R Charlton
56b5bf3f43 create valid ranges when sscanf doesn't return 2 2018-11-06 16:25:34 -07:00
David Parkhurst
c43c9af38d tweaked ss, changed surf function per Kinniburgh 2018-11-06 10:17:35 -07:00
David Parkhurst
b10df16b03 Corrected syntax of integer limit, previous commit actually changed ss convergence parameter, used to multiply by 0.99 2018-11-03 22:35:15 -06:00
David Parkhurst
d74c8ff554 Corrected syntax of integer limit 2018-11-03 22:33:06 -06:00
David Parkhurst
906cfd49c7 Check value of nmix 2018-11-03 15:30:19 -06:00
David Parkhurst
058375c2bf removed check of ss when sum of components is small 2018-10-31 14:01:22 -06:00
David Parkhurst
2977db4424 Tonys fix to diffusion bug with porosity change 2018-10-17 20:07:13 -06:00
David Parkhurst
f90446715b revised lists to be cumulative for eq, gas, kin, ss 2018-08-23 16:37:14 -06:00
David Parkhurst
9285985dc0 merging coupled/master into copy 2018-08-22 16:39:26 -06:00
David Parkhurst
7c23b62594 Fixed string_duplicate memory error 2018-08-22 08:20:51 -06:00
David Parkhurst
2d5551a313 fixed sc7 for copy and initial time 2018-08-21 16:57:24 -06:00
David Parkhurst
4842d9efba inverse iter 100000; finished copy operator; a bit more testing to go 2018-08-21 11:33:27 -06:00
David Parkhurst
4eefe43a5b ex20_debug fix 2018-08-19 19:49:26 -06:00
David Parkhurst
78e39cdebc still debugging copy 2018-08-19 13:15:43 -06:00
David Parkhurst
cee10e7ab9 fixing bugs in copy operator 2018-08-18 13:14:30 -06:00
David Parkhurst
ebab4bce42 fixing bugs in copy operator 2018-08-18 12:42:30 -06:00
David Parkhurst
5a35e0278b Fixed Linux warnings, memory errors 2018-08-16 20:35:44 -06:00
David Parkhurst
b86f79386a Beginning to test copy operator 2018-08-16 11:52:11 -06:00
Scott Charlton
5d40e69cc7 [IPhreeqc] added parens for clang++ -Wlogical-op-parentheses 2018-08-14 19:55:28 -07:00
Scott Charlton
936de38474 removed register keywords and updated for misc clang warnings 2018-08-14 16:11:36 -07:00
David Parkhurst
ec9de4cfde beginning of checking copy operation 2018-08-13 20:55:53 -06:00
Scott Charlton
ebeddcde9d [iphreeqc] Changes for CRAN 3.4.7 2018-08-09 12:42:50 -06:00
Scott R Charlton
9592d6e801 Merge branch 'dlpark-phreeqc3-TonyApr2018' into 'master' 
Merge dlpark:TonyApr2018:967ce08e

See merge request coupled/phreeqc3!3
 2018-08-06 14:23:38 -06:00
David Parkhurst
7c0fb65b72 [phreeqc3] needed to check gas phase type for same model, added test case 2018-08-06 14:04:12 -06:00
Scott R Charlton
9152ca292e Closes #1 2018-08-02 22:00:47 -06:00
Scott R Charlton
ebc4f69cd4 Merge branch 'dlpark-phreeqc3-TonyApr2018' into 'master' 
Tony apr2018

See merge request coupled/phreeqc3!1
 2018-08-02 19:36:01 -06:00
David Parkhurst
97a0cec3fe Fixed bug where 1W was interpreted as an isotope 2018-08-02 19:29:07 -06:00
David Parkhurst
2deb4edc8c added option -ddl to surface. Added test case 2018-08-02 19:24:21 -06:00
Scott R Charlton
df7d5debc6 Merge branch 'gammas' into 'master' 
Gammas

See merge request coupled/phreeqcrm!1
 2018-08-01 22:29:42 -06:00
David Parkhurst
34abb5b076 gammas finished, working on reactants 2018-08-01 21:32:10 -06:00
David Parkhurst
53148278fc Tony's changes; diffuse layer with pitzer 2018-08-01 17:44:32 -06:00
David Parkhurst
4271ca42ad Tonys corrections, added balonis test 2018-08-01 15:33:36 -06:00
David Parkhurst
2e390fd5ab commit fix for Mtg 2018-08-01 13:17:39 -06:00
Scott Charlton
da9d06b423 Split 'common/' into commit '077abe0106b2c1d44d8e996d62ae3e8b2c23bf62' 
git-subtree-dir: common
git-subtree-mainline: 114cea674411a4eea23af8658f29c6e4bd562f8d
git-subtree-split: 077abe0106b2c1d44d8e996d62ae3e8b2c23bf62
 2018-07-31 16:33:42 -06:00
David Parkhurst
114cea6744 minor memory leak in fail2 2018-03-16 17:41:34 -06:00
David Parkhurst
7d044e79a6 Tony fixed error with sc2 and aquia 2018-03-09 11:22:22 -07:00