706 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
c2e8112075 whitespace
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8022 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-09 22:08:42 +00:00
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
45073898a9 working on dist
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8018 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-07 00:43:29 +00:00
Scott R Charlton
fde4104c34 working on dist
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8017 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-07 00:40:15 +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
3fa099261f minor changes for linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8015 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 21:44:07 +00:00
Scott R Charlton
a61511a2fe renamed F90SetBasicCallback.f90 to F90SetBasicFortranCallback.f90
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8014 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 04:29:38 +00:00
Scott R Charlton
93ab13b89d added F90SetBasicCallback.f90
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8013 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 04:25:20 +00:00
Scott R Charlton
1fd4b81bf5 added missing headers for linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8012 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 02:16:27 +00:00
Scott R Charlton
c30454c78f formatting
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8011 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 01:47:38 +00:00
Scott R Charlton
9bf00aa48a added SetBasicCallback example
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8010 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-06 01:45:34 +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
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