max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
280 Commits 6 Branches 4 Tags
Commit Graph

28 Commits

Author SHA1 Message Date
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
e9cabb51cd working on Output routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5958 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-29 01:17:47 +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
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
e80e834067 updated documentation 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4472 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-27 04:13:34 +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
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
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
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
0c2b055f18 still working on docs 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4332 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-04 07:04:52 +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
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
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
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
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
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
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
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
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
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
2ac72344de Rearranging IPhreeqc 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4105 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-02-23 05:03:55 +00:00