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

2065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
cc6f024cfc Merge commit 'c9064048568876e0687e08d6d6c65ab67111b732' 2023-03-07 02:50:37 +00:00
Darth Vader
8a85d23012 Merge commit 'eeee6d3cce2549d37d7051ea3aebd78d77b944e8' 2023-03-07 02:49:50 +00:00
Darth Vader
eeee6d3cce Squashed 'phreeqcpp/' changes from eb35357..11d588e 
11d588e Merge commit '84dc8253eb8498cc204cacb6b24ee3b92f0a58b3'
84dc825 Squashed 'common/' changes from fb03f6a..04cb71a

git-subtree-dir: phreeqcpp
git-subtree-split: 11d588edde138d4961072f7b55c9bebc666189db
 2023-03-07 02:49:49 +00:00
Darth Vader
895d5dd3c5 Merge commit 'ce82b6836a8ae0dc278903bc218e9465da62e8bd' 2023-03-07 02:49:11 +00:00
Darth Vader
c77222b71f Merge commit '772c30924fd12ad20b8be7c128ae7cc33bb7b170' 2023-03-07 02:48:23 +00:00
Darth Vader
772c30924f Squashed 'phreeqcpp/' changes from f8cd55c..eb35357 
eb35357 Merge pull request #17 from scharlton2/bmi-working
26a26c1 pre-commit changes use $ pre-commit run --all-files

git-subtree-dir: phreeqcpp
git-subtree-split: eb35357c1291b425b97f8bae8a62d5a888a6d4e3
 2023-03-07 02:48:23 +00:00
Darth Vader
38db9f9ecc Merge commit '1a19a99b23a31a1268b50af5429b3a89ee8e6a84' 2023-03-07 02:43:15 +00:00
Charlton, Scott R
94f3c45a58 Merge pull request #17 from scharlton2/bmi-working 
bmi-working merge
 2023-03-06 19:37:08 -07:00
Darth Vader
d70da60dfc Merge commit '90affba324b6d44f0703f8b703d94a038f291a1c' 2023-03-07 01:00:52 +00:00
Darth Vader
bc9ab58d16 Squashed 'phreeqcpp/' changes from 0b60d1a..f8cd55c 
f8cd55c Merge branch 'master' of code.chs.usgs.gov:coupled/phreeqc3
56731ea updated RELEASE.TXT, revised PR_P and PR_PHI functions and the test case PR_error_incremental
35190be added Thermoddem database. Fixed error in PR_P and PR_PHI. Added test case to check PR_P and PR_PHI are fixed.

git-subtree-dir: phreeqcpp
git-subtree-split: f8cd55c27c133f195a16f21cb6e07a46d280b2f3
 2023-03-07 01:00:20 +00:00
Darth Vader
28517a89ce Merge commit 'bc9ab58d16539fa4c3580b66a7cd309db1c3568e' 2023-03-07 01:00:20 +00:00
Darth Vader
602df24820 Merge commit '15c997e31499728d7beb32a621ef522b1c72799a' 2023-03-07 00:43:16 +00:00
Darth Vader
c85a9cde6d Squashed 'phreeqcpp/' changes from e9db33b..0b60d1a 
0b60d1a Closes usgs-coupled/phreeqcrm#12 (#13)

git-subtree-dir: phreeqcpp
git-subtree-split: 0b60d1aeccfdbd9d0f0c4959ee6a04e99d7725e4
 2023-03-07 00:42:18 +00:00
Darth Vader
ec1947dcfe Merge commit 'c85a9cde6d9bf3f7841b3bc9b87c18e1012df0c9' 2023-03-07 00:42:18 +00:00
Darth Vader
391ffd1003 Merge commit '9fac4a5659c122db2b529cd16deef696af1496e6' 2023-03-07 00:41:53 +00:00
Charlton, Scott R
b4aa81fa76 pre-commit changes 
use $ pre-commit run --all-files
 2023-03-05 16:11:39 -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
5dfa353b30 Merge commit '5bef6c5841bbcf3276ad78f81c77673aa43e25b5' 2023-02-11 17:25:39 +00:00
Darth Vader
a4eba15e3b Squashed 'phreeqcpp/' changes from bbd2543..e9db33b 
e9db33b Added replacement code for snprintf for vs versions before vs2015 (#30)

git-subtree-dir: phreeqcpp
git-subtree-split: e9db33b14235f3d9018e1205ae05895dd2eb3e2e
 2023-02-11 17:25:04 +00:00
Darth Vader
6e14dda95c Merge commit 'a4eba15e3b254fa202a7ff58f9f474b1f2dbc584' 2023-02-11 17:25:04 +00:00
Darth Vader
2355c9f90c Merge commit '27d160eafc07e0c195861725fc0534960ae7e871' 2023-01-17 03:32:45 +00:00
Darth Vader
fb59ec8b19 Squashed 'phreeqcpp/' changes from feaa432..bbd2543 
bbd2543 [phreeqc] fixes what iphreeqc/issue-8 broke

git-subtree-dir: phreeqcpp
git-subtree-split: bbd2543978c857c8e46ff6f553231f188c5cb32c
 2023-01-17 03:32:29 +00:00
Darth Vader
c32e6641b2 Merge commit 'fb59ec8b19173e55422aef14fd2488cd1aca0680' 2023-01-17 03:32:29 +00:00
Darth Vader
963b9088a4 Merge commit 'a5c0125bc0670499ea06a874ed96f2e6fc5b3c45' 2023-01-15 06:05:08 +00:00
Darth Vader
be9e230efb Squashed 'phreeqcpp/' changes from 8715a91..feaa432 
feaa432 [iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN (#9)

git-subtree-dir: phreeqcpp
git-subtree-split: feaa4321a63ece0f205ce12795d6553261c74f7d
 2023-01-15 06:04:23 +00:00
Darth Vader
07fec0dda7 Merge commit 'be9e230efb49f1bde06d9ca21a6a6042befc3c8e' 2023-01-15 06:04:23 +00:00
Darth Vader
e60eb995bb Merge commit 'eab05a830c0d10ca0eed06b7e4b917986b7b5e93' 2023-01-15 06:02:08 +00:00
Charlton, Scott R
b32560efa0 [iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN (#9) 2023-01-14 22:14:20 -07:00
Charlton, Scott R
00816dc695 [iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN (#9) 2023-01-14 22:14:20 -07:00
Darth Vader
8e55e49e01 Merge commit 'a284a4027629c14ed1dbc485b9aa448406e0acfd' 2022-03-25 16:37:30 +00:00
Darth Vader
e0b04393ed Squashed 'phreeqcpp/' changes from ba27ef1..8715a91 
8715a91 fixed MacInnes in warning msg

git-subtree-dir: phreeqcpp
git-subtree-split: 8715a91e401b61cf8ab5e3482e97ae26becf114b
 2022-03-25 16:36:54 +00:00
Darth Vader
f676db2278 Merge commit 'e0b04393edfc68bc3bf689e45b4196b165a1ab0a' 2022-03-25 16:36:54 +00:00
Darth Vader
af34bf877b Merge commit '937409a9e6d4a687ec7691e24c401202359f5c09' 2022-01-28 22:13:56 +00:00
Darth Vader
37a63bcf44 Squashed 'phreeqcpp/' changes from 7cda4a7..ba27ef1 
ba27ef1 Tony fix to transport

git-subtree-dir: phreeqcpp
git-subtree-split: ba27ef1db0232a4147914025795a6dd3b6ba60f7
 2022-01-28 22:13:23 +00:00
Darth Vader
15e9e21c6b Merge commit '37a63bcf44e319cea0465322ac36fd73beed6769' 2022-01-28 22:13:23 +00:00
Darth Vader
210dbba73c Merge commit '03171b2d91a8383671f4c4fa13d15ea44de687cf' 2021-11-29 15:20:08 +00:00
Darth Vader
8f2558798f Squashed 'phreeqcpp/' changes from 40f9a93..7cda4a7 
7cda4a7 fixed ranges in ADVECTION, added test case advect_ranges, fixed RELEASE.TXT
f1ab542 unused variables

git-subtree-dir: phreeqcpp
git-subtree-split: 7cda4a7dee0f79a9093614a0b07a9b1ba0ab7ff2
 2021-11-29 15:18:33 +00:00
Darth Vader
6beb009a16 Merge commit '8f2558798f15927fa58343a43c7c14295986ae45' 2021-11-29 15:18:33 +00:00
Darth Vader
d41045470e Merge commit 'c995d50084cf598c12bdd45a585c8f67e999dc6e' 2021-11-09 01:59:49 +00:00
Darth Vader
754ea3a9bc Squashed 'phreeqcpp/' changes from a376a40..40f9a93 
40f9a93 phase_compare is obsolete
1a07c70 remove qsort for phases, elements, and species
23dd4ac merging Merge branch 'master' into surf_related
bf534d5 changed -10 to -15 for estimate of surface charge la
404aa0f changed -5 to -10 for estimating related surface activity

git-subtree-dir: phreeqcpp
git-subtree-split: 40f9a93535eea4367f6be8a2ecb9da4a9a0172a7
 2021-11-09 01:59:31 +00:00
Darth Vader
a826eecc87 Merge commit '754ea3a9bc11cd1f7d350ff217bdb3dcd3af3d97' 2021-11-09 01:59:31 +00:00
Darth Vader
ab1c055dfe Merge commit '141cad01907c7aebf3d86161dc699d1e50e8aff0' 2021-10-31 19:43:08 +00:00
Darth Vader
e265665845 Squashed 'phreeqcpp/' changes from a377818..a376a40 
a376a40 Merge commit '9e3623356a6be908d7e8b120ecf07c6dceb00d92'
9e36233 Squashed 'common/' changes from 013c822..fb03f6a

git-subtree-dir: phreeqcpp
git-subtree-split: a376a40fa91d71c45a6cc75d6af94e5838ca5060
 2021-10-31 19:42:50 +00:00
Darth Vader
c41c4e0230 Merge commit 'e26566584588855e782e2ab4cdd467984a185890' 2021-10-31 19:42:50 +00:00
Darth Vader
3765e0cf26 Squashed 'phreeqcpp/' changes from 7e50e98..a377818 
a377818 Merge remote-tracking branch 'usgs-coupled/master'
7c3d060 Merged remote-tracking branch 'origin/master'
c6e8aea Fixed DIFF_C and SETDIFF_C. Updated RELEASE.txt
942dc22 Replace (+ with ( for dealing with Fe(+3, so that [Fe+2] is still a legitimate element name

git-subtree-dir: phreeqcpp
git-subtree-split: a3778180a1d258bdccda2d2e3ec1a745f4738c77
 2021-10-31 19:41:44 +00:00
Darth Vader
30169e617c Merge commit '3765e0cf266655280d362cdf5de35c25892959b6' 2021-10-31 19:41:44 +00:00
Darth Vader
cc2c985afa Merge commit '3ce6dfc59f237dc8788541d444a25693102a7208' 2021-10-31 18:58:46 +00:00
Darth Vader
a330bc51e3 Squashed 'phreeqcpp/' changes from 2243d25..7e50e98 
7e50e98 Merge commit 'df6addc21acd81411e81b36a9daf373b10cba255'
df6addc Squashed 'common/' changes from 077abe0..013c822
5bc41df git subtree pull now squashes

git-subtree-dir: phreeqcpp
git-subtree-split: 7e50e9840fd9a15a541345f02fbcbfed5b09dd8e
 2021-10-31 18:57:52 +00:00
Darth Vader
f274a34a9a Merge commit 'a330bc51e33350cf81008c29742fe570fae074da' 2021-10-31 18:57:52 +00:00
Darth Vader
4d0e9a4c79 Merge commit '615fa476f56b91463f6c10e63b5266f412f87738' 2021-10-31 18:22:57 +00:00