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

61 Commits

Author SHA1 Message Date
Charlton, Scott R
90a6449de8 Updated for phreeqc changes 
Introduce end-of-line normalization for CMakeLists.txt
 2023-05-28 20:14:57 -06:00
Charlton, Scott R
af20075233 fixed clr testing 2021-05-05 14:17:00 -06:00
Charlton, Scott R
5c61108b60 added googletest and fixed some minor bugs 2020-08-25 12:27:15 -06:00
Charlton, Scott R
1059b78bb4 implemented Get/SetErrorOn 2020-08-25 12:17:54 -06:00
Scott R Charlton
0ac279c652 added additional Get test to TestGetSet 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10284 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-18 06:17:09 +00:00
Scott R Charlton
73db0d827e added common to include 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10063 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 04:45:55 +00:00
Scott R Charlton
be73d77965 added common to include 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10059 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 02:50:07 +00:00
Scott R Charlton
481dc0dd0d working on fixing fortran bug 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9766 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-06-03 06:02:40 +00:00
Scott R Charlton
38a71d8350 bug fix for dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9723 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-26 07:48:17 +00:00
Scott R Charlton
59af250088 fixed mismatched intents warning 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9643 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-12 22:52:34 +00:00
Scott R Charlton
eabcb897b1 created IPHREEQC_ENABLE_MODULE option 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9638 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-12 04:48:46 +00:00
Scott R Charlton
c6e2d523b6 IPHREEQC_BUILD_FORTRAN -> IPHREEQC_FORTRAN_TESTING 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9627 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-05-08 23:31:16 +00:00
Scott R Charlton
20b75597b6 added ../src/phreeqcpp/PhreeqcKeywords to include path 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9510 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-14 00:38:01 +00:00
Scott R Charlton
ba8c433e6a adding CMake files for dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9443 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-01 01:37:35 +00:00
Scott R Charlton
e881a4f001 updated doxygen files and added silent rules for compiles 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9442 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-04-01 01:18:15 +00:00
Scott R Charlton
206f5bc8a7 working on fortran module 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9378 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-18 22:03:19 +00:00
Scott R Charlton
595bac559d renamed test_f90.f90 to test_f90.F90 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9377 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-18 06:35:23 +00:00
Scott R Charlton
9db51aae38 working fortran 2003 builds 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9369 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-17 03:15:22 +00:00
Scott R Charlton
13c3a32e13 working on fortran/test integration 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9361 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-14 01:24:18 +00:00
Scott R Charlton
68cb2cc5e5 working on fortran/test integration 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9360 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-14 01:17:56 +00:00
Scott R Charlton
3770b76f8c updated for PhreeqcKeywords 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9355 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-03-13 06:14:19 +00:00
Scott R Charlton
9a6cb18dbf 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
87acf4aea8 added CLR configurations 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/zedgraph@7204 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-14 04:04:50 +00:00
Scott R Charlton
5c509db111 updated to latest version 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/zedgraph@7203 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-14 04:03:47 +00:00
Scott R Charlton
72544fab0a fixed for x64 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6362 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-05 03:37:13 +00:00
Scott R Charlton
f043ea431a removed include directory 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6047 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-12 00:30:56 +00:00
Scott R Charlton
918541e7a0 getting rid of include driectory to avoid duplicate header files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6025 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 01:18:11 +00:00
Scott R Charlton
73ef3121ad added extra include path for PHRQ_io.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6013 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-10 05:23:02 +00:00
Scott R Charlton
374c4be5f9 working on Output routines 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5959 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-29 03:49:12 +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
94b22908e0 added missing files for windows versions 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5221 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-03-22 23:13:09 +00:00
Scott R Charlton
950aa3c9c3 working on distribution 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5219 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-03-22 04:06:35 +00:00
Scott R Charlton
253a2e9fdd added common preprocessor definitions and added IPhreeqc.vsprops 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4475 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-28 06:00:39 +00:00
Scott R Charlton
bf97275eeb initialized VAR 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4474 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-28 00:08:43 +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
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
a0ac5895e9 changed ENDDO to END DO and ENDIF to END IF 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4452 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-05-21 07:33:33 +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
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
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
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
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
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
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
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