Scott R Charlton
0f7b19adc6
Merge commit '6894b4a7b1ef73cae9d582609173cb84f52e5b3c'
2018-08-14 20:15:46 -06:00
Scott R Charlton
c6865539f8
Merge commit 'd96f386211ad5fbace94d550ca371d9eacb3262f'
2018-08-14 20:11:05 -06:00
Scott R Charlton
6894b4a7b1
Merge commit 'd96f386211ad5fbace94d550ca371d9eacb3262f'
2018-08-14 20:11:05 -06:00
Scott R Charlton
d96f386211
Merge commit 'ebeddcde9d54e3e79c8923496a0b7573432d9388'
2018-08-14 20:10:12 -06:00
Scott Charlton
f2e39872a4
removed register keywords and updated for misc clang warnings
2018-08-14 16:11:36 -07:00
Scott Charlton
af408f7c9a
removed register keywords and updated for misc clang warnings
2018-08-14 16:11:36 -07:00
Scott R Charlton
487accaf23
Merge commit 'ebeddcde9d54e3e79c8923496a0b7573432d9388'
2018-08-09 13:17:35 -06:00
Scott Charlton
b447434d70
[iphreeqc] Changes for CRAN 3.4.7
2018-08-09 12:42:50 -06:00
Scott Charlton
ebeddcde9d
[iphreeqc] Changes for CRAN 3.4.7
2018-08-09 12:42:50 -06:00
Scott R Charlton
b489442320
Merge commit '9592d6e8015707da5eb033f136590ba40015da61'
2018-08-06 14:29:22 -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
ca5e069a50
Closes #1
2018-08-02 23:18:10 -06:00
Scott R Charlton
98d075d472
Merge commit '9152ca292e2ea2a042a654b6393b6fcd9160e0d4'
2018-08-02 22:24:30 -06:00
Scott R Charlton
9152ca292e
Closes #1
2018-08-02 22:00:47 -06:00
Scott R Charlton
78b05b072c
Merge commit 'ebc4f69cd45b414f2fce86455cd025a2eb762134'
2018-08-02 19:37:18 -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
9e316ab6ba
Merge commit 'df7d5debc6ce37c341b48ad123e4839ab409da38'
2018-08-01 22:51:51 -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
Scott R Charlton
35d8d926ed
Merge branch 'gammas' into 'master'
...
Gammas
See merge request coupled/phreeqcrm!1
2018-08-01 22:29:42 -06:00
David Parkhurst
cf35bf3bf1
fixed some bugs in the reaction lists and got to the point that data is now all available in the phreeqcrm object once FindComponents is called.
2018-08-01 21:38:39 -06:00
David Parkhurst
34abb5b076
gammas finished, working on reactants
2018-08-01 21:32:10 -06:00
David Parkhurst
e8ae8322eb
gammas finished, working on reactants
2018-08-01 21:32:10 -06:00
Scott R Charlton
311fa04fe1
Merge commit '53148278fc5456fddfcffc2d46aa7ccb7fff0ee9'
2018-08-01 18:27:17 -06:00
David Parkhurst
53148278fc
Tony's changes; diffuse layer with pitzer
2018-08-01 17:44:32 -06:00
Scott R Charlton
83e3b8c063
Merge commit '4271ca42adb6957392c22a564d82baf99933b166'
2018-08-01 15:38:18 -06:00
David Parkhurst
4271ca42ad
Tonys corrections, added balonis test
2018-08-01 15:33:36 -06:00
Scott R Charlton
ae5624d5df
Merge commit '2e390fd5ab713c0c135208931dd015935da01f19'
2018-08-01 13:25:21 -06:00
David Parkhurst
2e390fd5ab
commit fix for Mtg
2018-08-01 13:17:39 -06:00
Scott Charlton
1d5c59a175
Add 'phreeqcpp/' from commit 'da9d06b423a87ed5eae503c0faf779ac11c96027'
...
git-subtree-dir: phreeqcpp
git-subtree-mainline: ba5f2ba885b4cc757201e28f9b4dce158f7cc66b
git-subtree-split: da9d06b423a87ed5eae503c0faf779ac11c96027
2018-07-31 16:56:09 -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
David Parkhurst
86a55b5b5d
Tony's changes from 20180305
2018-03-07 17:08:33 -07:00
David Parkhurst
b0fdcc41e4
Added Mtg(g) in calc_PR
2018-03-04 20:48:19 -07:00
David Parkhurst
6c9e9843b7
One more compiler warning
2018-02-23 09:39:25 -07:00
David Parkhurst
8e12139000
Fixed bug from Shell. Segv because s_list.size differed from count_s_x.
...
Fixed compiler warnings from jenkins.
2018-02-22 14:45:39 -07:00
David Parkhurst
fa7a3c7192
Tony's changes and bug fixes
2018-02-17 20:09:31 -07:00
Scott R Charlton
d801026f14
moved concrete-2005 and renamed to trunk
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12922 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-11-08 23:25:48 +00:00
Scott R Charlton
800f234506
added Form1.2005.resX to configure dist
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete-2005@12904 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-10-31 20:38:32 +00:00
Scott R Charlton
db60ab0e3a
fixed to compile in vs2005
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete-2005@12903 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-10-31 19:55:15 +00:00
David L Parkhurst
a46a85a9f0
Making consistent
...
phi = (phi > 4.44 ? 4.44 : (phi < -3 ? -3 : phi));
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12860 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-10-03 20:55:36 +00:00
David L Parkhurst
077abe0106
Tony's changes.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12858 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-09-28 21:48:05 +00:00
David L Parkhurst
b5ef46d09a
Tony's changes.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12858 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-09-28 21:48:05 +00:00
David L Parkhurst
299188f3ce
Fixed dist_x function for transport.
...
Added dist_x test case.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12814 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-08-30 19:36:32 +00:00
David L Parkhurst
bdd21cd12a
Tony's fix for LG function for exchange.
...
New test case ExchangeGamma for fix.
User requested ability to show contributions to specific conductance.
Wrote a Basic program that calculates Specific Conductance (same as SC Basic function)
but also shows species contributions to the specific conductance.
PercentSC test case added.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@12712 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-05-23 19:43:24 +00:00
David L Parkhurst
29a5848dbb
Tony's fix for LG function for exchange.
...
New test case ExchangeGamma for fix.
User requested ability to show contributions to specific conductance.
Wrote a Basic program that calculates Specific Conductance (same as SC Basic function)
but also shows species contributions to the specific conductance.
PercentSC test case added.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12711 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-05-23 19:37:55 +00:00
David L Parkhurst
5812e21193
Synced to PHREEQC3 12702
...
Error when reading PHASES and -no_check was read instead
of equation.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12703 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-05-10 20:03:07 +00:00
