74 Commits

Author SHA1 Message Date
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
Scott R Charlton
1a9e010282 Renamed IPhreeqcLib.h to IPhreeqc.h
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4221 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-04-07 20:52:16 +00:00
Scott R Charlton
0fa1c00856 renamed return values IPL_ to IPQ_
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4214 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-04-06 21:50:37 +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
1757fbf86f added DeleteFile prototype for linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4204 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-04-02 02:55:41 +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