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

146 Commits

Author SHA1 Message Date
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
7e04e4cc14 renamed SelectedOutput to CSelectedOutput 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7925 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 21:30:41 +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
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
e277acc3b4 updated thread.h to compile w/ VS2005 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7667 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-05-01 01:19:59 +00:00
Scott R Charlton
46d8c60d6d 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
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
David L Parkhurst
6620be7ce8 EndRow had extra loop on rows that was not needed. 
For many rows (400,000), it was unworkable before this fix.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7503 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-03-01 00:44:56 +00:00
Scott R Charlton
275fae5d67 added library versioning code 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7446 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-02-07 01:27:06 +00:00
Scott R Charlton
43b7a04226 updated for resources 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7392 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-28 20:48:27 +00:00
Scott R Charlton
a2dec5ecd9 added missing header files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7364 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-23 21:29:29 +00:00
Scott R Charlton
d7f41b5db2 added missing files for windows build 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7363 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-23 20:58:45 +00:00
Scott R Charlton
984fe50f82 updated for phreeqc directory removal 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7346 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-01-22 21:20:16 +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
3298cb401a 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
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
David L Parkhurst
42eeff69e9 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
5eaf0d1d00 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
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
ebab169642 updated for doxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6755 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-10 02:30:37 +00:00
Scott R Charlton
6386cb025e fixed for doxygen 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6754 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-10 02:23:35 +00:00
Scott R Charlton
f745420e74 removed phreeqcpp/Phreeqc_class.h 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6736 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-06 23:54:04 +00:00
Scott R Charlton
c8efb96f8d 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
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
Richard M Webb
fe6505cf2b shortened line to fit 72 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6667 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-06-13 23:55:12 +00:00
Richard M Webb
750c3f280e changed comment char 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6666 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-06-13 23:54:02 +00:00
Scott R Charlton
107bef9f63 added additional FORTRAN wrappers for different External Procedure conventions 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6643 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-06-07 05:27:48 +00:00
Scott R Charlton
2945b9852e updated for latest IPhreeqc 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6641 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-06-07 00:21:55 +00:00
Scott R Charlton
6d6d32c79e removed phreeqcpp/SolutionIsotopeList.[h,cxx] 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6363 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-04-05 03:38:11 +00:00
Scott R Charlton
5c2b30516c added SScomp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6185 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-02-07 22:09:35 +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
0ddd9b0adb working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6106 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 05:31:57 +00:00
Scott R Charlton
0696a2bd99 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6103 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 04:58:12 +00:00
Scott R Charlton
f67cc37b15 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6100 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:57:52 +00:00
Scott R Charlton
67cc9ad3f4 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6099 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:49:33 +00:00
Scott R Charlton
1e24845ea5 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6098 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:46:10 +00:00
Scott R Charlton
6b4e9714c6 working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6097 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:42:47 +00:00
Scott R Charlton
fb0ec4984f working on documentation examples 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6096 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-24 00:04:40 +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
d2ae34e3f4 added missing SetSelectedOutputStringOn 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6079 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-18 04:33:40 +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
3d17a599db added Use[h,cpp] to makfile 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6065 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-12 22:03:56 +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
43c47667c5 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6029 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-11 05:01:44 +00:00