Scott R Charlton
|
2e210e2a86
|
[IPhreeqc] Changed license
|
2018-08-13 18:56:56 -06:00 |
|
Scott R Charlton
|
98fb1bc5fa
|
Merge branch 'squash-cran-3.4.7' into 'master'
[iphreeqc] fixed makefile examples for R
See merge request coupled/IPhreeqc!3
|
2018-08-09 13:50:00 -06:00 |
|
Scott R Charlton
|
718f801af7
|
[iphreeqc] fixed makefile examples
|
2018-08-09 13:48:27 -06:00 |
|
Scott R Charlton
|
2bd5ca634d
|
Merge commit '487accaf235b9930e001d227ea7a3a8639f77f55'
|
2018-08-09 13:20:20 -06:00 |
|
Scott R Charlton
|
487accaf23
|
Merge commit 'ebeddcde9d54e3e79c8923496a0b7573432d9388'
|
2018-08-09 13:17:35 -06:00 |
|
Scott R Charlton
|
4552507a70
|
Merge commit 'b447434d70ec2b8dac6087b17a0bd4dfaee0240f'
|
2018-08-09 13:00:16 -06:00 |
|
Scott R Charlton
|
4f72d9fb4d
|
Merge branch 'squash-cran-3.4.7' into 'master'
[iphreeqc] Changes for CRAN 3.4.7
See merge request coupled/IPhreeqc!2
|
2018-08-09 12:45:39 -06:00 |
|
Scott Charlton
|
3e57c50456
|
[iphreeqc] Changes for CRAN 3.4.7
|
2018-08-09 12:42:50 -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
|
ed9af14319
|
Merge commit 'b48944232055d481aa15138b4802159ad321495b'
|
2018-08-06 14:29:34 -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
|
68d20a18a1
|
Merge commit 'ca5e069a50badc82a2034ac805badf3d0d81e0b6'
|
2018-08-02 23:25:23 -06:00 |
|
Scott R Charlton
|
3541672f18
|
Merge branch 'issue-1' into 'master'
Closes #1
Closes #1
See merge request coupled/IPhreeqc!1
|
2018-08-02 23:19:10 -06:00 |
|
Scott R Charlton
|
ca5e069a50
|
Closes #1
|
2018-08-02 23:18:10 -06:00 |
|
Scott R Charlton
|
4ea53c4409
|
Closes #1
|
2018-08-02 23:18:10 -06:00 |
|
Scott R Charlton
|
9162598cad
|
Merge commit '98d075d472c5d31b1be2626e1b861ec31324a81d'
|
2018-08-02 22:24:43 -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
|
26c0a12733
|
Merge commit '78b05b072cfbc390ad9fa525872dfe5ff4ba99cf'
|
2018-08-02 19:37:30 -06:00 |
|
Scott R Charlton
|
e3da23912a
|
Merge commit 'dd597b1187b6cbfbb271fa39575dea62c2f7247e'
|
2018-08-02 19:37:29 -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
|
dd597b1187
|
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 |
|
David Parkhurst
|
5d08736a87
|
added option -ddl to surface. Added test case
|
2018-08-02 19:24:21 -06:00 |
|
David Parkhurst
|
7e0ef93072
|
Added documentation for new methods in Release.txt
|
2018-08-02 19:05:15 -06:00 |
|
David Parkhurst
|
9044ed290d
|
updating revisions to phreeqcrm
|
2018-08-02 18:51:12 -06:00 |
|
Scott R Charlton
|
9036859599
|
Merge commit '9e316ab6ba7629c930fbe76d809d0167a743eda6'
|
2018-08-01 22:52:10 -06:00 |
|
Scott R Charlton
|
9e316ab6ba
|
Merge commit 'df7d5debc6ce37c341b48ad123e4839ab409da38'
|
2018-08-01 22:51:51 -06:00 |
|
Scott R Charlton
|
80e6e0c411
|
Merge commit '35d8d926ed40f2c948cf0b61f7fd61fd2d5270ee'
|
2018-08-01 22:50:19 -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
|
80462a2d42
|
Merge commit '311fa04fe162e939e01419a658681ec819a534ea'
|
2018-08-01 18:27:29 -06:00 |
|
Scott R Charlton
|
827306c4fb
|
Merge commit '49025090cb56cf274d1259d13ee8f5022e329a93'
|
2018-08-01 18:27:28 -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 |
|
David Parkhurst
|
49025090cb
|
Tony's changes; diffuse layer with pitzer
|
2018-08-01 17:44:32 -06:00 |
|
Scott R Charlton
|
b7b9562f86
|
Merge commit '83e3b8c063e9706dae7082a19441646bdc621a21'
|
2018-08-01 15:38:30 -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
|
c2c124dd10
|
Merge commit '06e25ec860ea2065e0d93f0ff15fe761a67a6756'
|
2018-08-01 15:11:21 -06:00 |
|
David Parkhurst
|
06e25ec860
|
Correction to core10.dat from Neveu
|
2018-08-01 15:01:32 -06:00 |
|
Scott R Charlton
|
f6db49cad7
|
Merge commit 'ae5624d5df92823731a43efad4cdd210483bb3f7'
|
2018-08-01 13:25:33 -06:00 |
|