1244 Commits

Author SHA1 Message Date
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
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