Charlton, Scott R
da9a093d9a
Closes usgs-coupled/phast3#2 ( #3 )
2023-03-08 12:51:02 -07:00
Charlton, Scott R
9b9ee1b061
Closes usgs-coupled/phreeqcrm#12 ( #13 )
...
* Closes usgs-coupled/phreeqcrm#12
* Added yaml-cpp install
* Added yaml-cpp to PhreeqcRM link libraries
* Added yaml-cpp install to cmake builds
* Added compile feature cxx_std_11
* Added toolchain for windows cmake
* Fix autotools build on macOS?
* Changed to c++ headers for math.h and float.h
* Updated 'Test install' step for autotools (macos-latest)
2023-02-26 16:50:20 -07:00
Darth Vader
6e14dda95c
Merge commit 'a4eba15e3b254fa202a7ff58f9f474b1f2dbc584'
2023-02-11 17:25:04 +00:00
Charlton, Scott R
b32560efa0
[iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN ( #9 )
2023-01-14 22:14:20 -07:00
Darth Vader
6beb009a16
Merge commit '8f2558798f15927fa58343a43c7c14295986ae45'
2021-11-29 15:18:33 +00:00
Darth Vader
a826eecc87
Merge commit '754ea3a9bc11cd1f7d350ff217bdb3dcd3af3d97'
2021-11-09 01:59:31 +00:00
Darth Vader
fd78a499d0
Merge commit '8d7c1fce37a929778a2c34ee19c29933529f46bc'
2021-08-27 16:05:15 +00:00
Charlton, Scott R
d19961bf85
Merge remote-tracking branch 'usgs-coupled/master'
2021-08-17 13:44:03 -06:00
Darth Vader
afff58ffb0
Merge commit '48cb5e8969285f6d6e54955b6b7f8db76b2ec99f'
2021-06-24 18:31:49 +00:00
David Parkhurst
524bfc46cc
Finished up C, Fortran, documentation. Need to check DOxygen
2021-06-14 09:38:48 -06:00
David Parkhurst
26c71a359b
Merge remote-tracking branch 'origin/master' into state
2021-06-13 07:37:50 -06:00
David Parkhurst
c22cbb7bc7
Added StateSave, StateApply, StateDelete with documentation for C++. Need testing, Fortran, and C
2021-06-13 07:37:41 -06:00
Darth Vader
5b7cf2f8f3
Merge commit '2212f9ccb1ed55b463746d524ace70e78258d5bc'
2021-05-10 22:50:17 +00:00
David Parkhurst
7a2f8916aa
made tally_table a vector of class tally
2021-04-26 23:38:21 -06:00
Darth Vader
4a848dccec
Merge commit '22c4a624a98244cf2706842b9d989e0edc3b91e2'
2021-04-22 16:58:09 +00:00
Darth Vader
8080cbce1e
Merge commit '4cee19d768863d8f09b3629ee36a11e1a6030f33'
2021-04-19 23:23:32 +00:00
Darth Vader
4b9b99267b
Merge commit '6d2b45a8e168aa9e55ee677afe52367857e8140d'
2021-04-10 17:28:30 +00:00
Darth Vader
0aa30d21ac
Merge commit 'e3c0d61bc7acc87be515f9923da3a68e14e20880'
2021-04-07 19:26:20 +00:00
Darth Vader
639490d061
Merge commit '2e5f255c794096790125293dcc3af274bed7a61a'
2021-04-07 14:27:20 +00:00
Darth Vader
b1efa4f251
Merge commit '7961b1686b4e064ec4ec886e76543074d060129f'
2021-04-06 16:04:54 +00:00
Darth Vader
4ca2e4e1f4
Merge commit '885a2f77289ac2738f6e8e02c8039f7e26ee7828'
2021-03-24 16:45:00 +00:00
Darth Vader
7b0c2df096
Merge commit '1986e00a933549022abb335d82f40c65abf2a292'
2021-03-22 23:37:01 +00:00
Darth Vader
c1c08f2f2d
Merge commit '1ab86414f0b25f986c14a55bdb967dfdef3af2ae'
2021-03-18 23:28:44 +00:00
Darth Vader
ecbb26c3d7
Merge commit 'ba9813a43c6d087851bf5c2ea86a658cc785060c'
2021-03-18 15:51:58 +00:00
Darth Vader
5688f83747
Merge commit '0feb20dead731b8dedf3e86d5ef664bc24733127'
2021-03-18 05:41:57 +00:00
Darth Vader
710d0096aa
Merge commit '6a5bb8aba56d568bd139bc3aed7363d929397790'
2021-03-12 16:57:10 +00:00
Darth Vader
62c51bb410
Merge commit '9e8b3828595be0339d3c63b5707412e34a4e5007'
2021-03-06 01:42:08 +00:00
Darth Vader
20ab4be9f3
Merge commit '3e4fc7ea18da750b2746422898dc100d74271b34'
2020-12-16 19:04:47 +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
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
Scott R Charlton
63108ac76d
Merge commit '6a49d41253c7705c0273262d0290389b18643d32'
2019-10-29 12:29:32 -06:00
Scott R Charlton
aa34ac1153
Merge commit 'b3bf691b4964b3eedbaf04d6ee9bd35f98afb113'
2019-06-05 20:44:26 -06: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
7b836dd6cf
Merge commit '9285985dc0222cf6fde33c32625027d376159b3b'
2018-08-22 16:44:20 -06:00
Scott R Charlton
98d075d472
Merge commit '9152ca292e2ea2a042a654b6393b6fcd9160e0d4'
2018-08-02 22:24:30 -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
e8ae8322eb
gammas finished, working on reactants
2018-08-01 21:32:10 -06:00
Scott R Charlton
311fa04fe1
Merge commit '53148278fc5456fddfcffc2d46aa7ccb7fff0ee9'
2018-08-01 18:27:17 -06:00
Scott Charlton
1d5c59a175
Add 'phreeqcpp/' from commit 'da9d06b423a87ed5eae503c0faf779ac11c96027'
...
git-subtree-dir: phreeqcpp
git-subtree-mainline: ba5f2ba885b4cc757201e28f9b4dce158f7cc66b
git-subtree-split: da9d06b423a87ed5eae503c0faf779ac11c96027
2018-07-31 16:56:09 -06:00
