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

100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott R Charlton
a69da2dd27 Error implementation w/o unit testing 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6068 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-13 04:22:16 +00:00
Scott R Charlton
0b16f6a237 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
401ed03156 added changes for use 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6045 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-12 00:01:23 +00:00
Scott R Charlton
9d9fcdc930 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6029 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 05:01:44 +00:00
Scott R Charlton
bd7675256b working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6028 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 04:59:21 +00:00
Scott R Charlton
4490d97970 getting rid of include driectory to avoid duplicate header files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6025 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 01:18:11 +00:00
Scott R Charlton
1e2c368e86 added phreeqcpp/GasComp[h,cxx] added phreeqcpp/SS[h,cxx] remove 
SSassemblageSS[h,cxx]

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6024 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 00:20:22 +00:00
Scott R Charlton
9674406e59 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
61ec1524c9 working on Output routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5959 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-29 03:49:12 +00:00
Scott R Charlton
2f569318ea working on Output routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5957 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-29 00:59:15 +00:00
Scott R Charlton
69f09506a5 builds and passes make check on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5954 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-28 23:12:52 +00:00
Scott R Charlton
51aa0032c4 working on Dump/Output routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5953 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-28 23:11:14 +00:00
Scott R Charlton
79b92c20b2 working on Dump/Output routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5952 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-28 23:00:47 +00:00
Scott R Charlton
b7b845adfd 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
7bbabd61e2 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
0f42bbf34f 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
6ed1078f05 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
e48bd89121 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
ef4455591a 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
a189246292 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
a1af034961 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
fccdaa79de replaced dump_file with dump_ostream 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5867 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-06 07:30:12 +00:00
Scott R Charlton
dd713ed065 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
b6fe6dd6b6 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
a749742d19 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
89f4961673 added phreeqcpp/phreeqc/NA.h to src/Makefile.am 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5468 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-07-12 05:34:33 +00:00
Scott R Charlton
1b9d96122a removed phreeqcpp/char_star.h from src/Makefile.am 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5467 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-07-12 05:18:27 +00:00
Scott R Charlton
887c4d6eae updated for output_file rename 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5222 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-03-22 23:26:17 +00:00
Scott R Charlton
ae090a01b3 added missing files for windows versions 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5221 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-03-22 23:13:09 +00:00
Scott R Charlton
12746394ba Cleaned up some more memory leaks reported by Intel Inspector XE 2011 (Kinneburgh) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5005 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-12-29 01:33:27 +00:00
Scott R Charlton
656d81aed9 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
5fa682d846 initialized VAR 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4474 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-28 00:08:43 +00:00
Scott R Charlton
1874da5f1d 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
4480134e5d updated include files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4450 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-21 05:09:18 +00:00
Scott R Charlton
556b588e64 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
f8f24e1c78 Added AddWarning AddError C/Fortran methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4439 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-20 18:49:08 +00:00
Scott R Charlton
cf6d8d2eaf added open_output_files method 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4429 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-20 01:30:47 +00:00
Scott R Charlton
7427c34aa1 renamed DLL_EXPORT to IPQ_DLL_EXPORT 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4420 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-18 05:07:56 +00:00
Scott R Charlton
c30ed6369a resorted renamed methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4413 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-18 04:35:20 +00:00
Scott R Charlton
67f49a29c0 # 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
caa9bd83ca 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
4c0e1fbdff changed to avoid warnings from intel c++ compiler 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4395 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 04:23:01 +00:00
Scott R Charlton
ed8ca4aedd All tests compile in all configurations 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4357 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-10 06:12:42 +00:00
Scott R Charlton
c3c27d34d8 working on fortran interfaces 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4349 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 06:48:20 +00:00
Scott R Charlton
4a9fdcfffb added KIND= to fortran wrappers 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4348 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 03:18:32 +00:00
Scott R Charlton
2f1b9f0d90 Added some additional error handling for GetDumpString; 
Changed return value for UnLoadDatabase.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4345 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 01:31:08 +00:00
Scott R Charlton
166750a340 Changed error messages 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4343 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-05 21:25:06 +00:00
Scott R Charlton
0fc11d724b 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
51ee087d84 removed SAX header files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4329 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-03 22:34:37 +00:00
Scott R Charlton
272f661a96 removed libtool versioning for now 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4328 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-03 22:23:43 +00:00