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,174 Commits 6 Branches 4 Tags
Commit Graph

4174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charlton, Scott R.
9b01d8b5b5 Remove unused GITHUB_TOKEN from sync-subtrees workflow 2025-06-27 21:16:45 -06:00
Charlton, Scott R.
3a9a5e7e5f Merge branch 'subtree' 2025-06-27 20:59:07 -06:00
Charlton, Scott R.
d24994e83f Remove SSH_PRIVATE_KEY environment variable from lint-subtrees workflow 2025-06-27 20:57:46 -06:00
Charlton, Scott R.
281360bcc1 Remove SSH_PRIVATE_KEY environment variable from lint-subtrees workflows 2025-06-27 20:55:06 -06:00
Charlton, Scott R.
990fca2df9
Refactor code structure for improved readability and maintainability (#73) 
The GitHub Actions workflow configuration for `sync-subtrees-action` was cleaned up by modifying parameter names and updating the SSH private key secret.
 2025-06-27 20:42:18 -06:00
Charlton, Scott R.
1149e64cad
Merge branch 'master' into subtree 2025-06-27 20:37:45 -06:00
github-actions[bot]
d03bb744e7 Merge commit 'f2ee6230bc27cebfd005d29f2f1c4ad4fb2ed82e' 2025-06-27 01:14:06 +00:00
github-actions[bot]
f2ee6230bc Squashed 'src/' changes from 64825ec7..9afaa30d 
9afaa30d Add comment to clarify the use of sync-subtrees-action in lint-subtrees.yml

git-subtree-dir: src
git-subtree-split: 9afaa30df10999663473b53c5863c777af9b1ae4
 2025-06-27 01:14:06 +00:00
Charlton, Scott R.
904e9b3595 Fix SSH private key secret reference in sync-subtrees-action configuration 2025-06-26 19:05:18 -06:00
github-actions[bot]
c713c0039e Merge commit 'c73b98be10295f3ea185b6342a3a2853c89affd3' 2025-06-26 18:49:41 +00:00
github-actions[bot]
c73b98be10 Squashed 'src/' changes from 470638d9..64825ec7 
64825ec7 Add comment to clarify manual trigger for linting workflow in lint-subtrees.yml

git-subtree-dir: src
git-subtree-split: 64825ec73cbad2a119fb60c270431b5a5fd0e7db
 2025-06-26 18:49:41 +00:00
Charlton, Scott R.
9ace336e12 Update SSH private key secret reference in sync-subtrees-action configuration 2025-06-26 12:48:40 -06:00
github-actions[bot]
b92227fe9a Merge commit '6a325b52d5ee1821aa7de84d111c6354e36fb0d6' 2025-06-26 18:27:07 +00:00
github-actions[bot]
6a325b52d5 Squashed 'src/' changes from e6661a8f..470638d9 
470638d9 Add clarification comment for linting workflow in lint-subtrees.yml

git-subtree-dir: src
git-subtree-split: 470638d989483487fb560f5f4cfeec8f87a52de3
 2025-06-26 18:27:07 +00:00
Charlton, Scott R.
966b0fc851 Fix SSH private key secret reference in sync-subtrees-action configuration 2025-06-26 12:25:56 -06:00
github-actions[bot]
8d00fbd2a5 Merge commit '02c5a6472fcbc888039cf0b1159757b3c7a2fcf5' 2025-06-26 18:19:20 +00:00
github-actions[bot]
02c5a6472f Squashed 'src/' changes from 9545998b..e6661a8f 
e6661a8f Add comment to clarify purpose of linting workflow for subtrees.json

git-subtree-dir: src
git-subtree-split: e6661a8fba6b120fbc3325347b1a9448e6434588
 2025-06-26 18:19:20 +00:00
Charlton, Scott R.
365c9646e2 Update SSH private key secret reference in sync-subtrees-action configuration 2025-06-26 11:51:38 -06:00
Charlton, Scott R.
6dc392967d Fix parameter name for default branch in sync-subtrees-action configuration 2025-06-25 23:20:20 -06:00
Charlton, Scott R.
250d1f1f87 Fix parameter names in sync-subtrees-action configuration in GitHub Actions workflow 2025-06-25 23:11:29 -06:00
github-actions[bot]
eb0dac9960 Merge commit '340a98787f19221e16cb4deeb2564a3a1e91e53f' 2025-06-26 00:18:32 +00:00
github-actions[bot]
340a98787f Squashed 'examples/com/' changes from a0ea2708..f9d9549b 
f9d9549b Merge commit 'fc1d6ef789171ce6feef8a7ad5fe0ce298a2a4d9'
26ffbfee Fix typos
f7a1be4e Merge commit 'e9b2c29221ea97c7fbab9fdfced5fed601ea2e0f'
b56d60a6 Merge commit 'ce6d37c593b1ba9c23cad05228bd1f57b50d5ccc'
e007a52c Updated for phreeqc changes Introduce end-of-line normalization for CMakeLists.txt
1cce1503 Merge commit '59900306d4ccdc5f16a8ea479c234b7d4640dcf2'
bffad8cc Added sleeps after curl -X POST
bef44883 Merge commit 'f4cdf1a12b67211e0dc567bcd80d8718963da0c3'
d98a0029 Merge commit 'a0ef46490f40ab0828b1a025da7d7dc00f407c98'
77aa5731 [iphreeqc] updated image location
7668c4c6 Merge commit 'fae004f42baa79cb40476a1814ffbf1278871c5f'
f7313acf Merge commit 'a1cf1e608ea822184059a4c93887c025f983bbfe'
030fa168 Merge commit '0163f911a4a33619d6e0960c24b6707bc27f8c61'
e1424d55 Merge commit '32073de75198725fcc69bfbe814941aecfdf6ba8'
195c800f Added .gitlab-ci.yml

git-subtree-dir: examples/com
git-subtree-split: f9d9549bf30116e33f20721af068979ec4ca5d6d
 2025-06-26 00:18:32 +00:00
github-actions[bot]
264db5ed7a Squashed 'src/' changes from b15a6bde..9545998b 
9545998b Merge commit 'dc93b6ea031d5bfb9b1a211261364f25d9bfb426'
5f0ff470 Refactor GitHub Actions workflows for subtree management and add subtrees.json configuration
5824a7cd Merge commit 'febfa05e38044719e80b19c6a74a6070fce3c1e7'
142a8641 Merge commit 'ff1bded8415c84af23ef99cbd47c0a9ef7a69a76'
444ba08c Merge commit '35f13a0f66449dd0d7f01732a52d2c2078728e2a'
584bb5a6 Merge commit 'd3b4c500de84f4dd207eb30b3a612fac16db167d'
bc21c20a Merge commit '3e3c06308338cfdb1eda420553ff9b6058a95643'
8a45f9f2 Fix typos
0014b5b0 Merge commit '3e1c0d11a21bedfeb288ed4a8737d0a9287e2e7f'
8b212627 59 compiler error on macos (#60)
72075d5a Merge commit '21df9497a0c5083f8e6add67e29601662ff47598'
90b9269e Merge commit '5f272b1fe3cfa93d5e5512461e41d049fc3a00be'
092e3664 Merge commit 'e5c4d819de6ffc5246306e4ed4301c69d9754efa'
d1745978 Merge commit 'aa9d98adea8397aa2f047ceb93ccc18aa9e726a6'
7814bf74 Merge commit 'dfdd36142fe914b3e6b89a5c55abc2eb4df8e19e'
418104cb Merge commit 'c27bfc7b64e0b47c6bde0ea233919dfa87808993'
7f683b40 Merge commit '622bc5fb4cc8f67f9303e45c98397b97fe30822f'
0bd82175 Merge commit 'ca6b882bcab9708f90c8761e0d4a4d572c57fce7'
9fac273e Merge commit 'ce2280a77a81e5a8214ae01f97e9766e168327cf'
672e854d Merge commit '9782e02486e4dfbb3148cdd6c235422caa8c06e6'
aa8cdd01 Merge commit 'd7222e4f0b773e52ff448f83ba057ec492471ea1'
62ebb6ad Merge remote-tracking branch 'usgs-coupled/master'
1e41b0ca 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57)
48ea6ea0 Merge commit '2d96a188772ef1fd12575913362d1fa01f198be8'
99e8a527 Merge pull request #48 from SpaceIm/fix/include-stddef-no-fortran
29f1d409 reorder classes in global_structures.h to avoid incomplete definitions
c2446417 add missing include of stddef.h in IPhreeqc.h if no fortran module
4c58a0f6 Merge commit '7c714dfbd3c917247c9c9346799bb3fa1b9dee16'
78f374b8 Merge commit '0e2456f051d9e2ad6f61f899721fa8ab2db1a30c'
05175294 Merge commit '231f8e36589ed86c2270d0915bb91cc74b4a15ef'
ab922805 Merge commit '1ec7448cb08f1cc2917b33e3337946a8da23208f'
a8ac4794 [iphreeqc] Fixed for R
ca0ba8d5 Merge commit 'ed24ec246bbfdcd57adbd0d4a9e8fe088a5de5b7'
051687d3 Merge commit '9ba726de0f8b36a9143922bf148f6a259982756a'
967cc4e6 Merge commit '7552f8f680a41d12454080cc1174765c86bb6354'
bbcb4c0e Merge commit '06332bcb62daece34f3818f46e11064a56799f23'
ad75e79e Merge commit '51648664f6f6550440d014f3a985ef9d575c02bd'
a162eb9e Merge commit 'fff75534d73a06719ce2fbb482f843e0fb9dc4c6'
fcaf4393 Merge commit '9882e3df3cca85659da2a430ffe240f895cdb272'
894d1c4d Merge commit 'a159b5af317ba8b61dd3a6c9242a98e76829467d'
01a8b140 Merge commit 'b1888bb5d68d0ae9736556acd5702d44448eb492'
1ba26537 Merge commit '799a4e7ee471ab80ac21f4dceb7233324576c6da'
ff966074 Merge commit '1d8783186c3d231e5ca909a0427cb33b2c29d558'
f23a7381 Merge commit 'ccdbd0ce2040eb00006775fe0cf2ab2faf4138b5'
15388e0f Merge commit '63ca4c7ef4b0202b4b6c6cd3463158dc10bfa758'
df6534c7 Merge commit '07f1d0d4680fe19cf1d77ea86b6485b319607f96'
7a6efcbd Merge commit 'b96cfe81141ed6734872794468ac9bb321ba9d8b'
2294b1ed Try this to fix warning on Darwin
d336cd67 fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04
7824c9cb Merge commit '7f291d1c56070131ef8e5b665c58dfb953ec5ebd'
b9e89390 Merge commit '70279357596338c2e09bbe32fefe5417e82193df'
83b1930e Merge commit 'd554fc3acfdfbe18c34c6c527fc685643129db2b'
77e7356d Merge commit 'd1b5d92efc04bd216d5354cb2df537d1ded008b0'
4883e481 Merge commit '37276c050f8194055e00a875c185c4f0ffe38abf'
832810fc Merge commit '1b2eb6ca0dfb1229d50bcb58c12ac6d6f63bbe4c'
42ba2432 Merge commit '10bcb271d74cf65f6427a7293f1b32c043bc7180'
4662baee Updated to pass unit tests on linux Added two additional selected_output tests:   TestSelectedOutputFileMultipleRuns   TestGetSelectedOutputRowCountMultipleRuns
6721837c Fixed bug that caused selected_output to accumulate in selected_output storage
b4b9e7da Merge commit '1a3663493c8f6e1f9accef266dce18790271ca2b'
c9d004b6 Merge commit 'fb29ba4c3af45fd6745970fda308ff13353edc9c'
1b46a8dc Merge commit '8d6d4a6b4fae111d36a3225507095202e684a40f'
3415544f Merge commit '90ccb6dc2bfcd1b2fa9aa0492f4553cf4f598f49'
bdef7c5d Merge commit '0e67b4a4541435fa7c4f2c07a642c313d5e1ce1a'
90aef6de Merge commit 'c50de2e4a793129b1bf6d016c2ed405544bd21cd'
76d4300c Merge commit 'd83e815edb69ae222734ebc4168810cae56e3cec'
14b90528 Merge commit '0e6c28f22663d72c558025b5ae69ce50ac3b2f62'
0032f142 Merge commit '7c3113fb1d452576ff5b6f00a39665a3e3c6da54'
36e3e73d Merge commit '71af2952a3513766833883f90c18105fd8e7f174'
8d3032c9 Merge commit '8494cef9c5aca1120ce55dbf0be46f87beb49b96'
a9b5eb69 Merge commit '4419fccb31acd4a82d2fbd618a45d4c78ae9aec6'
116b83a3 Merge commit '05d97e8baf75ee7adbef8da4511ae9b4e3e0b9df'
05e4a4d4 Merge commit '4fde5d2a9901d22e50df7ddf66dfaf9f6b808d20'
84f3957b Merge commit 'a695dadce25bdb17da3d297bd07e0d7873b64d4b'
5c1f3f19 Merge commit 'ad57aa549f45beecd2ae1bb6f2bbb2508af4bba4'
f0a66171 [webmod] webmod-dist-windows-git fails to build on jenkins
cc6f024c Merge commit 'c9064048568876e0687e08d6d6c65ab67111b732'
895d5dd3 Merge commit 'ce82b6836a8ae0dc278903bc218e9465da62e8bd'
38db9f9e Merge commit '1a19a99b23a31a1268b50af5429b3a89ee8e6a84'
d70da60d Merge commit '90affba324b6d44f0703f8b703d94a038f291a1c'
602df248 Merge commit '15c997e31499728d7beb32a621ef522b1c72799a'
391ffd10 Merge commit '9fac4a5659c122db2b529cd16deef696af1496e6'
5dfa353b Merge commit '5bef6c5841bbcf3276ad78f81c77673aa43e25b5'
2355c9f9 Merge commit '27d160eafc07e0c195861725fc0534960ae7e871'
963b9088 Merge commit 'a5c0125bc0670499ea06a874ed96f2e6fc5b3c45'
e60eb995 Merge commit 'eab05a830c0d10ca0eed06b7e4b917986b7b5e93'
00816dc6 [iphreeqc] Issue 8 -- change sprintf to snprintf for CRAN (#9)
8e55e49e Merge commit 'a284a4027629c14ed1dbc485b9aa448406e0acfd'
af34bf87 Merge commit '937409a9e6d4a687ec7691e24c401202359f5c09'
210dbba7 Merge commit '03171b2d91a8383671f4c4fa13d15ea44de687cf'
d4104547 Merge commit 'c995d50084cf598c12bdd45a585c8f67e999dc6e'
ab1c055d Merge commit '141cad01907c7aebf3d86161dc699d1e50e8aff0'
cc2c985a Merge commit '3ce6dfc59f237dc8788541d444a25693102a7208'
4d0e9a4c Merge commit '615fa476f56b91463f6c10e63b5266f412f87738'
eaff17f8 Merge commit 'f715edb5897985acf0692d2b0bde4ab34379469f'
2af383aa Merge commit '6e8b89a2ef1547d485ca8bd59016646bedbf746f'
6e8b89a2 Merge commit '2243d25babbc524e7875b3d591bb6b91c4399a95'
1c92ac16 Merge commit 'd3bdd8b54a3af64f157001e84f1f46cd1c4c89fc'
c7dfbb5f added newlines for CRAN
6f21dae9 Merge commit '60ad724c7a34fdd7a075e70da0e99a026d689bc2'
91823dd2 Merge commit '33f5157d8b000ea2b29ff1eef64e57761723ea31'
af0c0b0e Merge commit 'ae41a1ffa67d7b4bf60373a164e24802cb7a1797'
b135aab8 Merge commit 'fd78a499d084fc606f2df44065602e4017a895e0'
75c4938f Merge commit '47a8b4e3d826313c9c42fd3e74472574fedb4b84'
893faff9 Merge commit 'd4dfe590eb539c35219174adf5314480eebdf7f8'
48f9f227 Merge commit 'afff58ffb022065fab2fe9b960633f0b86e2066b'
8e7f7de5 Merge commit '9b94f8be88ba1d2b73948f2ddb790fd976fe8e0a'
510744ef Merge commit '37de8fa93ce958aeed5e61f6b3b3e507f059257e'
cbc40fac Merge commit '5b7cf2f8f32d1df2855a34f51102876527236915'
a68b8821 Merge commit '2e334cb417d144fb082c88cfcf5661ffa0cfacb8'
eebc11b3 made tally_table a vector of class tally
f3e27fcb Merge commit 'aa62814aa6731a0b093267ec2d361d4837fa3ba9'
b8563691 Merge commit '2efc74230a9105f21920ee93317781e1c56e34d1'
749cf8f4 Merge commit '4ae649449235703be5a460fae083169e1d7a10e8'
1371228f Merge commit '4a848dccec5e555fd493c1565b6cc1e0707caf05'
71ed896a Merge commit '8080cbce1e8b54fa33d4e86c2f10f8e443419bd9'
08e7576b Merge commit 'abacccd0ee631ddcaf427f200ced4db1d0cf626f'
a2974f37 Merge commit '2537a2c376658ea64bfaf37bc9738b76d71a787b'
acf0a143 Merge commit '4b9b99267b55b2c9ee5cbf96c4dff2cc1d946c40'
0abe01ca Merge commit 'bd0962591257268d0726bf54db1bbdc39f691ced'
fd0bc309 removed TESTING definition
c27e7010 updated for classify branch
7993336a Merge commit '2697dc958cee10b7a5fedeec8b98fbb2aa30f62a'
78223d97 Merge commit '0479fc1adaec4ef03f9d3755219119c118afc531'
5c0e7189 Merge commit '0aa30d21ac10b0ea13ad3cb1f701e7e3cac7eda7'
9dffd1b9 Merge commit '639490d0610cc02b8618567d95ff30833eafd6c2'
eb19293d Merge commit 'b1efa4f251731679e57d36e20579687b2d1efce2'
dabf07b5 Merge commit '4ca2e4e1f403f232428f1010ddaa422088b2f474'
cea69f62 Merge commit '7b0c2df096a26cb453170fe0a17c5e4d2fb8409e'
299be469 Merge commit 'de884e4e3637e62826fac1cea60d94759fb7a8cd'
30aece6c Merge commit '0c581ea4be8bceb2a122d409da9a8a2585c8daad'
e892cc16 Merge commit '8e9c5b3592fdf2b1b016a9da1d1e1f6f1c23ef45'
f686374e only call qsort with more than one element
b6a0f193 Merge commit 'c1c08f2f2d4a08ec86b46d70716fb709eb863e9c'
f03c3f7c Merge commit '3770354f0a980a6a5c3001bdf061d9543cb23c11'
29375bfc Merge commit 'ecbb26c3d7f6f15e97874b866b7b6b4a5be9a65d'
9ddd92f2 Merge commit '5688f837474cd7cda50564e379d291e9944a89fc'
d19a31a6 Merge commit '8c8f6fd176aa60c9e0349f0e79888e5d50aca079'
50e81af4 Merge commit 'd6e6d11b2868f770f394fd7f2635ddaaed6598df'
3d05ce17 Merge commit '710d0096aa62355bf6c212efb3f6f9392ccd3f37'
deec05fc Merge commit '62c51bb410b3f9fd18cc5a21b5341e9652089d86'
a75a9caa Merge commit '4473286a216928665f9c1b00932687c9945175a9'
0409a3ed Merge commit 'b9f44da20a78a23395d38205c001298f6a68bd0c'
dcd7188a Merge commit '20ab4be9f3235740e6ed5ede81bca488adffd991'
7ea1a6d4 Merge commit '2d2f55adc0376d3ba4bc366e0e8bcc44f658a9c7'
554256e3 Merge commit '33f589897a8e09ca3dd745b150f3eb6555347052'
d4a8833a Merge commit 'e224625f086369b838e5db00d5105b30f444b963'
fa25db5d Merge commit '50016849a03a70eeb0f714f23a3b56f1983a8189'
fb31cc38 [iphreeqc] updated image location
870f0f08 Merge commit '055ebf5c1ffe61bba8b37743f1bddd93007131b9'
0c9d4081 Merge commit '589d88ff89b061b46289530165ad032642fbdaa4'
b6fffd47 Merge commit 'f4bf55d7bf26ca64edec1836ca4d2708427962ce'
7cbba0ec Merge branch 'gtest' into 'master'
621401d3 reset for dlls
c03b987c Merge commit 'e904f5b730e622046aedacf704a6e888654c7517'
1f5428a9 Merge commit 'e562e09e9ae00671933f9800a302629f50d945dc'
53ad340b Merge commit 'ea2c663c90fe84a9c191eac91286bb2afed4bd15'
7faca848 Merge commit '0b0fced395d40a23a1eb8514688a812c13e4db02'
abb80b51 added src/phreeqcpp/common/PHRQ_exports.h
b030a0b9 Merge remote-tracking branch 'origin/master' into gtest
5ab593e6 Merge commit '18e137ff556c9e9410d9cb995bfc0369891bc484'
6e38872a Merge commit '3782d4420d3d6282315acfecf33b3c7e7da333d0'
c1077d70 Merge commit 'd4261840c7f7720e5a76a941790ce48d40480097'
99b48a4f Merge commit '6e7023f8428a4bfde82f7dc83287ae95b38f1d6b'
c4599034 added googletest and fixed some minor bugs
e221f73c implemented Get/SetErrorOn
75f4ab0b Merge commit 'b138ed208df65cd4653ea7a2e07332a3d3e1c8b2'
57cf38dd Merge commit '5631ce1e56cda328e8efac33a0ee998a7fd27489'
fb6c36a7 Merge commit '9d480bc124a4e9e979b4995476d086f90e3833e7'
24d69a05 Merge commit 'ea21e58a8f9bd9ae4de057ca2422d8a4f399826c'
5d70f691 Merge commit '9029c2bcba781cba475c035d5fb81f83c8ec56fa'
a19f9e7e Merge commit '74b541d42e40ef1ed8df0bfba9826e55b046e9f0'
bef8a01c Merge commit '1c3edaa7473043f049372de76a3d622b45d3fed3'
c41548d3 Merge commit '89ca3d279fed2341cf35bc240da008836972fc7e'
c7f9087c Merge commit 'a208e3948a804c8fb689fa980739e341b6696a32'
fa9c36cf Merge commit 'a4c582649b4aae5e535960843a7d71567ac3d12e'
939f7ed8 Merge commit '090f5e682b8b44251566a2624fe8189744f727c5'
981dd81e Merge commit '9bcc875c9ed6ddb30a29500ca89de8f9281bac80'
1bd3f958 Merge commit '8e901d060dba068ab2390e9917de4cee52c4979c'
40edae93 Merge commit 'bb5bcbf15eb0ff4efe3dceb70b3682fd6a59f47f'
eff757c8 Merge commit '108755553045b7943d024ecd512cddb233ee9c63'
22ec3a55 Merge commit '92807718ee036df029c57351fdd15b4a456d4496'
d5e6c6b7 Merge commit 'efbddbf6dc5b3bca3076b50d39c42a196ae551c8'
d48de197 Merge commit 'eed9de906915d10ceaf4ec3df3bf5ee3132ad80b'
5f653835 Added .gitlab-ci.yml
918da84d Merge commit '757927da596446462e8daceb57b20bba2c591f33'
bc0a05cc Merge commit 'aa963a9cae20b9634b4c41e7b6387a2b22b28445'
c5ff2477 Merge commit '0366caf10b0748d78cb718898c714e1397a008b4'
49681a22 Merge commit 'd97736a3a718c05c91a3aa6eb567c18538464436'
10163985 Merge commit 'd0e5bac5843adf417da9a722e8f8ae8405442d26'
9d49905c IPhreeqc: ifdef'd out references to std::cerr and std::cout
f6023203 Merge commit 'e5bf8b0aa61996d6b4ee40820a7b7f79cb649444'
077fbf97 Merge commit 'fd242bd33f1f6b3b91cd6d4f5a5336db0edfa81e'
1ab3235e Merge commit '3049467b561ef8176c81341b76b883b2179380f2'
9a6afb37 Merge commit 'd7188d25f30f33d2158082341224dda94f4bc1cc'
589d6ba5 Merge commit '679c637ed207c2a2418be64d4ee1ca140073ba90'
d7ab7115 Merge commit 'd8ba4ac6103d1c7c360f637fddab0625bc616878'
545e81ba Merge commit '63108ac76d6fa7c378c21690b6342333c4cb446c'
82dc185a Merge commit '86888c465e9f7ff2ab6e5dfea003fc6ba73383b6'
a18a3a3b Merge commit '26c751fd7e74b54a4e51859b0fcb35dc5c059558'
cde1f9fa Merge commit 'd9a6717e802cbfebd983b9b2b2bca59508b732f6'
a83306d3 Merge commit '86c543395fda4a9fe20062975c117edfca880c9d'
3a7b01f3 Merge remote-tracking branch 'coupled/master'
183eaeee CRAN: replaced deprecated std::ptr_fun with lambda function
e0e589f7 Merge commit '5b3379b947de79f9182a880a74500f50dc234f54'
957b1211 Merge commit '67342a4d0414680313fce8eca4c7f81c67b49004'
0b392972 Merge commit '8412823930dd6ea12f1be8dbbe64c50354748df2'
7ff05ddc Merge commit '5a46f0d778ddd534e263fa93df8e4d0baab370a3'
5a43b70d Merge commit 'aa34ac11538c27f39c44c34938411f1e00afce19'
79896027 Merge commit '79c28e50c1ac44195f0aafc8279f601f1f40c836'
027862ac Merge commit '94155a63c62b057011f9c961e240e0e04721ca05'
5b1de2f7 Merge commit '51fbb3d5b08d20592bbc358d2f7ca25b75c74691'
788a8426 Merge commit '1e4a2941b3b1d0cecacd0bba8c0252b87e74dca8'
b38349aa Merge commit '3b7308661a560e4d0984da531dbeb155a2420d1a'
2431c5b3 Merge commit 'f0c3701bdee8ef3901b9b50698eb46b61574d086'
f485cbe9 Merge branch 'issue-3' into 'master'
9cbf676d Merge commit 'fbde6453ae53afa9bd4910ff00b48ecccc1153b8'
7237eb26 Merge branch 'issue-2' into 'master'
e3ea51f8 Fixed -Wcatch-value warnings reported by CRAN
d157977b Merge commit '548aead510d42fd3998eb74be8a5f94396c69bea'
1eb3ed94 Merge commit '12df06b34cba4744a36bf519bb7298caf98a320a'
1bbc0044 Merge commit '43386a0bc4d26c2891a23c27cfb2bae0f6cec9eb'
f5695865 Merge commit 'f90fc5afeaa5347ef057416551bb406e8ce5d855'
4c7946af Added code to record git commit hash
ad4fc43e Merge commit '1a4422b8af0f7801aa8cfcff161804516ac50910'
6091a42e Merge commit '1bfc9f49d032d42460c4e993f3aafc8a3f341625'
8170cb98 Merge commit '749c3e09ee53cd345d1375e72ebf3c10591581b2'
eefd6bfa Merge commit '1150a4a2aa4b6957fbf8bb2cf1d0c58ce8cf81d5'
fdb8d137 Merge commit 'c2dada993c2edb3f80f9bae636ace9b099073051'
85c8d55a Merge commit '4235170d91bbc77f6775c141ada27b130518329b'
a8730c6e Merge commit '65dbd2c15b866dd75bc66faab28f0761ebaf348d'
c1c6ca18 Merge commit '6e92ecf9efab80668453622bc42226616043320e'
bf865f6a Merge commit 'dbefc44f31ee85768c0ac5a2f9eeba05c525eabe'
9e0bf943 Merge commit 'c83e4bf78e37924add9da5889dc133e335d3efe6'
a69488c6 Merge commit 'c4fa021ec11b89ab9f4498823409abae9c256d1b'
39d69af2 Merge commit 'ec4ec0a3cb6abe172788ffc9d7db5d183390b4da'
30ae101a Merge commit '3a0292c6956e0bb4d9bf1e9b4bed9831ac517d39'
da6660ae Merge commit '7b836dd6cffc6e52c29192e6ae7583044c27cadb'
bda358e2 Merge commit 'b3e7b2eca602b628e05c15dd920a1cb470980736'
d667690f Merge commit 'ae05e0a661652f55323bd8f394a8907b01df36ad'
a56973f6 Merge branch 'cran-warnings' into 'master'
e5a7fa63 [IPhreeqc] added parens for clang++ -Wlogical-op-parentheses
088f389c Merge commit '113fd9aa5ed6507dabd3364a831d8bcbc9cf17c4'
0f7b19ad Merge commit '6894b4a7b1ef73cae9d582609173cb84f52e5b3c'
c6865539 Merge commit 'd96f386211ad5fbace94d550ca371d9eacb3262f'
f2e39872 removed register keywords and updated for misc clang warnings
487accaf Merge commit 'ebeddcde9d54e3e79c8923496a0b7573432d9388'

git-subtree-dir: src
git-subtree-split: 9545998b7058790c2d5523f0191ed0ffc44ae44c
 2025-06-26 00:18:26 +00:00
github-actions[bot]
0bccf2aca8 Merge commit '264db5ed7a41ee575f227d7cacedf0b61f40b1d5' 2025-06-26 00:18:26 +00:00
Charlton, Scott R.
9c5d9b3e6b
Cleanup (#72) 2025-06-25 14:29:02 -06:00
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
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
6c9b8aaf07 Merge commit 'febfa05e38044719e80b19c6a74a6070fce3c1e7' 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