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

3973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charlton, Scott R
d77b07649c
Updated tm6-A43.pdf links 2023-12-06 16:36:07 -07:00
Charlton, Scott R
35521760a5
Missed adding R.cpp 2023-12-06 12:13:58 -07:00
Charlton, Scott R
220db26eb7
Fixes v3.7.5 for CRAN 2023-12-06 11:58:57 -07:00
Darth Vader
0d4210cb6c Merge commit 'cb06063eaebcdc140a770d4f70fcda2b74345a04' 2023-11-20 01:06:37 +00:00
Darth Vader
cb06063eae Squashed 'phreeqc3-doc/' changes from f1ef4343..f289b94c 
f289b94c Updated to force subtree merges

git-subtree-dir: phreeqc3-doc
git-subtree-split: f289b94cda5705b762909891b8f330e7f243595b
 2023-11-20 01:06:36 +00:00
Darth Vader
4a8e5582e7 Squashed 'database/' changes from 6b0972bd..e0447f7a 
e0447f7a Minimum data base.

git-subtree-dir: database
git-subtree-split: e0447f7ad56fc91f0c37b79f3e895fd700f048a6
 2023-11-20 00:17:18 +00:00
Darth Vader
ad2e4c190a Merge commit '4a8e5582e71650340a3a0d4368b02a1e09af3ac3' 2023-11-20 00:17:18 +00:00
Darth Vader
7c3090dc15 Squashed 'phreeqc3-doc/' changes from 12e58e3e..f1ef4343 
f1ef4343 [skip ci] Fixed typo Added path-ignore to github actions
b81c0fa8 update RELEASE.TXT
fd52458b release notes update

git-subtree-dir: phreeqc3-doc
git-subtree-split: f1ef4343674725bf10c69247bec90f3e5549a093
 2023-11-20 00:17:11 +00:00
Darth Vader
3c3b930f79 Merge commit '7c3090dc15d95be8759e7c83d885d63590ad7895' 2023-11-20 00:17:11 +00:00
Darth Vader
7f291d1c56 Squashed 'src/' changes from a8a469b2..ba2ac191 
ba2ac191 Merge commit '488c119ac8fb2c9755ce3708519c79f4bd7d382c'
488c119a Squashed 'phreeqcpp/' changes from f975e17..9925ceb

git-subtree-dir: src
git-subtree-split: ba2ac191650c3db3e396fd006e26c18587efdf09
 2023-11-18 03:55:04 +00:00
Darth Vader
d60f911361 Merge commit '7f291d1c56070131ef8e5b665c58dfb953ec5ebd' 2023-11-18 03:55:04 +00:00
Darth Vader
7027935759 Squashed 'src/' changes from 6ce9ad66..a8a469b2 
a8a469b2 Merge commit 'a5b8a03fd7c84cdedb6507c4cd0679b46997ed7d'
a5b8a03f Squashed 'phreeqcpp/' changes from ff1cc7a..f975e17

git-subtree-dir: src
git-subtree-split: a8a469b26ffa800f78faccbe9e072640563d8e3f
 2023-11-18 01:36:06 +00:00
Darth Vader
e5912ff5ee Merge commit '70279357596338c2e09bbe32fefe5417e82193df' 2023-11-18 01:36:06 +00:00
Darth Vader
d554fc3acf Squashed 'src/' changes from c7c1a23d..6ce9ad66 
6ce9ad66 Merge commit '589ec40c7ce71d50ea98f7ff283f58ed5283cb29'
589ec40c Squashed 'phreeqcpp/' changes from 3e6c2e9..ff1cc7a

git-subtree-dir: src
git-subtree-split: 6ce9ad665a2c2df324fb9e1f7317da862fc4f4dd
 2023-11-18 01:32:52 +00:00
Darth Vader
2ae904be96 Merge commit 'd554fc3acfdfbe18c34c6c527fc685643129db2b' 2023-11-18 01:32:52 +00:00
Charlton, Scott R
a3f4407c10
Added workflow_dispatch 2023-11-16 08:52:13 -08:00
Darth Vader
d1b5d92efc Squashed 'src/' changes from 1df4f189..c7c1a23d 
c7c1a23d Merge commit 'deb497735e9dea915ec582d42e671e0cfbcdd10e'
deb49773 Squashed 'phreeqcpp/' changes from 625f6f1..3e6c2e9

git-subtree-dir: src
git-subtree-split: c7c1a23d71636e117713e6a0e74a7b7ac8cff803
 2023-11-16 05:12:33 +00:00
Darth Vader
976c9f2bc4 Merge commit 'd1b5d92efc04bd216d5354cb2df537d1ded008b0' 2023-11-16 05:12:33 +00:00
Darth Vader
37276c050f Squashed 'src/' changes from 81f180a0..1df4f189 
1df4f189 Merge commit 'ed1fbe949157f56f0799b2170ce207b7716a10f2'
ed1fbe94 Squashed 'phreeqcpp/' changes from bd2e2b6..625f6f1

git-subtree-dir: src
git-subtree-split: 1df4f189113f240fd735471f78f038415071d500
 2023-11-16 05:09:42 +00:00
Darth Vader
f3e2cf93c6 Merge commit '37276c050f8194055e00a875c185c4f0ffe38abf' 2023-11-16 05:09:42 +00:00
Darth Vader
e47e051db0 Merge commit '1b2eb6ca0dfb1229d50bcb58c12ac6d6f63bbe4c' 2023-11-16 05:04:40 +00:00
Darth Vader
1b2eb6ca0d Squashed 'src/' changes from 6e248c34..81f180a0 
81f180a0 Fixed bugs in inverse
6d575967 strcpy_safe and strcat_safe
6d98c4e1 trying different header files
72796f15 added <cstring>
e8481607 warnings, strcat, strcpy
988bdee0 Try using goto(s)
9b10ce3f Try updated logical expression
812061be Turn off optimizing on k_temp

git-subtree-dir: src
git-subtree-split: 81f180a069285bcb4d180c860664b4b2a193854d
 2023-11-16 05:04:39 +00:00
Darth Vader
4aa362825b Merge commit '10bcb271d74cf65f6427a7293f1b32c043bc7180' 2023-08-27 01:17:34 +00:00
Darth Vader
10bcb271d7 Squashed 'src/' changes from d5808fd1..6e248c34 
6e248c34 Updated to pass unit tests on linux Added two additional selected_output tests:   TestSelectedOutputFileMultipleRuns   TestGetSelectedOutputRowCountMultipleRuns
4d2181b7 Fixed bug that caused selected_output to accumulate in selected_output storage

git-subtree-dir: src
git-subtree-split: 6e248c34be4094371c707879f5142cb2fe353a1f
 2023-08-27 01:17:34 +00:00
Charlton, Scott R
8beb102d54
Merge pull request #33 from scharlton2/32-memory-leak-in-selected_output 
Closes #32 Selected Output Memory Leak
 2023-08-26 18:58:42 -06:00
Charlton, Scott R
431e4201ed Updated to pass unit tests on linux 
Added two additional selected_output tests:
  TestSelectedOutputFileMultipleRuns
  TestGetSelectedOutputRowCountMultipleRuns
 2023-08-26 18:15:23 -06:00
Charlton, Scott R
9919afd8ab Fixed bug that caused selected_output to 
accumulate in selected_output storage
 2023-08-25 19:44:03 -06:00
Darth Vader
1a3663493c Squashed 'src/' changes from 99451c08..d5808fd1 
d5808fd1 Merge commit '6ea0442d458c0a029140954f6c801006cac0871b'
6ea0442d Squashed 'phreeqcpp/' changes from 8dade82..bd2e2b6

git-subtree-dir: src
git-subtree-split: d5808fd1883cb30122c94d058584f462e0af4074
 2023-08-25 15:29:56 +00:00
Darth Vader
41d3a2b050 Merge commit '1a3663493c8f6e1f9accef266dce18790271ca2b' 2023-08-25 15:29:56 +00:00
Darth Vader
9bbf6b76e6 Merge commit '51e91d4a6b2ace1ddb2318b83d780b5989f67af1' 2023-08-25 15:29:55 +00:00
Darth Vader
51e91d4a6b Squashed 'phreeqc3-doc/' changes from ae15b211..12e58e3e 
12e58e3e bug fix on Basic functions; minor update to Release.txt

git-subtree-dir: phreeqc3-doc
git-subtree-split: 12e58e3ec323fb6ce38b4e93c82fb36ad2212a81
 2023-08-25 15:29:54 +00:00
Darth Vader
fb29ba4c3a Squashed 'src/' changes from 52357404..99451c08 
99451c08 Merge commit '99b10305984102705405888e62ff98cae0c70fe6'
99b10305 Squashed 'phreeqcpp/' changes from 3b5f98c..8dade82

git-subtree-dir: src
git-subtree-split: 99451c08559e74014d45752e0b7d1c2c0a6c6bfe
 2023-08-25 03:36:29 +00:00
Darth Vader
8f2e448b10 Merge commit 'fb29ba4c3af45fd6745970fda308ff13353edc9c' 2023-08-25 03:36:29 +00:00
Darth Vader
8d6d4a6b4f Squashed 'src/' changes from 0cb7f629..52357404 
52357404 Merge commit 'e902474819623e9469f66b6514a8293063ff2b86'
e9024748 Squashed 'phreeqcpp/' changes from 8fa568f..3b5f98c

git-subtree-dir: src
git-subtree-split: 52357404b505448cd243c2714dfd4bcd7b95c183
 2023-08-25 03:33:23 +00:00
Darth Vader
7ae468cdbd Merge commit '8d6d4a6b4fae111d36a3225507095202e684a40f' 2023-08-25 03:33:23 +00:00
Darth Vader
90ccb6dc2b Squashed 'src/' changes from 8da0b219..0cb7f629 
0cb7f629 No memory leaks; Still need to turn-on Fortran

git-subtree-dir: src
git-subtree-split: 0cb7f629943a58c808f22ad2d8f169f83beb38ff
 2023-08-25 03:28:29 +00:00
Darth Vader
fabcb86e96 Merge commit '90ccb6dc2bfcd1b2fa9aa0492f4553cf4f598f49' 2023-08-25 03:28:29 +00:00
Darth Vader
6055c1a5b3 Squashed 'phreeqc3-examples/' changes from d037d5dd..5fe290be 
5fe290be Updated for phreeqc changes Introduce end-of-line normalization for CMakeLists.txt

git-subtree-dir: phreeqc3-examples
git-subtree-split: 5fe290beff62c5de43bf4e776e94d5b55db85cca
 2023-05-29 03:27:15 +00:00
Darth Vader
057dcbc0f0 Merge commit '6055c1a5b3fcf2421eb4b6c59e5378dbc0347a29' 2023-05-29 03:27:15 +00:00
Darth Vader
31a786d02b Merge commit '2454551b038deee7637d55450db1122e94fd8fc5' 2023-05-29 03:27:13 +00:00
Darth Vader
2454551b03 Squashed 'examples/fortran/' changes from 45020608..209412f4 
209412f4 Updated for phreeqc changes Introduce end-of-line normalization for CMakeLists.txt

git-subtree-dir: examples/fortran
git-subtree-split: 209412f4d9d11bfeb15d74cbf7372ea6787a49cd
 2023-05-29 03:27:12 +00:00
Darth Vader
e37fdc5bc2 Merge commit 'ce6d37c593b1ba9c23cad05228bd1f57b50d5ccc' 2023-05-29 03:21:02 +00:00
Darth Vader
ce6d37c593 Squashed 'examples/com/' changes from a68a1861..3ed6cb65 
3ed6cb65 Updated for phreeqc changes Introduce end-of-line normalization for CMakeLists.txt

git-subtree-dir: examples/com
git-subtree-split: 3ed6cb654ab872b3a516d8414c0f21a2e3e584e5
 2023-05-29 03:21:02 +00:00
Darth Vader
4871571065 Merge commit 'aa532d5fa4b93899d93da0dcbffa5490a5c932de' 2023-05-29 03:20:59 +00:00
Darth Vader
aa532d5fa4 Squashed 'examples/c/' changes from 82c54e70..1680e5b7 
1680e5b7 Updated for phreeqc changes Introduce end-of-line normalization for CMakeLists.txt

git-subtree-dir: examples/c
git-subtree-split: 1680e5b76fc4f1008166df4b07cfa12049f7ff51
 2023-05-29 03:20:59 +00:00
Charlton, Scott R
cacfdd0de0
Merge pull request #31 from scharlton2/master-update-2023-05-28 
Updated for phreeqc changes
 2023-05-28 21:15:08 -06:00
Charlton, Scott R
90a6449de8 Updated for phreeqc changes 
Introduce end-of-line normalization for CMakeLists.txt
 2023-05-28 20:14:57 -06:00
Darth Vader
0e67b4a454 Squashed 'src/' changes from 446e7a8a..8da0b219 
8da0b219 Merge commit '322a40bb3a8db90d73fe707afaee51381e422aad'
322a40bb Squashed 'phreeqcpp/' changes from 6dade54..8fa568f

git-subtree-dir: src
git-subtree-split: 8da0b219402f72d81e06aeeceef5160237e3a59e
 2023-05-28 20:03:31 +00:00
Darth Vader
a13fbe0134 Merge commit '0e67b4a4541435fa7c4f2c07a642c313d5e1ce1a' 2023-05-28 20:03:31 +00:00
Darth Vader
4b937c6116 Squashed 'phreeqc3-examples/' changes from 807a4444..d037d5dd 
d037d5dd End of Run after

git-subtree-dir: phreeqc3-examples
git-subtree-split: d037d5dd5e9f686a236886814fccc9c7421b24d3
 2023-05-28 19:59:00 +00:00