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

49 Commits

Author SHA1 Message Date
David L Parkhurst
b66d8cf775 Working on IPhreeqc Basic callback. Compiles with ISO_C_BINDING, but may need some more debugging. 
Need to merge this change with PhreeqcRM-trunk.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9424 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-27 22:03:36 +00:00
Scott R Charlton
6a4760abd6 changed all fortran string length parameters to be size_t 
simplified fortran wrappers for windows


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9015 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-10-29 01:59:37 +00:00
Scott R Charlton
202e29cb8e made catch(...) always rethrow; 
changed catches to const references


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8905 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-08-05 02:42:09 +00:00
Scott R Charlton
2174deb498 first pass @ removing std::cerr, std::cout, exit, stderr, stdout from R version. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8619 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-04-05 04:14:16 +00:00
Scott R Charlton
81009f8570 added GetVersionString 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8153 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-11-01 04:20:31 +00:00
Scott R Charlton
070baebe94 updated for (Set)CurrentSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8028 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-13 05:52:16 +00:00
Scott R Charlton
f74d6d8fe7 added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8008 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:39:13 +00:00
David L Parkhurst
b11bb4a3e1 functions are fcn 
Added cookie to c callback.



git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7895 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-08 19:53:31 +00:00
David L Parkhurst
9212e8f18d Fixed post-build in project 
Phreeqc.h was jacked up??? The has_infinite block did not end until the end of the file.

Made the arguments for the C callback double, double, const char *.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7888 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-07 17:01:30 +00:00
David L Parkhurst
dc6d21b5ae Revised name to BasicFortran 
Added methods for C call SetBasicCallback.

Need to check C side and documentation.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7884 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-05 20:53:54 +00:00
David L Parkhurst
21ca300721 Added a Fortran callback. 
Will try to revise so that the same callback works for Fortran and C.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7883 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-05 18:56:31 +00:00
Scott R Charlton
955b586120 minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7706 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-10 23:10:46 +00:00
Scott R Charlton
03560cdf35 new threading mutex patch from tmishima@jcity.maeda.co.jp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7705 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-10 22:15:00 +00:00
Scott R Charlton
7c603854bd added patch from tmishima@jcity.maeda.co.jp for multi-threaded use 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7648 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-04-26 00:49:59 +00:00
David L Parkhurst
9692cd2e3a Switched to OpenMP. 
64-bit version does not link. Something about virtual void I think.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6889 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-08-20 17:02:03 +00:00
David L Parkhurst
3a34995c8a Starting to work on next problems, arguments for RM_pass_data. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6804 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-20 23:03:08 +00:00
David L Parkhurst
abb8e82801 Checking in OpenMP pragmas in IPhreeqcLib.cpp. 
Working on Reaction_module, IPhreeqcPhast, and IPhreeqc interactions.

Runs through initial phreeqc calculation.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6800 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-20 00:20:16 +00:00
Scott R Charlton
e0a4cc067a Fixed typo 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6733 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-06 23:04:11 +00:00
Scott R Charlton
12c28b7f96 Added GetSelectedOutputValue2 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6731 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-06 22:55:42 +00:00
Scott R Charlton
3d1ee8f9e5 added fortran Error; SelectedOutput methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6077 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-18 04:04:00 +00:00
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
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
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
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
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
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
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
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
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
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
1ba5b0dcfa 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
b522a268b2 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
b90695455a 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
b51c3bf7d6 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
0a2feb4ad1 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
95e46c1659 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
7499d8f14d 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
7728a79b35 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
1daa55e41c 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
094d4c0684 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
d64227b546 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
0a15d767a5 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
44cd787d98 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
803eda0a67 passes all tests on win32; before changing to multiple instances 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4201 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-04-02 00:14:16 +00:00