mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-15 16:18:22 +01:00
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
This commit is contained in:
parent
febfa05e38
commit
264db5ed7a
6
.github/subtrees.json
vendored
Normal file
6
.github/subtrees.json
vendored
Normal file
@ -0,0 +1,6 @@
|
||||
[
|
||||
{
|
||||
"prefix": "phreeqcpp",
|
||||
"url": "git@${CI_SERVER_HOST}:${GROUP}-subtrees/phreeqc3-src.git"
|
||||
}
|
||||
]
|
||||
20
.github/workflows/lint-subtrees.yml
vendored
Normal file
20
.github/workflows/lint-subtrees.yml
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
name: Lint subtrees.json
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
paths:
|
||||
- '.github/subtrees.json'
|
||||
workflow_call:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
lint-subtrees:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
CI_SERVER_HOST: github.com
|
||||
GROUP: ${{ github.repository_owner }}
|
||||
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
steps:
|
||||
- uses: usgs-coupled/sync-subtrees-action/lint-subtrees/@main
|
||||
with:
|
||||
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
Loading…
x
Reference in New Issue
Block a user