Scott R Charlton
|
5c1fb49207
|
Merge commit '513a83eeb8675c8b7ccd05c5e49177dc23f21d54'
|
2019-12-02 10:44:20 -07:00 |
|
Scott R Charlton
|
99d2c550aa
|
Merge branch 'issue-6' into 'master'
Closes https://gitlab.cr.usgs.gov/coupled/IPhreeqc/issues/6
Closes #6
See merge request coupled/IPhreeqc!10
|
2019-12-02 10:38:15 -07:00 |
|
Scott Charlton
|
73e2f7fcb8
|
Closes https://gitlab.cr.usgs.gov/coupled/IPhreeqc/issues/6
|
2019-12-02 09:30:18 -07:00 |
|
Scott Charlton
|
513a83eeb8
|
Closes https://gitlab.cr.usgs.gov/coupled/IPhreeqc/issues/6
|
2019-12-02 09:30:18 -07:00 |
|
Scott Charlton
|
7a2e206ec3
|
Closes https://gitlab.cr.usgs.gov/coupled/IPhreeqc/issues/6
|
2019-12-02 09:30:18 -07:00 |
|
Scott Charlton
|
f3c1fcabb5
|
IPhreeqc: moved all output files to tempdir(); Fixed some of the documentation
|
2019-11-29 15:45:19 -08:00 |
|
Scott Charlton
|
c60ec7be3e
|
removed .Rbuildignore
|
2019-11-25 18:27:05 -08:00 |
|
Scott Charlton
|
78ac5357ab
|
working on CRAN submission
|
2019-11-25 17:50:08 -08:00 |
|
Scott Charlton
|
567af3ee45
|
working on CRAN submission
|
2019-11-25 17:39:00 -08:00 |
|
Scott R Charlton
|
9739214176
|
Merge commit 'd0e5bac5843adf417da9a722e8f8ae8405442d26'
|
2019-11-24 20:24:45 -07:00 |
|
Scott R Charlton
|
d0e5bac584
|
Merge commit '542394c95add8bc99c697c8dc33887efe2b1ae20'
|
2019-11-24 20:24:28 -07:00 |
|
Scott R Charlton
|
542394c95a
|
IPhreeqc: ifdef'd out references to std::cerr and std::cout
|
2019-11-23 21:14:02 -07:00 |
|
Scott R Charlton
|
675562bc6a
|
IPhreeqc: ifdef'd out references to std::cerr and std::cout
|
2019-11-23 21:14:02 -07:00 |
|
Scott R Charlton
|
6fe5c0e2cd
|
IPhreeqc: ifdef'd out references to std::cerr and std::cout
|
2019-11-23 21:14:02 -07:00 |
|
Scott R Charlton
|
53f759c9b8
|
Merge commit 'ed1c5314442dd3cea94f7d99ba4effe3ac8310c2'
|
2019-11-23 17:31:24 -07:00 |
|
Scott R Charlton
|
ed1c531444
|
Updated RELEASE.TXT for PhreeqcI TRANSPORT Bug
|
2019-11-23 17:19:50 -07:00 |
|
Scott R Charlton
|
060d05d92e
|
Merge commit '4b1efdf2afddc30f6fe28e9281e2437d45f6fddf'
|
2019-11-22 09:31:51 -07:00 |
|
David Parkhurst
|
4b1efdf2af
|
Tweak of Release.txt
|
2019-11-22 09:21:32 -07:00 |
|
David Parkhurst
|
2f0b20f019
|
Revised Frame on labtop xp virtual machine. Wrote book html. Copied html and fm files to implicit3. Ran fixup. Now checking in.
|
2019-11-20 23:22:23 -07:00 |
|
David Parkhurst
|
e96a11b4ad
|
updating release.txt with Tonys descriptions
|
2019-11-20 16:29:04 -07:00 |
|
Scott R Charlton
|
abfc6ed0ba
|
Merge commit 'e5bf8b0aa61996d6b4ee40820a7b7f79cb649444'
|
2019-11-19 19:50:40 -07:00 |
|
Scott R Charlton
|
e5bf8b0aa6
|
Merge commit '6067ce8ce599b9cbfaf012c0abc377f20e616b42'
|
2019-11-19 19:49:57 -07:00 |
|
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 |
|
Scott R Charlton
|
4e3de48388
|
Merge commit 'fd242bd33f1f6b3b91cd6d4f5a5336db0edfa81e'
|
2019-11-19 14:20:33 -07:00 |
|
Scott R Charlton
|
fd242bd33f
|
Merge commit '97b9c5848ee2b8ae6413ffa09e0b79be7d739ef8'
|
2019-11-19 14:19:21 -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 |
|
Scott R Charlton
|
80957cedf0
|
Merge commit '3049467b561ef8176c81341b76b883b2179380f2'
|
2019-11-19 12:41:28 -07:00 |
|
Scott R Charlton
|
3049467b56
|
Merge commit '443be1cdb1adce5a8da310d883bf4d97fc661576'
|
2019-11-19 12:40:34 -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 |
|
Scott R Charlton
|
824881645b
|
Merge commit 'd7188d25f30f33d2158082341224dda94f4bc1cc'
|
2019-11-19 09:40:14 -07:00 |
|
Scott R Charlton
|
d7188d25f3
|
Merge commit '6dafd7d75e3dc4b97ed0b5efa7424bf0630829e0'
|
2019-11-19 09:39:46 -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 |
|
Scott R Charlton
|
3241529210
|
Merge commit '679c637ed207c2a2418be64d4ee1ca140073ba90'
|
2019-11-18 22:29:45 -07:00 |
|
Scott R Charlton
|
679c637ed2
|
Merge commit '22077113d63c5f086de917486dcf4df678a9c464'
|
2019-11-18 22:29:32 -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
|
7ac39104c5
|
Merge commit 'd8ba4ac6103d1c7c360f637fddab0625bc616878'
|
2019-10-30 11:14:54 -06:00 |
|
Scott R Charlton
|
d8ba4ac610
|
Merge commit 'beadd0738b548a8bebe9934e5de2497cd6e3a7e0'
|
2019-10-30 11:12:55 -06:00 |
|
Scott R Charlton
|
beadd0738b
|
Merge commit '5947da90657d1cb8f832152b4573dca0bbefb49e'
|
2019-10-30 11:12:18 -06:00 |
|
Scott R Charlton
|
a22beccc3d
|
Merge commit '63108ac76d6fa7c378c21690b6342333c4cb446c'
|
2019-10-30 11:10:37 -06:00 |
|
Scott R Charlton
|
63108ac76d
|
Merge commit '6a49d41253c7705c0273262d0290389b18643d32'
|
2019-10-29 12:29:32 -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 |
|
Scott R Charlton
|
b390aae363
|
Merge commit '86888c465e9f7ff2ab6e5dfea003fc6ba73383b6'
|
2019-10-21 16:25:10 -06:00 |
|