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

55 Commits

Author SHA1 Message Date
David L Parkhurst
329d568dbf 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
0018c3c5c9 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
2e951a7c8f 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
7b24d91241 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
5a169287f8 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
21898660f9 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
5026b11ad8 fixed buffer overwrite in fpunchf; 
updated unit tests for phreeqc3

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7132 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-30 07:31:46 +00:00
David L Parkhurst
8c8ff64c75 Compiles, working on writing HDF file. 
probalem with root.scalar_names

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6870 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-08-15 19:49:03 +00:00
David L Parkhurst
a1f1ccae9e Runs, getting xyz file right, checking results. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6864 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-08-10 23:02:55 +00:00
David L Parkhurst
f5351fcb74 Does initial conditions, but is really slow. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6814 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-24 22:35:37 +00:00
Scott R Charlton
f88aa3463d fixed for latest phreeqc3 (only TestIPhreeqcLib) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6778 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-13 00:32:01 +00:00
Scott R Charlton
306e09c6cc 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
cea8ab44a8 fixed bug in GetSelectedOutputString (bad args); 
cleared SelectedOutputString for each run

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6156 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-02 01:29:19 +00:00
Scott R Charlton
1f92177354 passing on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6091 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-20 23:24:52 +00:00
Scott R Charlton
7139412258 error routines working on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6082 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-20 00:28:46 +00:00
Scott R Charlton
9154649f39 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
7fd6443dde 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
f1fcacd889 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
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
d31e8b0037 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
f3c38358ce 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
5f2359ffb9 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
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
b6ddcdabc4 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
78a18a6a3c 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
f7abe02b44 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
35a97c6467 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
c1dfb4cddc 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
9219b5b721 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
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
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
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
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
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
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
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
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
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
4463d41703 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
Scott R Charlton
c0fd5b6c0f Working on Create and Destroy methods 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4187 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-23 22:29:50 +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
236c8fdcde Reduced risk during low memory conditions of error message handling 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4185 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-03-23 21:20:51 +00:00
Scott R Charlton
6257006116 git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4184 1feff8c3-07ed-0310-ac33-dd36852eb9cd 2010-03-23 21:05:40 +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
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