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

139 Commits

Author SHA1 Message Date
Scott R Charlton
a44bcec013 updates reqd for vs2010 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8025 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-10 22:57:00 +00:00
Scott R Charlton
ce2cfdf6d5 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
Scott R Charlton
8cf3bc7f5f all tests passing on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7991 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-29 04:05:25 +00:00
Scott R Charlton
2b3c5ff8de all tests passing 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7990 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-29 03:53:19 +00:00
Scott R Charlton
58ba9e7990 A few tests need to be updated. 
Merged revision(s) 7882-7988 from IPhreeqc/branches/multi_punch:
multi_punch branch

........
Added a Fortran callback.

Will try to revise so that the same callback works for Fortran and C.
........
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@7989 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 23:32:19 +00:00
Scott R Charlton
b97a6552a3 fixed ifdefs for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7985 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 22:00:41 +00:00
Scott R Charlton
a1f3b4e5f2 Added TestMultiPunchCSelectedOutput routine 
replaced some file tests with FileTest instances

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7978 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 05:01:04 +00:00
Scott R Charlton
90ff41c480 Added Size routine 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7976 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 04:57:57 +00:00
Scott R Charlton
459fd958e9 changes req'd for multi_punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7967 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-27 05:07:46 +00:00
Scott R Charlton
c93bc1968a updated database paths for running on linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7953 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-23 04:58:59 +00:00
Scott R Charlton
7bdca161c8 All tests passing on windows; before inverse change 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7952 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-23 04:46:35 +00:00
Scott R Charlton
0d17c9fc81 minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7948 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-20 02:32:38 +00:00
Scott R Charlton
f48261abcc minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7947 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-20 02:30:14 +00:00
Scott R Charlton
1e8bc19acb working on multi_punch tests 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7945 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-17 06:01:58 +00:00
Scott R Charlton
243349cc99 changed USER_PUNCH logic 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7943 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-16 05:14:34 +00:00
Scott R Charlton
5b051717fd removed src/SelectedOutput.hxx from project 
cleanup of src/phreeqcpp/SelectedOutput.cpp in project

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7930 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 23:07:54 +00:00
Scott R Charlton
d2ea1db561 updates for multi_punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7927 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 22:01:41 +00:00
Scott R Charlton
cdfb2a9937 updates for renaming SelectedOutput to CSelectedOutput 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7926 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:41:54 +00:00
Scott R Charlton
e24befd9c5 accidentally checked in 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7924 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:27:22 +00:00
Scott R Charlton
60684008e7 fixes compile error on linux; 
changes made for TestIPhreeqc::case2 

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7923 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:26:16 +00:00
Scott R Charlton
7f9ba4d91a all tests passing for one selected_output file; 
may still need additional tests for TestIPhreeqc case1 and case2

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7919 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-12 22:24:18 +00:00
Scott R Charlton
5b0c82d1c1 updated dump tests (new -pressure line) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7881 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-03 00:44:59 +00:00
Scott R Charlton
437c7c5a3a fixed bug in DELETE reported by laurin.wissmeier@web.de 2013-06-01 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7755 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-06-03 22:05:52 +00:00
Scott R Charlton
9969a86f94 updated VPATH 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7704 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-10 21:40:59 +00:00
Scott R Charlton
c533e9a6ca updated unit tests for VS2010 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7668 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-01 01:41:00 +00:00
Scott R Charlton
cd3e92a77d sped up CErrorReporter<OS>::Clear(void) 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7504 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-03-01 06:06:16 +00:00
Scott R Charlton
f9c9d8e6c2 updated projects for phreeqc directory removal 
data base => database



git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7345 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-19 01:49:44 +00:00
Scott R Charlton
5a5a449688 added ieee test based on kinn email 12/12/12 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7214 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-15 04:47:16 +00:00
Scott R Charlton
f4dd53f001 updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7167 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-05 04:51:44 +00:00
Scott R Charlton
f151d88863 updated for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7166 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-05 04:33:20 +00:00
Scott R Charlton
594d832aa3 added test for BASIC SURF 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7165 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-05 02:50:14 +00:00
Scott R Charlton
cc6d0c2a45 added SScomp to makefile 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7164 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-12-05 00:55:36 +00:00
Scott R Charlton
424687c2aa removed SolutionIsotopeList.cxx 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7137 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-30 08:21:09 +00:00
Scott R Charlton
28be24da1d added include for strstr 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7136 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-30 08:17:38 +00:00
Scott R Charlton
38a930e09e fixed ostringstream ctor 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7135 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-30 08:15:58 +00:00
Scott R Charlton
913c869c53 added #ifdefs for linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7133 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-11-30 07:56:21 +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
Scott R Charlton
84e58d9650 added configure for unit testing 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6815 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-25 01:21:31 +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
168f551a87 removed SolutionIsotopeList.cxx from projects 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6617 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-05-31 23:25:02 +00:00
Scott R Charlton
8743683656 renamed unit.sln to unit.2005.sln 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6210 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-10 04:03:58 +00:00
Scott R Charlton
aac5cb8357 added /MP 
turned off MinimalRebuild
removed EditAndContinue debug info


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6209 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-10 04:02:38 +00:00
Scott R Charlton
79a50f0d72 removed link incremental 
updated DEV_CPPUNIT
added console to x64 versions
removed EditAndContinue to ProgramDatabase


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6208 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-10 03:57:23 +00:00
Scott R Charlton
f57fe5812c vs2010 conversion files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6204 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-09 23:54:33 +00:00
Scott R Charlton
913efbb0d1 changed $(DEV_CPPUNIT_1.10) to $(DEV_CPPUNIT_1_10) 
the period causes problems in VS2010

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6202 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-09 23:41:16 +00:00
Scott R Charlton
1564c0cf1a added /MP option to configurations 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6193 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-08 00:20:52 +00:00
Scott R Charlton
a3ea75219b updated phreeqcpp svn:externals from -r6064 to -r6109 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6110 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 23:39:40 +00:00
Scott R Charlton
8b97d9d7ef all tests finished; passes on windows 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6095 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-21 05:02:34 +00:00
Scott R Charlton
1d6a305cf8 added missing commas 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6094 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-21 04:08:15 +00:00
Scott R Charlton
03bb47aaca working on unix 2-digit exponents 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6093 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-21 01:43:47 +00:00