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

41 Commits

Author SHA1 Message Date
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
8932a3d9c0 updated copy commands 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4361 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-10 21:17:24 +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
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
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
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
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
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
581a68aa88 updated makefiles for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4212 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-05 23:25:09 +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
ab2a305be8 updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4208 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-03 03:55:24 +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
76a907a9ff added DeleteFile prototype for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4203 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-02 02:53:40 +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
Scott R Charlton
4eadde168a renamed Run to RunAccumulated; fixed RunString for fortran wrappers fwrap2 and fwrap3 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4186 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-23 22:25:37 +00:00
Scott R Charlton
27d7dd9d29 Added getter methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4182 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-20 02:50:03 +00:00
Scott R Charlton
e63239bfef updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4181 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-19 23:59:57 +00:00
Scott R Charlton
49ae95b333 changed .c extensions to .cpp extensions for the following files: 
fwrap.c
fwrap2.c
fwrap3.c
module_files.c
module_output.c
pp_sys.c

updated unit test for GetComponent


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4180 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-19 23:39:37 +00:00
Scott R Charlton
9ce16bc323 Added GETCOMPONENTCOUNT and GETCOMPONENT fortran routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4174 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-19 00:57:37 +00:00
Scott R Charlton
745917b89d moved list_components from class_main.cpp to Phreeqc.cpp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4173 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 23:57:42 +00:00
Scott R Charlton
0ec28bc18a fixed empty string bugs and added tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4168 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 04:39:55 +00:00
Scott R Charlton
cbcfbb6392 Added GetDumpLine/GetDumpLineCount tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4167 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 04:21:59 +00:00
Scott R Charlton
f616ceefab updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4166 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 03:54:50 +00:00
Scott R Charlton
3384e61308 need to test on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4165 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-18 03:21:45 +00:00
Scott R Charlton
45fe2d142c updated LDFLAGS 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4161 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-12 04:52:49 +00:00
Scott R Charlton
27ebe88061 updated dependencies 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4160 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-12 04:46:58 +00:00
Scott R Charlton
a4e62d3832 checkin to test on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4159 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-12 04:05:27 +00:00
Scott R Charlton
f0564e1198 format changes 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4152 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-10 06:04:38 +00:00
Scott R Charlton
adb8c93366 changes reqd to compile on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4150 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-06 04:55:37 +00:00
Scott R Charlton
7b7edd5637 Updated for IPhreeqc to use PHREEQC_CPP and PHREEQC_CLASS. Currently doesn't include gmp. MemDebug project still needs work. Needs to be tested on linux. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4145 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-05 21:20:09 +00:00
Scott R Charlton
71d54c4dee Rearranging IPhreeqc 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4110 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-02-23 05:06:43 +00:00