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

2136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darth Vader
83b1930eae Merge commit 'd554fc3acfdfbe18c34c6c527fc685643129db2b' 2023-11-18 01:32:52 +00:00
Darth Vader
6ce9ad665a Merge commit '589ec40c7ce71d50ea98f7ff283f58ed5283cb29' 2023-11-18 01:30:46 +00:00
Darth Vader
589ec40c7c Squashed 'phreeqcpp/' changes from 3e6c2e9..ff1cc7a 
ff1cc7a [phreeqci] Updated to compile on vs2005

git-subtree-dir: phreeqcpp
git-subtree-split: ff1cc7aa82e0ec1145f593a84025ff174af18463
 2023-11-18 01:30:46 +00:00
Darth Vader
77e7356d7f Merge commit 'd1b5d92efc04bd216d5354cb2df537d1ded008b0' 2023-11-16 05:12:33 +00:00
Darth Vader
c7c1a23d71 Merge commit 'deb497735e9dea915ec582d42e671e0cfbcdd10e' 2023-11-16 05:11:36 +00:00
Darth Vader
deb497735e Squashed 'phreeqcpp/' changes from 625f6f1..3e6c2e9 
3e6c2e9 Merge commit 'c4958bb740964f1804a6a4e6ae5d8df52c5c64ad'
c4958bb Squashed 'common/' changes from b9af572..740bdd5

git-subtree-dir: phreeqcpp
git-subtree-split: 3e6c2e94e308d95c2be3b98e50cf0f253f327a29
 2023-11-16 05:11:36 +00:00
Darth Vader
4883e48156 Merge commit '37276c050f8194055e00a875c185c4f0ffe38abf' 2023-11-16 05:09:42 +00:00
Darth Vader
1df4f18911 Merge commit 'ed1fbe949157f56f0799b2170ce207b7716a10f2' 2023-11-16 05:06:28 +00:00
Darth Vader
ed1fbe9491 Squashed 'phreeqcpp/' changes from bd2e2b6..625f6f1 
625f6f1 Fixed bugs in inverse
ea9e0ef strcpy_safe and strcat_safe
9b06157 trying different header files
e890269 added <cstring>
c370c7b warnings, strcat, strcpy
14ed59f Try using goto(s)
d2d31d2 Try updated logical expression
d2a3eac Turn off optimizing on k_temp

git-subtree-dir: phreeqcpp
git-subtree-split: 625f6f14905e41a1130a3d0a217b8de478631aca
 2023-11-16 05:06:27 +00:00
Darth Vader
832810fcf7 Merge commit '1b2eb6ca0dfb1229d50bcb58c12ac6d6f63bbe4c' 2023-11-16 05:04:40 +00:00
David Parkhurst
81f180a069 Fixed bugs in inverse 2023-11-14 22:37:11 -07:00
David Parkhurst
6d575967d4 strcpy_safe and strcat_safe 2023-11-14 14:37:25 -07:00
David Parkhurst
6d98c4e13d trying different header files 2023-11-13 15:35:27 -07:00
David Parkhurst
72796f154c added <cstring> 2023-11-13 15:18:55 -07:00
David Parkhurst
e848160727 warnings, strcat, strcpy 2023-11-13 14:32:40 -07:00
Charlton, Scott R
988bdee0a6 Try using goto(s) 2023-10-31 14:15:28 -06:00
Charlton, Scott R
9b10ce3f5c Try updated logical expression 2023-10-31 13:34:41 -06:00
Charlton, Scott R
812061be2c Turn off optimizing on k_temp 2023-10-31 11:57:11 -06:00
Darth Vader
42ba243209 Merge commit '10bcb271d74cf65f6427a7293f1b32c043bc7180' 2023-08-27 01:17:34 +00:00
Charlton, Scott R
6e248c34be 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
4662baee2f 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
4d2181b795 Fixed bug that caused selected_output to 
accumulate in selected_output storage
 2023-08-25 19:44:03 -06:00
Charlton, Scott R
6721837c27 Fixed bug that caused selected_output to 
accumulate in selected_output storage
 2023-08-25 19:44:03 -06:00
Darth Vader
b4b9e7da01 Merge commit '1a3663493c8f6e1f9accef266dce18790271ca2b' 2023-08-25 15:29:56 +00:00
Darth Vader
6ea0442d45 Squashed 'phreeqcpp/' changes from 8dade82..bd2e2b6 
bd2e2b6 Merge remote-tracking branch 'usgs-coupled/master'
f170ab5 Merge branch 'usgs-coupled:master' into phreeqc-1-working
4cbc303 bug fix on Basic functions; minor update to Release.txt

git-subtree-dir: phreeqcpp
git-subtree-split: bd2e2b68ccf277552f19c498e9ef0b972c6d8b7e
 2023-08-25 15:29:27 +00:00
Darth Vader
d5808fd188 Merge commit '6ea0442d458c0a029140954f6c801006cac0871b' 2023-08-25 15:29:27 +00:00
Darth Vader
c9d004b611 Merge commit 'fb29ba4c3af45fd6745970fda308ff13353edc9c' 2023-08-25 03:36:29 +00:00
Darth Vader
99b1030598 Squashed 'phreeqcpp/' changes from 3b5f98c..8dade82 
8dade82 Merge commit '64c9761e116474c4c9e673976f02111fbec32caf'
64c9761 Squashed 'common/' changes from a088e29..b9af572

git-subtree-dir: phreeqcpp
git-subtree-split: 8dade82c963a39f50ceeaab4d2d7b9700b53822f
 2023-08-25 03:34:17 +00:00
Darth Vader
99451c0855 Merge commit '99b10305984102705405888e62ff98cae0c70fe6' 2023-08-25 03:34:17 +00:00
Darth Vader
1b46a8dcf2 Merge commit '8d6d4a6b4fae111d36a3225507095202e684a40f' 2023-08-25 03:33:23 +00:00
Darth Vader
e902474819 Squashed 'phreeqcpp/' changes from 8fa568f..3b5f98c 
3b5f98c No memory leaks; Still need to turn-on Fortran

git-subtree-dir: phreeqcpp
git-subtree-split: 3b5f98c838520da9638d08384186b2c85103ff30
 2023-08-25 03:29:16 +00:00
Darth Vader
52357404b5 Merge commit 'e902474819623e9469f66b6514a8293063ff2b86' 2023-08-25 03:29:16 +00:00
Darth Vader
3415544f41 Merge commit '90ccb6dc2bfcd1b2fa9aa0492f4553cf4f598f49' 2023-08-25 03:28:29 +00:00
Charlton, Scott R
0cb7f62994 No memory leaks; Still need to turn-on Fortran 2023-08-10 11:01:24 -06:00
Darth Vader
bdef7c5ddb Merge commit '0e67b4a4541435fa7c4f2c07a642c313d5e1ce1a' 2023-05-28 20:03:31 +00:00
Darth Vader
322a40bb3a Squashed 'phreeqcpp/' changes from 6dade54..8fa568f 
8fa568f removed src/print.cpp.utf8
d140c3f End of Run after

git-subtree-dir: phreeqcpp
git-subtree-split: 8fa568f0b446527445c0601dc860cfeab5626212
 2023-05-28 19:59:33 +00:00
Darth Vader
8da0b21940 Merge commit '322a40bb3a8db90d73fe707afaee51381e422aad' 2023-05-28 19:59:33 +00:00
Darth Vader
90aef6de86 Merge commit 'c50de2e4a793129b1bf6d016c2ed405544bd21cd' 2023-05-26 04:33:20 +00:00
Darth Vader
dd7aa46600 Squashed 'phreeqcpp/' changes from 82515f7..6dade54 
6dade54 Merge commit '4f698833b1b758cefb3440762b18bec08bb945b9'
4f69883 Squashed 'common/' changes from 7c31f5b..a088e29

git-subtree-dir: phreeqcpp
git-subtree-split: 6dade54926bd93a4c9a2bcbd792a41b525784929
 2023-05-26 04:32:50 +00:00
Darth Vader
446e7a8a2a Merge commit 'dd7aa466004fee2b8f0ddc5ba8c04e6199af7fc8' 2023-05-26 04:32:50 +00:00
Darth Vader
76d4300cad Merge commit 'd83e815edb69ae222734ebc4168810cae56e3cec' 2023-05-26 04:28:17 +00:00
Darth Vader
050663209b Squashed 'phreeqcpp/' changes from 93ab5c9..82515f7 
82515f7 Merge remote-tracking branch 'origin/master'
1cc4fa0 fix phi for water at high TP. Tony May, 2023
275b340 Tony's changes May 5 and 7.
0fb2509 cleaned up compiler warnings. removed math.h. cleaned up NAN

git-subtree-dir: phreeqcpp
git-subtree-split: 82515f7fecada9be373fd832dd0c5cdf53c79da7
 2023-05-26 04:27:58 +00:00
Darth Vader
32fbc5ab56 Merge commit '050663209be623e2af35e3f93a41ac6f5ac1f18f' 2023-05-26 04:27:58 +00:00
Darth Vader
14b90528ac Merge commit '0e6c28f22663d72c558025b5ae69ce50ac3b2f62' 2023-05-26 02:37:26 +00:00
Darth Vader
dc26aa2a8f Squashed 'phreeqcpp/' changes from b12de1f..93ab5c9 
93ab5c9 Merge commit '2841329ea39783ebc402e2644413de9e72904213'
2841329 Squashed 'common/' changes from 6e625e5..7c31f5b

git-subtree-dir: phreeqcpp
git-subtree-split: 93ab5c94e48156a2792207f284e9413df097c82f
 2023-05-26 02:36:52 +00:00
Darth Vader
9bd0be28d6 Merge commit 'dc26aa2a8fe1111439df64025df25f8f01a615fe' 2023-05-26 02:36:52 +00:00
Darth Vader
0032f1420a Merge commit '7c3113fb1d452576ff5b6f00a39665a3e3c6da54' 2023-05-26 02:33:23 +00:00
Darth Vader
35dec7bafc Squashed 'phreeqcpp/' changes from e7c12e1..b12de1f 
b12de1f Added sleeps after curl -X POST
fb55642 working on SelectedOutput for BMI
a050758 Closes #48 -- Illegal character encoding in string literal (#49)

git-subtree-dir: phreeqcpp
git-subtree-split: b12de1f7f0eadb7b6153bffca9d0412801d2e132
 2023-05-26 02:32:21 +00:00
Darth Vader
b9bc048c32 Merge commit '35dec7bafcb86c2fb40acc463c51be5af1af21b4' 2023-05-26 02:32:21 +00:00
Darth Vader
36e3e73d15 Merge commit '71af2952a3513766833883f90c18105fd8e7f174' 2023-05-26 02:28:11 +00:00