max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,125 Commits 6 Branches 4 Tags
Commit Graph

3125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Charlton
0f79fee46b Added .gitlab-ci.yml 2020-01-18 23:57:55 -07:00
Darth Vader
787c701637 Merge commit 'eed9de906915d10ceaf4ec3df3bf5ee3132ad80b' 2020-01-19 06:52:34 +00:00
Darth Vader
a84c347494 Merge commit 'a09a24b2bf0db0dff473666060e2aac4608b83f2' 2020-01-19 06:43:55 +00:00
Darth Vader
e35b7188a6 Merge commit '6a8d50887676fa8f5394b2f44b1a00d175b97fac' 2020-01-19 06:43:55 +00:00
Darth Vader
19a09e3133 Merge commit '35cae109711ba0f99869002bdc9c9da8b679724f' 2020-01-19 06:43:54 +00:00
Darth Vader
efe1728a9e Merge commit '32073de75198725fcc69bfbe814941aecfdf6ba8' 2020-01-19 06:43:53 +00:00
Darth Vader
4b3f7a575b Merge commit 'd10040e8963ba76a00bb5bf8d6c284a54c162abc' 2020-01-19 06:43:52 +00:00
Darth Vader
7bca246a5f Merge commit 'd664f890d46f8a1f1f890321fad745ec7e5fcfe2' 2020-01-19 06:43:51 +00:00
Scott Charlton
d398195036 Added .gitlab-ci.yml 2020-01-18 23:42:45 -07:00
Scott Charlton
eed9de9069 Added .gitlab-ci.yml 2020-01-18 23:42:45 -07:00
Scott Charlton
9273992482 Added .gitlab-ci.yml 2020-01-18 23:42:45 -07:00
Scott Charlton
40c2787c49 Added .gitlab-ci.yml 2020-01-18 23:37:32 -07:00
Scott Charlton
b69210254f Added .gitlab-ci.yml 2020-01-18 23:37:32 -07:00
Scott Charlton
a09a24b2bf Added .gitlab-ci.yml 2020-01-18 23:27:37 -07:00
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