468 Commits

Author SHA1 Message Date
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
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
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
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
Richard M Webb
6c6dacabab Project check in after upgrading to Visual Studio 2012
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7734 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-05-24 16:24:17 +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
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
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
25cbfeeb64 added ignore
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7509 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-03-04 22:30:11 +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
David L Parkhurst
089981f633 external now points to phreeqc3 database
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7493 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-21 16:38:14 +00:00
Scott R Charlton
3365ff2f4e NOTE: fortran projects (.vfproj) may not be compatible between versions (ie w_cprof_p_11.1.054 -> w_fcompxe_2013.1.119)
for VS2008 solutions
targets placed in top directory $(SolutionDir)
changed $(Configure) to $(ConfigureName)
removed src/phreeqcpp/phreeqc from includes
removed (d) from debug libraries

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7492 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-21 07:01:19 +00:00
Scott R Charlton
9e1e626028 added ignores
cleaned up /MP 
changed $(Configuration) to $(ConfigurationName)

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7491 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-21 05:53:21 +00:00
David L Parkhurst
294d1baebf vs2010 project files for webmod-trunk
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7484 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-21 00:49:30 +00:00
Richard M Webb
34c2f91de7 creating webmod on svn_GW -- added missing project files
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7481 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-20 01:48:01 +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
d865a2a91d added added missing project files:
IPhreeqc.rc resource.h


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7415 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-30 21:49:30 +00:00
Scott R Charlton
9de87feef0 added missing project files:
IPhreeqc.rc resource.h

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7414 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-30 21:43:52 +00:00
Scott R Charlton
23e6d5688f added NOTICE.txt to dist
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7410 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-30 06:53:00 +00:00
Scott R Charlton
3577978eda added svn:ignore; added NOTICE to dist
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7408 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-30 06:17:18 +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
3d7940b907 added missing documentation links
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7384 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-25 03:02:34 +00:00
Scott R Charlton
15f2fb2769 fixed empty clrx64
clrx64 files were copied to libx64

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7380 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-24 22:11:28 +00:00