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

492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
6101f4f2c1 git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7988 1feff8c3-07ed-0310-ac33-dd36852eb9cd 2013-08-28 23:17:36 +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
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
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
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
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
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
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
79730ade9d added to svn:ignore 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7942 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-16 05:08:03 +00:00
Scott R Charlton
fb9ec899cd added c++ examples to configure distribution 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7941 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-16 05:05:03 +00:00
Scott R Charlton
ce8d99d67d changed to phreeqc3 databases 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7940 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-16 02:10:36 +00:00
Scott R Charlton
6a8da0d7da added cpp example to distribution 
now get databases from phreeqc3 trunk
overwrite databases used in examples

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7939 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-16 00:57:55 +00:00
Scott R Charlton
7e9e36af4e changed advect.c to acvect.cpp 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7938 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-16 00:12:43 +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
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
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
David L Parkhurst
02deb40ab3 Reorganized to put callback (and everything) in class. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7918 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-12 20:40:32 +00:00
David L Parkhurst
7cb9b0ff1f added Makefile's for Linux 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7905 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-12 14:47:31 +00:00
David L Parkhurst
5d78a2962c C++ advection example 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7897 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-08 19:55:09 +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
aaa8dfd905 Making new example for c++ 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7894 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-08 17:29:18 +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
06d4b78d2f Making 2012 IPhreeqc project 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7887 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-06 21:47:19 +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
f41ad187a2 multi_punch branch 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/multi_punch@7882 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-08-03 01:00:36 +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
David L Parkhurst
c527099b18 Exclude Model_eqns from project. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7853 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-07-22 17:32:41 +00:00
Richard M Webb
2aefcfef55 19-yr,10 MRU, 5 nac Andrews model now runs in about 50 minutes after removing unnecessary writes from MeltPack. 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7769 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-06-17 22:00:14 +00:00
Richard M Webb
881f4e6c7b Dave P added MeltPack routine 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7761 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2013-06-05 02:46:17 +00:00