27 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e102b97e84 Added TestRunString to cunit
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4211 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-04-05 22:38:14 +00:00
Scott R Charlton
dafa59942f passes all cunit tests on win32
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4200 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-04-01 23:11:17 +00:00