Charlton, Scott R
|
621401d34c
|
reset for dlls
|
2020-09-29 10:27:55 -06:00 |
|
Charlton, Scott R
|
abb80b511f
|
added src/phreeqcpp/common/PHRQ_exports.h
|
2020-09-15 20:29:41 -06:00 |
|
Charlton, Scott R
|
b030a0b9db
|
Merge remote-tracking branch 'origin/master' into gtest
|
2020-09-07 22:25:59 -06:00 |
|
Darth Vader
|
18e137ff55
|
Merge commit '87bbb6a6f08a3f6cf0e4122e9c080db4ef000344'
|
2020-09-06 04:13:56 +00:00 |
|
Darth Vader
|
3782d4420d
|
Merge commit '03bda166155a6b2ce652e4ad6aceaf807c3bc041'
|
2020-09-04 23:43:25 +00:00 |
|
Darth Vader
|
d4261840c7
|
Merge commit 'fc8fe3e98fb3f1e42482636938537ed6028b3ee6'
|
2020-08-31 03:45:31 +00:00 |
|
Darth Vader
|
6e7023f842
|
Merge commit 'fbae3e92947cf79c1d615e657192eb8d5c78b9e9'
|
2020-08-31 01:55:19 +00:00 |
|
Charlton, Scott R
|
c459903476
|
added googletest and fixed some minor bugs
|
2020-08-25 12:27:15 -06:00 |
|
Darth Vader
|
b138ed208d
|
Merge commit '20daad41c8999670f933430f1c705384cdfa6947'
|
2020-08-20 02:37:16 +00:00 |
|
Darth Vader
|
5631ce1e56
|
Merge commit '801812ded3961b37ed264997211694bd0563d554'
|
2020-08-18 19:58:22 +00:00 |
|
Darth Vader
|
9d480bc124
|
Merge commit '2aef60aa6f00411ac4491e868c3cf2b6beab11ab'
|
2020-08-13 17:48:52 +00:00 |
|
Darth Vader
|
74b541d42e
|
Merge commit 'a87cd1fee89cf0076aa06b9018e8ad3b44566516'
|
2020-06-01 18:21:16 +00:00 |
|
Darth Vader
|
1c3edaa747
|
Merge commit 'e1465e33228a3f867bd822405fb100614d5f6d0c'
|
2020-05-22 22:15:37 +00:00 |
|
Darth Vader
|
89ca3d279f
|
Merge commit 'e18e1ec6be5107e051f99e41103638c907b1eaf5'
|
2020-02-22 03:17:53 +00:00 |
|
Darth Vader
|
090f5e682b
|
Merge commit '4f34fd04ff34668494863eab5312157ce746d862'
|
2020-01-28 17:16:16 +00:00 |
|
Scott Charlton
|
bb5bcbf15e
|
fixed conflict on merge
|
2020-01-27 16:52:46 -07:00 |
|
Darth Vader
|
efbddbf6dc
|
Merge commit 'aab8bc12ea8be8aec5943e1c77a54b19d28168cb'
|
2020-01-27 02:03:24 +00:00 |
|
Scott Charlton
|
eed9de9069
|
Added .gitlab-ci.yml
|
2020-01-18 23:42:45 -07:00 |
|
Scott R Charlton
|
757927da59
|
Merge commit 'ae06f3533db376699e82c3b0b183fb2bdd43721a'
|
2020-01-02 19:25:04 -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
|
d97736a3a7
|
Merge commit '79f768a7bd6c88e064ba25a33880cb84cfd1489f'
|
2019-12-03 13:29:23 -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
|
e5bf8b0aa6
|
Merge commit '6067ce8ce599b9cbfaf012c0abc377f20e616b42'
|
2019-11-19 19:49:57 -07:00 |
|
Scott R Charlton
|
fd242bd33f
|
Merge commit '97b9c5848ee2b8ae6413ffa09e0b79be7d739ef8'
|
2019-11-19 14:19:21 -07:00 |
|
Scott R Charlton
|
3049467b56
|
Merge commit '443be1cdb1adce5a8da310d883bf4d97fc661576'
|
2019-11-19 12:40:34 -07:00 |
|
Scott R Charlton
|
d7188d25f3
|
Merge commit '6dafd7d75e3dc4b97ed0b5efa7424bf0630829e0'
|
2019-11-19 09:39:46 -07:00 |
|
Scott R Charlton
|
679c637ed2
|
Merge commit '22077113d63c5f086de917486dcf4df678a9c464'
|
2019-11-18 22:29:32 -07:00 |
|
Scott R Charlton
|
63108ac76d
|
Merge commit '6a49d41253c7705c0273262d0290389b18643d32'
|
2019-10-29 12:29:32 -06:00 |
|
Scott R Charlton
|
86888c465e
|
Merge commit '009aec74d1cae1a8fc361a5560d89f44173fd7ee'
|
2019-10-21 16:24:50 -06:00 |
|
Scott R Charlton
|
86c543395f
|
Merge remote-tracking branch 'coupled/master'
|
2019-08-19 10:48:19 -06:00 |
|
Scott R Charlton
|
1b13e09db5
|
CRAN: replaced deprecated std::ptr_fun with lambda function
|
2019-08-19 10:40:46 -06:00 |
|
Scott R Charlton
|
5b3379b947
|
Merge commit '044e0ea2c0337ab4d175f3303e1d6d192a451782'
|
2019-06-18 18:29:40 -06:00 |
|
Scott R Charlton
|
8412823930
|
Merge commit '5c53fb207238bc0e846123a7e0d71a48bd9976ab'
|
2019-06-17 17:34:25 -06:00 |
|
Scott R Charlton
|
aa34ac1153
|
Merge commit 'b3bf691b4964b3eedbaf04d6ee9bd35f98afb113'
|
2019-06-05 20:44:26 -06:00 |
|
Scott R Charlton
|
79c28e50c1
|
Merge commit '600c7ee5728aa23c963828df22b6e0c94038a3ed'
|
2019-05-06 15:44:18 -06:00 |
|
Scott R Charlton
|
94155a63c6
|
Merge commit '2291700eebddc4374b8cd88d19fc0978ee84c7e9'
|
2019-02-05 23:49:21 -07:00 |
|
Scott R Charlton
|
51fbb3d5b0
|
Merge commit '035a4e0f7db61f7256e63659b0e7853dd299263e'
|
2019-02-04 21:19:21 -07:00 |
|
Scott R Charlton
|
1e4a2941b3
|
Merge commit 'bd4fc256a6f168e127f6d2b783653c890c23a231'
|
2019-01-30 21:34:30 -07:00 |
|
Scott R Charlton
|
f0c3701bde
|
Merge branch 'issue-3' into 'master'
Fixed -Wcatch-value warnings reported by CRAN
Closes #3
See merge request coupled/IPhreeqc!8
|
2019-01-30 18:12:57 -07:00 |
|
Scott Charlton
|
c88ff034bc
|
Fixed -Wcatch-value warnings reported by CRAN
|
2019-01-29 16:04:01 -08:00 |
|
Scott R Charlton
|
548aead510
|
Merge commit '040fd95fadbc2cd62df3c056ef7a41e10c8b7a29'
|
2019-01-29 11:10:34 -07:00 |
|
Scott R Charlton
|
12df06b34c
|
Merge commit 'd57264d9733b6f5687d8b7d87f5e9a8aad7e7d71'
|
2019-01-28 22:14:36 -07:00 |
|
Scott R Charlton
|
43386a0bc4
|
Merge commit '3fd8155d566798e121a1f54418f901cdd0db5e6c'
|
2019-01-28 21:20:14 -07:00 |
|
Scott R Charlton
|
f90fc5afea
|
Merge commit '2b14a9475c1cb0c64d3adaf67a907b63ea454c9c'
|
2019-01-28 18:19:55 -07:00 |
|
David Parkhurst
|
fa7776b8fe
|
added modify methods for restart files
|
2018-12-11 17:17:49 -07:00 |
|
David Parkhurst
|
1150a4a2aa
|
changed restart file to include UZ
|
2018-11-30 17:41:13 -07:00 |
|
Scott R Charlton
|
c2dada993c
|
Merge commit 'fffac6d359c01544c617aae6717678f0fd884193'
|
2018-11-07 23:14:22 -07:00 |
|
Scott R Charlton
|
4235170d91
|
Merge commit 'fa5ee5049432867a5161fcd97aebe475854fffdb'
|
2018-11-07 20:10:00 -07:00 |
|
Scott R Charlton
|
65dbd2c15b
|
Merge commit 'd99390113028519f41895af04cedba4a43258336'
|
2018-11-07 16:20:41 -07:00 |
|
Scott R Charlton
|
6e92ecf9ef
|
Merge commit '92c81f9fdd43f175d302028b56e7edbab81a7d06'
|
2018-11-07 15:29:36 -07:00 |
|