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

270 Commits

Author SHA1 Message Date
Scott R Charlton
5c19837bc5 changed selected.id.out to selected_n.id.out 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8021 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 04:37:05 +00:00
Scott R Charlton
01b94d05d6 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8020 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 03:54:02 +00:00
Scott R Charlton
9829d75af3 working on dist 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8019 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-07 03:43:35 +00:00
Scott R Charlton
05872a6340 updated for new multi selected output files 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8016 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-06 23:22:12 +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
ad321ba6e6 added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8007 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:38:25 +00:00
Scott R Charlton
c40ada60a7 added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8006 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:37:29 +00:00
Scott R Charlton
6321adfa4d added SetCurrentSelectedOutputUserNumber GetCurrentSelectedOutputUserNumber GetSelectedOutputCount GetNthSelectedOutputUserNumber 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8005 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-09-05 06:35:59 +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
3d8d0158ce fixed for phreeqc3-multi-punch; 
passes all unit tests

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7979 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 05:03:26 +00:00
Scott R Charlton
f9405e0d26 updated some documentation for multi-punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7975 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-28 04:57:23 +00:00
Scott R Charlton
3213fc06b5 cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7968 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-27 05:27:58 +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
187f8598b3 minor cleanup 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7949 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-20 02:34:08 +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
7cc185b67d working on multi_punch tests for IPhreeqc 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7946 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-17 06:18:06 +00:00
Scott R Charlton
aa376c126b updates for multi_punch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7928 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-13 22:06:57 +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
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
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
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