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

55 Commits

Author SHA1 Message Date
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
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
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
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
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
5a5a449688 added ieee test based on kinn email 12/12/12 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7214 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-15 04:47:16 +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
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
f88aa3463d fixed for latest phreeqc3 (only TestIPhreeqcLib) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6778 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-13 00:32:01 +00:00
Scott R Charlton
1d6a305cf8 added missing commas 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6094 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-21 04:08:15 +00:00
Scott R Charlton
03bb47aaca working on unix 2-digit exponents 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6093 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-21 01:43:47 +00:00
Scott R Charlton
26aa1bc830 working on unix 2-digit exponents 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6092 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-20 23:38:55 +00:00
Scott R Charlton
1f92177354 passing on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6091 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-20 23:24:52 +00:00
Scott R Charlton
7139412258 error routines working on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6082 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-20 00:28:46 +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
Scott R Charlton
d31e8b0037 working on Dump/Output routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5951 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-28 22:58:01 +00:00
Scott R Charlton
1d7aa24d8d updated for latest phreeqcpp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5947 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-23 23:33:58 +00:00
Scott R Charlton
89e94dfbc1 implement and test GetOutputFileName and SetOutputFileName 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5946 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-23 23:09:43 +00:00
Scott R Charlton
306b8cb9fb added for rand on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5915 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-20 05:28:41 +00:00
Scott R Charlton
a728c6830e fixes for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5914 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-20 05:22:28 +00:00
Scott R Charlton
04aa629aed dump file changes 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5913 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-20 04:26:38 +00:00
Scott R Charlton
b6ddcdabc4 all passing on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5886 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-12 23:44:55 +00:00
Scott R Charlton
f5733f7403 added for clean compile on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5883 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-12 21:54:14 +00:00
Scott R Charlton
78a18a6a3c passes all uncommented tests on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5882 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-12 21:49:39 +00:00
Scott R Charlton
181868693f Fixed small memory leak and updated unit tests for DumpString 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5003 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-12-28 22:30:25 +00:00
Scott R Charlton
1f6e1f03b0 ListComponents is now cached 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4464 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-25 00:47:02 +00:00
Scott R Charlton
bc0669e732 removed UnLoadDatabase from public API 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4449 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-21 05:01:07 +00:00
Scott R Charlton
2c4422593b # IPQ_DLL_EXPORT int GetDumpOn(int id); 
#	IPQ_DLL_EXPORT int         GetDumpFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetDumpOn(int id, int dump_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetDumpFileOn(int id, int dump_on);
s/etDumpOn/etDumpFileOn/g
s/etdumpon/etdumpfileon/g
s/ETDUMPON/ETDUMPFILEON/g
#	IPQ_DLL_EXPORT int         GetErrorOn(int id);
#	IPQ_DLL_EXPORT int         GetErrorFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetErrorOn(int id, int error_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetErrorFileOn(int id, int error_on);
s/etErrorOn/etErrorFileOn/g
s/eterroron/eterrorfileon/g
s/ETERRORON/ETERRORFILEON/g
#	IPQ_DLL_EXPORT int         GetLogOn(int id);
#	IPQ_DLL_EXPORT int         GetLogFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetLogOn(int id, int log_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetLogFileOn(int id, int log_on);
s/etLogOn/etLogFileOn/g
s/etlogon/etlogfileon/g
s/ETLOGON/ETLOGFILEON/g
#	IPQ_DLL_EXPORT int         GetOutputOn(int id);
#	IPQ_DLL_EXPORT int         GetOutputFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetOutputOn(int id, int output_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetOutputFileOn(int id, int output_on);
s/etOutputOn/etOutputFileOn/g
s/etoutputon/etoutputfileon/g
s/ETOUTPUTON/ETOUTPUTFILEON/g
#	IPQ_DLL_EXPORT int         GetSelectedOutputOn(int id);
#	IPQ_DLL_EXPORT int         GetSelectedOutputFileOn(int id);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetSelectedOutputOn(int id, int sel_on);
#	IPQ_DLL_EXPORT IPQ_RESULT  SetSelectedOutputFileOn(int id, int sel_on);
s/etSelectedOutputOn/etSelectedOutputFileOn/g
s/etselectedoutputon/etselectedoutputfileon/g
s/ETSELECTEDOUTPUTON/ETSELECTEDOUTPUTFILEON/g
#	IPQ_DLL_EXPORT const char* GetDumpLine(int id, int n);
#	IPQ_DLL_EXPORT const char* GetDumpStringLine(int id, int n);
#	IPQ_DLL_EXPORT int         GetDumpLineCount(int id);
#	IPQ_DLL_EXPORT int         GetDumpStringLineCount(int id);
s/GetDumpLine/GetDumpStringLine/g
s/getdumpline/getdumpstringline/g
s/GETDUMPLINE/GETDUMPSTRINGLINE/g
#	IPQ_DLL_EXPORT const char* GetErrorLine(int id, int n);
#	IPQ_DLL_EXPORT const char* GetErrorStringLine(int id, int n);
#	IPQ_DLL_EXPORT int         GetErrorLineCount(int id);
#	IPQ_DLL_EXPORT int         GetErrorStringLineCount(int id);
s/GetErrorLine/GetErrorStringLine/g
s/geterrorline/geterrorstringline/g
s/GETERRORLINE/GETERRORSTRINGLINE/g
#	IPQ_DLL_EXPORT const char* GetWarningLine(int id, int n);
#	IPQ_DLL_EXPORT const char* GetWarningStringLine(int id, int n);
#	IPQ_DLL_EXPORT int         GetWarningLineCount(int id);
#	IPQ_DLL_EXPORT int         GetWarningStringLineCount(int id);
s/GetWarningLine/GetWarningStringLine/g
s/getwarningline/getwarningstringline/g
s/GETWARNINGLINE/GETWARNINGSTRINGLINE/g
#	IPQ_DLL_EXPORT void        OutputError(int id);
#	IPQ_DLL_EXPORT void        OutputErrorString(int id);
s/OutputError/OutputErrorString/g
s/outputerror/outputerrorstring/g
s/OUTPUTERROR/OUTPUTERRORSTRING/g
#	IPQ_DLL_EXPORT void        OutputLines(int id);
#	IPQ_DLL_EXPORT void        OutputAccumulatedLines(int id);
s/OutputLines/OutputAccumulatedLines/g
s/outputlines/outputaccumulatedlines/g
s/OUTPUTLINES/OUTPUTACCUMULATEDLINES/g
#	IPQ_DLL_EXPORT void        OutputWarning(int id);
#	IPQ_DLL_EXPORT void        OutputWarningString(int id);
s/OutputWarning/OutputWarningString/g
s/outputwarning/outputwarningstring/g
s/OUTPUTWARNING/OUTPUTWARNINGSTRING/g


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4411 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-18 01:59:33 +00:00
Scott R Charlton
93926c9b29 alphabetized src/IPhreeqcLib.cpp; added ClearAccumulatedLines routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4408 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-17 21:59:43 +00:00
Scott R Charlton
a51b8bba57 added pitzer test 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4393 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 04:21:28 +00:00
Scott R Charlton
298a715b8b Renamed GetLastErrorString to GetErrorString 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4339 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-04 23:36:21 +00:00
Scott R Charlton
a067053c23 updated for win32 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4275 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-21 05:22:09 +00:00
Scott R Charlton
564ee782ad git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4227 1feff8c3-07ed-0310-ac33-dd36852eb9cd 2010-04-08 00:26:48 +00:00
Scott R Charlton
57c0ad5a75 renamed *M routines without the M 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4223 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 21:30:49 +00:00