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

270 Commits

Author SHA1 Message Date
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
bf97275eeb 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
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
dfc8d64da2 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
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
d2077ae177 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
8c45a02271 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
670eba09a3 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
5609f86a7e 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
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
c3c73ef9d3 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
955c24ddbe 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
0f8c1d7b74 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
3943216561 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
d87e238bbb 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
712aabbdac 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
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
9de5eada69 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
41f96f42d5 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
Scott R Charlton
8655376414 working on library versioning 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4327 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-03 22:19:55 +00:00
Scott R Charlton
809d177bbe combined src/Makefile.am src/phreeqcpp/Makefile.am src/phreecpp/phreeqc/Makefile.am into one file 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4316 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-27 22:25:21 +00:00
Scott R Charlton
baff9863e2 working on autotools 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4307 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-27 03:20:38 +00:00
Scott R Charlton
f5d7409793 modified Makefile.am's to handle each src dir independently 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4298 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-23 05:21:21 +00:00
Scott R Charlton
e18757d748 added newline al end of files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4293 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-22 21:00:35 +00:00
Scott R Charlton
87106c8d9d replaced malloc.h with stdlib.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4291 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-22 20:39:16 +00:00
Scott R Charlton
51c669367b changed svn:eol-style to native for many files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4276 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-21 05:29:27 +00:00
Scott R Charlton
e96f30ec73 working on autotools 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4273 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-21 04:49:32 +00:00
Scott R Charlton
9f60df9126 removed debugging code 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4272 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-21 00:17:20 +00:00
Scott R Charlton
4793b2a682 working on configure script and testing on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4271 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-20 23:30:04 +00:00
Scott R Charlton
96ce9e27aa Added AC_F77_WRAPPERS handling 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4262 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-16 06:56:42 +00:00
Scott R Charlton
961ceeb1a5 still working on autotools integration 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4261 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-16 06:24:43 +00:00
Scott R Charlton
ffc76d6a4a working on autotools 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4260 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-15 06:47:05 +00:00
Scott R Charlton
32c9be79db working on autotools integration 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4259 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-15 03:36:24 +00:00
Scott R Charlton
d2398fda77 added missing fortran routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4257 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-14 23:07:01 +00:00
Scott R Charlton
19b2cb3c28 re-added src/fwrap.cpp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4253 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-14 04:22:59 +00:00
Scott R Charlton
f6bfd6fbed merged in IPhreeqc-class 4140-4239 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4251 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-14 04:10:37 +00:00
Scott R Charlton
d94c5030a0 Added support for dll run time libraries 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4239 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-09 04:22:42 +00:00
Scott R Charlton
18d18ebee1 added underscores 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4230 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-08 00:52:26 +00:00
Scott R Charlton
8d81109897 added GetWarningLineCount GetWarningLine for fortran 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4229 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-08 00:37:39 +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
33c23851e6 removed module_files.h module_files.cpp module_output.cpp FInterface.for 
renamed IPhreeqc2 to IPhreeqc



git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4226 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 22:59:00 +00:00
Scott R Charlton
9489dbf7e6 renamed IPhreeqc2.h to IPhreeqc.hpp 
renamed IPhreeqc2.cpp to IPhreeqc.cpp

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4225 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 22:13:33 +00:00
Scott R Charlton
bd84d6358c renamed *2 routines without the 2 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4224 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 21:41:55 +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
1c3cc0882e updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4219 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-07 00:51:52 +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
ecaddcf49f Remove from unit: 
TestInterface.cpp
	TestInterface.h
		IPhreeqc.hpp
		IPhreeqc.h
		IPhreeqc.cpp
		module_output.cpp
		module_files.cpp
		fwrap.cpp
		fwrap2.cpp
		fwrap3.cpp
		IPhreeqc.cpp
		CVar.hxx
		ErrorReporter.hxx
		OutputFiles.hxx
		Phreeqc.hxx
		PhreeqcParser.hxx
		SelectedOutput.hxx
		Var.h
Remove from IPhreeqc
	IPhreeqc.cpp
	IPhreeqc.h
	IPhreeqc.hpp
	module_output.cpp
	module_files.cpp


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4213 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-06 20:56:38 +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