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

190 Commits

Author SHA1 Message Date
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
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
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
3d17a599db added Use[h,cpp] to makfile 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6065 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-12 22:03:56 +00:00
Scott R Charlton
f043ea431a removed include directory 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6047 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-12 00:30:56 +00:00
Scott R Charlton
2598dc83a7 still removing include directory 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6027 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 04:02:10 +00:00
Scott R Charlton
37951f4fcb updated include file Var.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6026 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 03:18:20 +00:00
Scott R Charlton
ac0f2e3e73 added to ignore list; added SS and removed SSassemblageSS 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6022 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-10 22:52:44 +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
b66f62eea1 added GasComp.o 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5995 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-08 20:10:30 +00:00
Scott R Charlton
339c1dc204 added GasComp.cxx to unit project; 
fixed typo in GasPhase.cxx

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5993 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-05 23:49:45 +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
f3c38358ce object output functions done 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5950 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-28 00:32:50 +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
aa6fc26907 added delete output file name in TestSetOutputFileName 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5931 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-21 00:42:18 +00:00
Scott R Charlton
924d501429 all linux tests pass 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5930 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-21 00:04:19 +00:00
Scott R Charlton
0daa7906c4 passes all on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5929 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-20 23:59:13 +00:00
Scott R Charlton
149e95007b git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5928 1feff8c3-07ed-0310-ac33-dd36852eb9cd 2011-12-20 23:56:50 +00:00
Scott R Charlton
0f2719f915 Added line count check 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5924 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-20 22:46:18 +00:00
Scott R Charlton
2dc918693b added gases.cpp 
fixed tabs for linux TestSetOutputFileName

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5923 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-20 22:37:08 +00:00
Scott R Charlton
36a092874e linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5922 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-20 21:55:39 +00:00
Scott R Charlton
5f2359ffb9 TestSetOutputFileName works on win32 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5916 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-20 06:36:17 +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
35a97c6467 added get_error_count 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5866 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-06 06:00:57 +00:00
Scott R Charlton
74ab039d76 updated for error handling 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5851 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-02 05:09:25 +00:00
Scott R Charlton
1c7cd170ef updated for reaction_pressure 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5849 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-02 01:47:48 +00:00
Scott R Charlton
c1dfb4cddc IPhreeqc passes all unit tests on VS2005 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5841 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-01 06:33:54 +00:00
Scott R Charlton
418e50e3ac updated unit tests for x64 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5228 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-03-24 22:00:21 +00:00
Scott R Charlton
20e9d73dc8 working on cppunit x64 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5223 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-03-24 00:00:54 +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
253a2e9fdd added common preprocessor definitions and added IPhreeqc.vsprops 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4475 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-28 06:00:39 +00:00
Scott R Charlton
9ee70f2cdd modified makefile to automate dependencies 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4473 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-27 23:16:41 +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