max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
764 Commits 6 Branches 4 Tags
Commit Graph

168 Commits

Author SHA1 Message Date
Scott R Charlton
28f75ed56c updated for PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9368 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-16 22:18:25 +00:00
Scott R Charlton
0d6cba6ca7 updated for PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9367 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-16 22:05:20 +00:00
Scott R Charlton
4ced95f362 PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9366 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-16 21:32:37 +00:00
Scott R Charlton
fb2a597b12 PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9365 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-16 21:32:17 +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
a5ad315911 added windows memory checker (must define WIN32_MEMORY_DEBUG in unit.vcproj and undef USE_PHRQ_ALLOC in IPhreeqc.vsprops) 
no leaks

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8831 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-10 05:46:33 +00:00
Scott R Charlton
05f70fb8e7 new line at end of file 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8830 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-10 05:32:27 +00:00
Scott R Charlton
f520b61a58 TestIPhreeqcLib contains no leaks with WIN32_MEMORY_DEBUG defined 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8829 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-10 05:21:26 +00:00
Scott R Charlton
6be1451051 memory leak fix 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8828 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-10 04:57:31 +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
035c73c707 valgrind changes/set-but-unused vars 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8817 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-07-08 19:52:45 +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
5086b94ada Added some additional std::map checking 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8288 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-12-06 05:19:34 +00:00
Scott R Charlton
63ced92fda attempt to speedup compilations 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8286 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-12-06 00:22:09 +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
2abf4e8ff0 update for SelectedOutput rename 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8259 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-27 07:37:34 +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
4b62f6d670 added minor unit testing enhancement 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8157 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-01 06:45:24 +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
a44bcec013 updates reqd for vs2010 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8025 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-10 22:57:00 +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
8cf3bc7f5f all tests passing on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7991 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-29 04:05:25 +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
90ff41c480 Added Size routine 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7976 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 04:57:57 +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
5b051717fd removed src/SelectedOutput.hxx from project 
cleanup of src/phreeqcpp/SelectedOutput.cpp in project

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7930 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 23:07:54 +00:00
Scott R Charlton
d2ea1db561 updates for multi_punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7927 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 22:01:41 +00:00
Scott R Charlton
cdfb2a9937 updates for renaming SelectedOutput to CSelectedOutput 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7926 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:41:54 +00:00
Scott R Charlton
e24befd9c5 accidentally checked in 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7924 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:27:22 +00:00
Scott R Charlton
60684008e7 fixes compile error on linux; 
changes made for TestIPhreeqc::case2 

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7923 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:26:16 +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