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

74 Commits

Author SHA1 Message Date
Scott R Charlton
e73aa3ac73 fixed crash that occurred when sit.dat was loaded twice 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9512 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-14 00:43:12 +00:00
Scott R Charlton
dc93c84f92 Fixed left shift operator error and null pointer error for R UBSAN check; 
Added INVERSE_CL1MP guard to cl1mp.cpp;
Added test for ex10


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9084 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-12-03 05:19:35 +00:00
Scott R Charlton
0272550872 added test for correct exception handling 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8948 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-09-11 03:23:50 +00:00
Scott R Charlton
4292284364 all tests passing (added "cell/soln/mix 1"). 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8822 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-09 04:16:21 +00:00
Scott R Charlton
66fc23c0cb AccumulatedLines are now cleared after LoadDatabase/LoadDatabaseString/RunFile/RunString. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8583 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-20 05:55:57 +00:00
Scott R Charlton
08d375a3c9 Fixes error that occurs when using the DATABASE keyword with multiple calls RunAccumulated 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8574 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-19 06:26:46 +00:00
Scott R Charlton
b685f71d36 added some database checking routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8565 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-03-17 22:49:04 +00:00
Scott R Charlton
7c831fc893 a few fixes 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8511 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-21 04:57:22 +00:00
Scott R Charlton
f03c453eb4 passes all unit tests on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8506 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-20 07:19:05 +00:00
Scott R Charlton
da57470970 changed so that 'dist' and 'time' are always doubles for R 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8446 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-02-06 00:40:58 +00:00
Scott R Charlton
90d4f97753 updated for latest output 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8392 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-01-23 04:49:45 +00:00
Scott R Charlton
0b6695be8f Added some assertions; optimized GetSelectedOutputValue; added some multi selected-output tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8285 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-12-05 23:59:31 +00:00
Scott R Charlton
bb2bda43ff updated for -soln_vol to dump files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8228 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-22 02:54:46 +00:00
Scott R Charlton
54db7172ef removed temporary test 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8160 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-02 01:20:55 +00:00
Scott R Charlton
4e28740d56 added GetVersionString 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8153 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-01 04:20:31 +00:00
Scott R Charlton
5b9b110386 fixed and added tests for SetSelectedOutputFileName 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8036 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-14 03:46:01 +00:00
Scott R Charlton
f5bcccafcb updated for (Set)CurrentSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8028 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-13 05:52:16 +00:00
Scott R Charlton
ce2cfdf6d5 added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8008 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:39:13 +00:00
Scott R Charlton
2b3c5ff8de all tests passing 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7990 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-29 03:53:19 +00:00
Scott R Charlton
58ba9e7990 A few tests need to be updated. 
Merged revision(s) 7882-7988 from IPhreeqc/branches/multi_punch:
multi_punch branch

........
Added a Fortran callback.

Will try to revise so that the same callback works for Fortran and C.
........
Revised name to BasicFortran

Added methods for C call SetBasicCallback.

Need to check C side and documentation.
........


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7989 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 23:32:19 +00:00
Scott R Charlton
b97a6552a3 fixed ifdefs for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7985 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 22:00:41 +00:00
Scott R Charlton
a1f3b4e5f2 Added TestMultiPunchCSelectedOutput routine 
replaced some file tests with FileTest instances

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7978 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 05:01:04 +00:00
Scott R Charlton
459fd958e9 changes req'd for multi_punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7967 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-27 05:07:46 +00:00
Scott R Charlton
c93bc1968a updated database paths for running on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7953 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-23 04:58:59 +00:00
Scott R Charlton
7bdca161c8 All tests passing on windows; before inverse change 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7952 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-23 04:46:35 +00:00
Scott R Charlton
0d17c9fc81 minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7948 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-20 02:32:38 +00:00
Scott R Charlton
f48261abcc minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7947 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-20 02:30:14 +00:00
Scott R Charlton
1e8bc19acb working on multi_punch tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7945 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-17 06:01:58 +00:00
Scott R Charlton
243349cc99 changed USER_PUNCH logic 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7943 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-16 05:14:34 +00:00
Scott R Charlton
7f9ba4d91a all tests passing for one selected_output file; 
may still need additional tests for TestIPhreeqc case1 and case2

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7919 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-12 22:24:18 +00:00
Scott R Charlton
5b0c82d1c1 updated dump tests (new -pressure line) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7881 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-03 00:44:59 +00:00
Scott R Charlton
437c7c5a3a fixed bug in DELETE reported by laurin.wissmeier@web.de 2013-06-01 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7755 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-06-03 22:05:52 +00:00
Scott R Charlton
cd3e92a77d sped up CErrorReporter<OS>::Clear(void) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7504 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-03-01 06:06:16 +00:00
Scott R Charlton
f9c9d8e6c2 updated projects for phreeqc directory removal 
data base => database



git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7345 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-19 01:49:44 +00:00
Scott R Charlton
f4dd53f001 updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7167 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-05 04:51:44 +00:00
Scott R Charlton
f151d88863 updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7166 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-05 04:33:20 +00:00
Scott R Charlton
594d832aa3 added test for BASIC SURF 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7165 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-05 02:50:14 +00:00
Scott R Charlton
28be24da1d added include for strstr 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7136 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-30 08:17:38 +00:00
Scott R Charlton
38a930e09e fixed ostringstream ctor 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7135 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-30 08:15:58 +00:00
Scott R Charlton
5026b11ad8 fixed buffer overwrite in fpunchf; 
updated unit tests for phreeqc3

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7132 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-30 07:31:46 +00:00
Scott R Charlton
8b97d9d7ef all tests finished; passes on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6095 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-21 05:02:34 +00:00
Scott R Charlton
2b8adbe34c fixed unchanged copy and paste 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6086 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-20 04:21:23 +00:00
Scott R Charlton
4c6539bd08 passing all tests on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6085 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-20 01:49:49 +00:00
Scott R Charlton
55b38474c3 updated comparisons for x64 versions 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6011 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-10 05:21:25 +00:00
Scott R Charlton
8aac409a98 updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6009 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-10 01:00:13 +00:00
Scott R Charlton
643c87cccb updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6008 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-10 00:54:53 +00:00
Scott R Charlton
9ee44ed4be passing windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6007 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-10 00:34:13 +00:00
Scott R Charlton
89a2a78689 updated for latest phreeqcpp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6004 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-10 00:04:35 +00:00
Scott R Charlton
d5d37e65af windows log functions passed (w/ phreeqcpp -r 5966) except for (PHRQ_io.h -r 5990) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5991 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-05 23:07:20 +00:00
Scott R Charlton
9d0e428781 renamed test cases 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5956 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-29 00:12:28 +00:00