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

4149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charlton, Scott R.
841ae669d6 Cleanup 2025-06-25 13:12:03 -06:00
Charlton, Scott R.
d53f91d57b Refactor GitHub Actions workflows for subtree management and add subtrees.json configuration 2025-06-25 13:04:41 -06:00
Charlton, Scott R.
d74ca5abbe Changed to ssh protocol 2025-06-20 18:19:03 -06:00
Charlton, Scott R.
cc60dbb615
Master subtree (#71) 
Still working on subtree merging
 2025-06-10 12:19:04 -06:00
Charlton, Scott R.
a85c274903
Merge pull request #70 from usgs-coupled/master-subtree 
Merged to test manual run
 2025-05-31 17:01:58 -06:00
Charlton, Scott R.
4ccb129917 Only run manually 2025-05-31 16:55:39 -06:00
Charlton, Scott R.
ced9d90841 Working on subtree merge 2025-05-31 16:52:37 -06:00
Darth Vader
6136c88a50 Merge commit '402dc2ec9b50394af226ce431a39925c1030fd2e' 2025-03-14 18:23:20 +00:00
Darth Vader
402dc2ec9b Squashed 'phreeqc3-examples/' changes from 31517c71..1dbd65fc 
1dbd65fc Updated output for recent database changes

git-subtree-dir: phreeqc3-examples
git-subtree-split: 1dbd65fc74fc452b40d37030c51cff2f9bccf894
 2025-03-14 18:23:20 +00:00
Darth Vader
aefd03ac34 Merge commit 'a3aa597dd53a2001e4879dbbc09e9f3658a3c1c8' 2025-03-14 18:23:18 +00:00
Darth Vader
a3aa597dd5 Squashed 'database/' changes from ec0212de..dd98e151 
dd98e151 Tony's changes Mar 12 plus my corrections.
c61c35ec Tony changes to basicsubs, updated viscosity for Sr, NH4, and tidied databases.

git-subtree-dir: database
git-subtree-split: dd98e151672348f240062be7fe72242e86226696
 2025-03-14 18:23:18 +00:00
Darth Vader
6c9b8aaf07 Merge commit 'febfa05e38044719e80b19c6a74a6070fce3c1e7' 2025-03-14 18:23:15 +00:00
Darth Vader
febfa05e38 Squashed 'src/' changes from 0eb2b934..b15a6bde 
b15a6bde Merge commit '7ec217d47bfff56057000e1ac954d46b31417083'
7ec217d4 Squashed 'phreeqcpp/' changes from a4886d6..b24dedb

git-subtree-dir: src
git-subtree-split: b15a6bded75060c7f1b9456de3892e307f5c6674
 2025-03-14 18:23:15 +00:00
Darth Vader
03653d3b4a Merge commit 'dcf01e46e9e2cf6bc39c943042343aa3a066659c' 2025-03-14 18:23:12 +00:00
Darth Vader
dcf01e46e9 Squashed 'phreeqc3-doc/' changes from 71e7c5a0..394240f2 
394240f2 Tony changes to basicsubs, updated viscosity for Sr, NH4, and tidied databases.

git-subtree-dir: phreeqc3-doc
git-subtree-split: 394240f20af07dabe460ea1f6ce11016f7427362
 2025-03-14 18:23:12 +00:00
Darth Vader
7578086671 Merge commit '95c70688aa2ff904a635b4de93970bf24acaa0e0' 2025-02-25 21:56:41 +00:00
Darth Vader
95c70688aa Squashed 'phreeqc3-doc/' changes from 0a3757d4..71e7c5a0 
71e7c5a0 Updated for 3.8.7

git-subtree-dir: phreeqc3-doc
git-subtree-split: 71e7c5a0341c24ad2d134e18cc7f22e6ddc2435a
 2025-02-25 21:56:41 +00:00
Charlton, Scott R
0547e23cdc Added code to generate stimela.ascii 2025-02-19 14:38:40 -07:00
Charlton, Scott R
83580b365e Set c++14 
Updated googletest to 1.16.0
Added stimela.dat to tests and build-databases.R
 2025-02-19 14:06:14 -07:00
Darth Vader
8e12e1d937 Squashed 'phreeqc3-doc/' changes from e7f79ef2..0a3757d4 
0a3757d4 Added stimela.dat to installer

git-subtree-dir: phreeqc3-doc
git-subtree-split: 0a3757d4f3b62594cd20221591b262c39e0f01f6
 2025-02-18 22:46:33 +00:00
Darth Vader
9871f67154 Merge commit '8e12e1d9376b8f97abcb8301cd5f9995c1fbf22e' 2025-02-18 22:46:33 +00:00
Darth Vader
4a6ec6151e Squashed 'database/' changes from 4e898381..ec0212de 
ec0212de removed tabs before eol in stimela.dat. Updated RELEASE.TXT.
3cf80a8a Added simela.dat-from Peter de Moel. Fixed bug in write_raw/read_raw GasComp, order of options

git-subtree-dir: database
git-subtree-split: ec0212ded233929c14fc4bc5d6f0d61604ef3c8e
 2025-02-18 20:26:38 +00:00
Darth Vader
81e380194a Merge commit '4a6ec6151e2f155dd16dc438023b743fbc77e6ae' 2025-02-18 20:26:38 +00:00
Darth Vader
ff1bded841 Squashed 'src/' changes from 47bcb44d..0eb2b934 
0eb2b934 Merge commit '7c05598ee390fee52f2860d8766542a615f08d9d'
7c05598e Squashed 'phreeqcpp/' changes from c81916a..a4886d6

git-subtree-dir: src
git-subtree-split: 0eb2b934364f19a7a20439de35f9a9b1d4753c1c
 2025-02-18 20:26:35 +00:00
Darth Vader
6c58153c18 Merge commit 'ff1bded8415c84af23ef99cbd47c0a9ef7a69a76' 2025-02-18 20:26:35 +00:00
Darth Vader
34fef06d5c Merge commit '3a0f756ff7940772b9fdf5879b7fd0c8e744cbc5' 2025-02-18 20:26:32 +00:00
Darth Vader
3a0f756ff7 Squashed 'phreeqc3-doc/' changes from 797e95aa..e7f79ef2 
e7f79ef2 removed tabs before eol in stimela.dat. Updated RELEASE.TXT.

git-subtree-dir: phreeqc3-doc
git-subtree-split: e7f79ef2413934217d74ebb84f9c3fc4369e648d
 2025-02-18 20:26:31 +00:00
Charlton, Scott R.
b0491191e7
Updated cran artifacts 2025-01-10 12:23:44 -07:00
Darth Vader
1680cde7ab Squashed 'phreeqc3-examples/' changes from 1777f2bc..31517c71 
31517c71 Updated output for 3.8.6 release

git-subtree-dir: phreeqc3-examples
git-subtree-split: 31517c71c70af07af992b2dceb8ebc1b8ff74e3d
 2025-01-07 22:28:23 +00:00
Darth Vader
47ce8e0adb Merge commit '1680cde7ab23a71e3b514013815ccf08498a0dc8' 2025-01-07 22:28:23 +00:00
Darth Vader
bc33cd7484 Squashed 'phreeqc3-doc/' changes from fd438d3e..797e95aa 
797e95aa Updated RELEASE.TXT for 3.8.6

git-subtree-dir: phreeqc3-doc
git-subtree-split: 797e95aadd3e1dd2932a04e862b1716867e21c11
 2025-01-07 21:05:42 +00:00
Darth Vader
a4109721f5 Merge commit 'bc33cd74844e5f14f8771f6cc85e6e89165ad2e9' 2025-01-07 21:05:42 +00:00
Darth Vader
3d759f6997 Squashed 'phreeqc3-examples/' changes from 8f9acfc7..1777f2bc 
1777f2bc Merge branch 'mix_error' of github.com:dlparkhurst/phreeqc3-1 into mix_error
da8a610a Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments.

git-subtree-dir: phreeqc3-examples
git-subtree-split: 1777f2bc99bd9b655e838908e0fdfb81bfdd1e3f
 2025-01-07 20:00:06 +00:00
Darth Vader
a7e6f6d4c8 Merge commit '3d759f69973bad20c855f53a0a75a3db3b35516a' 2025-01-07 20:00:06 +00:00
Darth Vader
48d952740c Squashed 'database/' changes from bf60c1ca..4e898381 
4e898381 Merge branch 'master' into mix_error
20d3a9e5 Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments.

git-subtree-dir: database
git-subtree-split: 4e898381542ce722cd7c3c74fe9c2592ec34d41b
 2025-01-07 20:00:03 +00:00
Darth Vader
8cb6444f3b Merge commit '48d952740c344516d2d238bc7f1ae41807a0b7d2' 2025-01-07 20:00:03 +00:00
Darth Vader
13bd43d71f Merge commit '35f13a0f66449dd0d7f01732a52d2c2078728e2a' 2025-01-07 19:59:58 +00:00
Darth Vader
35f13a0f66 Squashed 'src/' changes from b4a1f672..47bcb44d 
47bcb44d Merge commit '7afa4755116f041a37c52ecdeb716a64033fdd1f'
7afa4755 Squashed 'phreeqcpp/' changes from b948e30..c81916a

git-subtree-dir: src
git-subtree-split: 47bcb44d5ee21759c606efe72f0a50d8d7c3b638
 2025-01-07 19:59:57 +00:00
Darth Vader
0574a86c4e Squashed 'phreeqc3-examples/' changes from 09d4a0ba..8f9acfc7 
8f9acfc7 Updated cmake_minimum_required and fixed surf_error test

git-subtree-dir: phreeqc3-examples
git-subtree-split: 8f9acfc77c9261e87c156056b8acafc21946298f
 2024-12-06 16:50:10 +00:00
Darth Vader
b389eb39b4 Merge commit '0574a86c4ee8888db3264728889b391638cd3c29' 2024-12-06 16:50:10 +00:00
Darth Vader
d3b4c500de Squashed 'src/' changes from 51eedbc2..b4a1f672 
b4a1f672 Merge commit '3c8e294fd35563abbf53316d100d9f900e2b5b5a'
3c8e294f Squashed 'phreeqcpp/' changes from c369020..b948e30

git-subtree-dir: src
git-subtree-split: b4a1f672db7d7203a306a7c499cf8c67142da2bc
 2024-12-06 16:50:05 +00:00
Darth Vader
f6affb8f0e Merge commit 'd3b4c500de84f4dd207eb30b3a612fac16db167d' 2024-12-06 16:50:05 +00:00
Darth Vader
47a34ca634 Squashed 'database/' changes from 1a221cd7..bf60c1ca 
bf60c1ca Fix typos

git-subtree-dir: database
git-subtree-split: bf60c1ca9d528f429086991e96e445f6b3976981
 2024-12-06 00:27:57 +00:00
Darth Vader
c5e17364a0 Merge commit '47a34ca634047faf645ba7302fee4f6de934dcfd' 2024-12-06 00:27:57 +00:00
Darth Vader
7e74e00df1 Merge commit 'fc1d6ef789171ce6feef8a7ad5fe0ce298a2a4d9' 2024-12-06 00:27:54 +00:00
Darth Vader
fc1d6ef789 Squashed 'examples/com/' changes from af8d7af7..a0ea2708 
a0ea2708 Fix typos

git-subtree-dir: examples/com
git-subtree-split: a0ea2708e5bace20877bdafb23bbe9f14b84c82d
 2024-12-06 00:27:54 +00:00
Darth Vader
3e3c063083 Squashed 'src/' changes from 7bae85a3..51eedbc2 
51eedbc2 Fix typos

git-subtree-dir: src
git-subtree-split: 51eedbc27a828ff36a1ca732abea394e7f7f32bd
 2024-12-06 00:27:53 +00:00
Darth Vader
50b5cfaf1f Merge commit '3e3c06308338cfdb1eda420553ff9b6058a95643' 2024-12-06 00:27:53 +00:00
Charlton, Scott R.
7d11ec3bc5
Merge pull request #66 from mwtoews/codespell 
Fix typos
 2024-12-05 16:34:32 -07:00
Charlton, Scott R.
7e412da938 Updated Author metadata 2024-12-03 17:10:50 -07:00