439 Commits

Author SHA1 Message Date
Scott R Charlton
73ef3121ad added extra include path for PHRQ_io.h
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6013 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 05:23:02 +00:00
Scott R Charlton
fa8def7f72 turn off warnings for dll linkage for std::list and std::vector
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6012 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 05:22:19 +00:00
Scott R Charlton
55b38474c3 updated comparisons for x64 versions
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6011 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 05:21:25 +00:00
Scott R Charlton
8aac409a98 updated for linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6009 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 01:00:13 +00:00
Scott R Charlton
643c87cccb updated for linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6008 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 00:54:53 +00:00
Scott R Charlton
9ee44ed4be passing windows
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6007 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 00:34:13 +00:00
Scott R Charlton
89a2a78689 updated for latest phreeqcpp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6004 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 00:04:35 +00:00
Scott R Charlton
b66f62eea1 added GasComp.o
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5995 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-08 20:10:30 +00:00
Scott R Charlton
339c1dc204 added GasComp.cxx to unit project;
fixed typo in GasPhase.cxx

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5993 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-05 23:49:45 +00:00
Scott R Charlton
d5d37e65af windows log functions passed (w/ phreeqcpp -r 5966) except for (PHRQ_io.h -r 5990)
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5991 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-05 23:07:20 +00:00
Scott R Charlton
0c6e714fd6 updated for doxygen
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5966 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-29 21:55:59 +00:00
Scott R Charlton
56c6af53d8 updated for doxygen
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5965 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-29 21:40:57 +00:00
Scott R Charlton
374c4be5f9 working on Output routines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5959 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-29 03:49:12 +00:00
Scott R Charlton
e9cabb51cd working on Output routines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5958 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-29 01:17:47 +00:00
Scott R Charlton
75745adf7a working on Output routines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5957 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-29 00:59:15 +00:00
Scott R Charlton
9d0e428781 renamed test cases
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5956 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-29 00:12:28 +00:00
Scott R Charlton
ef1e4a894b working on Dump/Output routines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5955 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-28 23:17:26 +00:00
Scott R Charlton
6f6b3d9de5 builds and passes make check on linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5954 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-28 23:12:52 +00:00
Scott R Charlton
d75655d267 working on Dump/Output routines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5953 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-28 23:11:14 +00:00
Scott R Charlton
a084a98b91 working on Dump/Output routines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5952 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-28 23:00:47 +00:00
Scott R Charlton
d31e8b0037 working on Dump/Output routines
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5951 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-28 22:58:01 +00:00
Scott R Charlton
f3c38358ce object output functions done
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5950 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-28 00:32:50 +00:00
Scott R Charlton
1d7aa24d8d updated for latest phreeqcpp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5947 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-23 23:33:58 +00:00
Scott R Charlton
89e94dfbc1 implement and test GetOutputFileName and SetOutputFileName
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5946 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-23 23:09:43 +00:00
Scott R Charlton
aa6fc26907 added delete output file name in TestSetOutputFileName
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5931 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-21 00:42:18 +00:00
Scott R Charlton
924d501429 all linux tests pass
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5930 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-21 00:04:19 +00:00
Scott R Charlton
0daa7906c4 passes all on windows
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5929 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-20 23:59:13 +00:00
Scott R Charlton
149e95007b git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5928 1feff8c3-07ed-0310-ac33-dd36852eb9cd 2011-12-20 23:56:50 +00:00
Scott R Charlton
0f2719f915 Added line count check
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5924 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-20 22:46:18 +00:00
Scott R Charlton
2dc918693b added gases.cpp
fixed tabs for linux TestSetOutputFileName

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5923 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-20 22:37:08 +00:00
Scott R Charlton
36a092874e linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5922 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-20 21:55:39 +00:00
Scott R Charlton
5f2359ffb9 TestSetOutputFileName works on win32
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5916 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-20 06:36:17 +00:00
Scott R Charlton
306b8cb9fb added for rand on linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5915 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-20 05:28:41 +00:00
Scott R Charlton
a728c6830e fixes for linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5914 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-20 05:22:28 +00:00
Scott R Charlton
04aa629aed dump file changes
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5913 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-20 04:26:38 +00:00
Scott R Charlton
b6ddcdabc4 all passing on windows
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5886 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-12 23:44:55 +00:00
Scott R Charlton
f5733f7403 added for clean compile on linux
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5883 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-12 21:54:14 +00:00
Scott R Charlton
78a18a6a3c passes all uncommented tests on windows
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5882 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-12 21:49:39 +00:00
Scott R Charlton
f7abe02b44 replaced dump_file with dump_ostream
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5867 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-06 07:30:12 +00:00
Scott R Charlton
35a97c6467 added get_error_count
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5866 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-06 06:00:57 +00:00
Scott R Charlton
4ffed55e78 added PHRQ_io member
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5864 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-06 02:48:53 +00:00
Scott R Charlton
74ab039d76 updated for error handling
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5851 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-02 05:09:25 +00:00
Scott R Charlton
2441b3a491 all but test_cxx pass all tests on vs2005
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5850 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-02 02:07:23 +00:00
Scott R Charlton
1c7cd170ef updated for reaction_pressure
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5849 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-02 01:47:48 +00:00
Scott R Charlton
c1dfb4cddc IPhreeqc passes all unit tests on VS2005
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5841 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-01 06:33:54 +00:00
Scott R Charlton
88f539c6a3 added code to handle IDS_*
added code for HANDLE
#ifdef'd the WaitForSingleObject



git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5786 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-11-17 00:43:10 +00:00
Scott R Charlton
c98279d460 added cpp and removed c files
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5676 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-04 04:17:30 +00:00
Scott R Charlton
74daa3fa26 changed external phreeqcpp to ErrorHandling branch
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5675 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-04 04:00:00 +00:00
Scott R Charlton
0c84b97726 init ErrorHandling branch
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@5674 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-04 03:44:01 +00:00
Scott R Charlton
57e03f329c added code to rearrange documentation
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@5494 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-07-14 06:35:37 +00:00