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

450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
12ac80f2a7 # 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@4412 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-18 03:17:39 +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
8cfffff789 added F90ClearAccumulatedLines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4410 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-17 23:44:32 +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
502ee6ba6a dlpark changes; needs second go through~ 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4404 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-17 06:29:04 +00:00
Scott R Charlton
1ddde15de8 alphabetized methods; made dlpark changes upto about GetDumpLine 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4403 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-15 03:06:34 +00:00
Scott R Charlton
763c9310ad updated Doxyfile to exclude undocumented members 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4402 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-15 01:49:17 +00:00
Scott R Charlton
8a0e427058 updated IPhreeqc.h for doxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4401 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-15 01:08:08 +00:00
Scott R Charlton
f58d014d7a added documentation to build script 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4396 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 04:50:47 +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
7ca49bf144 minor changes 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4394 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 04:22:03 +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
d478c050a3 working on adding examples to doxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4392 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 04:17:45 +00:00
Scott R Charlton
b7317dda11 working on adding examples to doxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4391 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 04:00:46 +00:00
Scott R Charlton
80708d69fd removed Last from method names 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4390 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 02:57:20 +00:00
Scott R Charlton
bfaa321cb1 working on latex to pdf from doxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4389 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-13 00:22:11 +00:00
Richard M Webb
197bf2d327 visual studio 2008 project files Intel fortran 11.1.054 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4385 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-12 21:49:58 +00:00
Scott R Charlton
0f689c2f0a deleted .cvsignore file 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4382 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-12 02:57:30 +00:00
Scott R Charlton
ae735dd256 working on documentation 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4381 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-12 02:56:14 +00:00
Scott R Charlton
d94e805332 fixed tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4375 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 04:06:33 +00:00
Scott R Charlton
a45207b210 fixed tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4374 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 04:05:24 +00:00
Scott R Charlton
7923030c8c replaced ex1.in with ex2.in 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4373 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 03:57:50 +00:00
Scott R Charlton
9b89923bb8 reformatted tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4372 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 03:57:21 +00:00
Scott R Charlton
b8069190e8 added Makefile.in to ignore list 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4371 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 03:51:13 +00:00
Scott R Charlton
4ece30eb30 removed ex1.in 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4370 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 03:49:21 +00:00
Scott R Charlton
32384e5d94 updating tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4369 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 03:48:06 +00:00
Scott R Charlton
cec9449f9c updated tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4368 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 03:45:10 +00:00
Scott R Charlton
5d19f28a86 added project for f77 test 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4367 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 02:22:28 +00:00
Scott R Charlton
8ef74b1b0e changed return values for GetXXXOn functions to LOGICAL 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4366 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 02:19:31 +00:00
Scott R Charlton
25e8afb4b2 fixed runtime error 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4365 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 02:10:14 +00:00
Scott R Charlton
e74d083e83 added missing GetXXXOn functions 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4364 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 01:56:37 +00:00
Scott R Charlton
b969af7040 working on build scripts 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4363 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-11 01:01:23 +00:00
Scott R Charlton
ea474da6ae working on build scripts 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4362 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-10 22:06:19 +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
3df3f66ad2 working on build scripts 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4360 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-10 21:06:28 +00:00
Scott R Charlton
8b2adcac67 working on build scripts 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4359 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-10 21:01:02 +00:00
Scott R Charlton
9ccd968af4 added tests projects 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4358 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-10 06:16:57 +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
34ddf3b190 added standard return values 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4356 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-10 01:06:08 +00:00
Scott R Charlton
0afbe0bc72 untabify 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4354 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 19:30:31 +00:00
Scott R Charlton
d40e573da9 added return vals for fortran 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4353 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 19:09:26 +00:00
Scott R Charlton
411967ba7d reformated in emacs 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4352 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 18:55:39 +00:00
Scott R Charlton
076faf68b4 changed exit status 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4351 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 18:51:47 +00:00
Scott R Charlton
c973500dfd changed setFunc prototype 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4350 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 18:41:37 +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
295791a4a5 added req'd function checks 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4347 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 02:16:54 +00:00
Scott R Charlton
8263587da2 updating documentation 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4346 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-06 01:41:02 +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