3161 Commits

Author SHA1 Message Date
Scott Charlton
3b6ce6c142 Added .gitlab-ci.yml 2020-01-18 23:27:37 -07:00
Scott Charlton
d10040e896 Added .gitlab-ci.yml 2020-01-18 23:27:37 -07:00
Scott Charlton
6a8d508876 Added .gitlab-ci.yml 2020-01-18 23:27:37 -07:00
Scott Charlton
daf64a1447 Added .gitlab-ci.yml 2020-01-18 23:27:37 -07:00
Scott Charlton
35cae10971 Added .gitlab-ci.yml 2020-01-18 23:20:39 -07:00
Scott Charlton
32073de751 Added .gitlab-ci.yml 2020-01-18 23:20:39 -07:00
Scott Charlton
d664f890d4 Added .gitlab-ci.yml 2020-01-18 23:20:39 -07:00
Scott R Charlton
4968927900 Merge commit '757927da596446462e8daceb57b20bba2c591f33' 2020-01-02 19:25:18 -07:00
Scott R Charlton
fb387bafdf Merge commit '3f9e12e81e71090ddc9028554e77e7f29717480b' 2020-01-02 19:25:16 -07:00
Scott R Charlton
757927da59 Merge commit 'ae06f3533db376699e82c3b0b183fb2bdd43721a' 2020-01-02 19:25:04 -07:00
David Parkhurst
3f9e12e81e Fixed GFW bug on new elements in TRANSPORT 2020-01-02 19:12:39 -07:00
David Parkhurst
ae06f3533d Fixed GFW bug on new elements in TRANSPORT 2020-01-02 19:12:39 -07:00
Scott R Charlton
adc00368d1 Merge commit 'aa963a9cae20b9634b4c41e7b6387a2b22b28445' 2019-12-13 10:24:37 -07:00
Scott R Charlton
aa963a9cae Merge commit '9cc783b02f8bc437a0572eb32d523f69344724bf' 2019-12-13 10:24:26 -07:00
Scott R Charlton
a8c1876a1e Merge commit '0366caf10b0748d78cb718898c714e1397a008b4' 2019-12-13 10:20:33 -07:00
David Parkhurst
9cc783b02f added Basic functions for PHAST: velocity_x, velocity_y, velocity_z, transport_cell_no 2019-12-12 21:20:22 -07:00
David Parkhurst
0366caf10b added Basic functions for PHAST: velocity_x, velocity_y, velocity_z, transport_cell_no 2019-12-12 21:20:22 -07:00
Scott R Charlton
956374d767 Merge commit 'd97736a3a718c05c91a3aa6eb567c18538464436' 2019-12-03 13:29:35 -07:00
Scott R Charlton
d97736a3a7 Merge commit '79f768a7bd6c88e064ba25a33880cb84cfd1489f' 2019-12-03 13:29:23 -07:00
David L Parkhurst
79f768a7bd Merge branch 'master' into 'master'
removed j = j in loop

See merge request coupled/phreeqc3!48
2019-12-03 13:25:21 -07:00
David Parkhurst
bd7634a8cc removed j = j in loop 2019-12-03 13:22:14 -07:00
Scott R Charlton
3d8e0ef194 Merge commit '73e2f7fcb820a8eefcc6a34f837c80f560fe2aa9' 2019-12-02 10:44:21 -07:00
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