278 Commits

Author SHA1 Message Date
David L Parkhurst
2eff4a0a5f 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
9fab6884aa 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
3a34995c8a 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
abb8e82801 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
d91607335b 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
2e463d6f79 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
6b60e9d7cd 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
010f33b37b 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
Scott R Charlton
e0a4cc067a Fixed typo
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6733 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-06 23:04:11 +00:00
Scott R Charlton
12c28b7f96 Added GetSelectedOutputValue2
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6731 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-06 22:55:42 +00:00
Richard M Webb
b8c7004b6e shortened line to fit 72
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6667 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-06-13 23:55:12 +00:00
Richard M Webb
e9dfdfb62e changed comment char
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6666 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-06-13 23:54:02 +00:00
Scott R Charlton
ebb8ceda99 added additional FORTRAN wrappers for different External Procedure conventions
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6643 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-06-07 05:27:48 +00:00
Scott R Charlton
7c27e85d9d updated for latest IPhreeqc
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6641 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-06-07 00:21:55 +00:00
Scott R Charlton
0803930034 removed phreeqcpp/SolutionIsotopeList.[h,cxx]
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6363 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-04-05 03:38:11 +00:00
Scott R Charlton
34005181f1 added SScomp
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6185 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-02-07 22:09:35 +00:00
Scott R Charlton
8a4c8426f3 fixed bug in GetSelectedOutputString (bad args);
cleared SelectedOutputString for each run

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6156 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-02-02 01:29:19 +00:00
Scott R Charlton
c6d35c8bf1 working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6106 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 05:31:57 +00:00
Scott R Charlton
612f35a5da working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6103 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 04:58:12 +00:00
Scott R Charlton
165d56bec4 working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6100 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 00:57:52 +00:00
Scott R Charlton
2240e7b03a working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6099 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 00:49:33 +00:00
Scott R Charlton
594676ca33 working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6098 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 00:46:10 +00:00
Scott R Charlton
dddf7fe2b5 working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6097 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 00:42:47 +00:00
Scott R Charlton
293bbe0ff1 working on documentation examples
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6096 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-24 00:04:40 +00:00
Scott R Charlton
d682cf5723 passing on windows
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6091 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-20 23:24:52 +00:00
Scott R Charlton
2ee8c4203c error routines working on windows
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6082 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-20 00:28:46 +00:00
Scott R Charlton
fdcb31d93b added missing SetSelectedOutputStringOn
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6079 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-18 04:33:40 +00:00
Scott R Charlton
3d1ee8f9e5 added fortran Error; SelectedOutput methods
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6077 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-18 04:04:00 +00:00
Scott R Charlton
a69da2dd27 Error implementation w/o unit testing
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6068 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-13 04:22:16 +00:00
Scott R Charlton
0b16f6a237 added Use[h,cpp] to makfile
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6065 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-12 22:03:56 +00:00
Scott R Charlton
401ed03156 added changes for use
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6045 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-12 00:01:23 +00:00
Scott R Charlton
9d9fcdc930 working on dist
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6029 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-11 05:01:44 +00:00
Scott R Charlton
bd7675256b working on dist
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6028 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-11 04:59:21 +00:00
Scott R Charlton
4490d97970 getting rid of include driectory to avoid duplicate header files
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6025 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-11 01:18:11 +00:00
Scott R Charlton
1e2c368e86 added phreeqcpp/GasComp[h,cxx] added phreeqcpp/SS[h,cxx] remove
SSassemblageSS[h,cxx]

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6024 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-11 00:20:22 +00:00
Scott R Charlton
9674406e59 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
61ec1524c9 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
2f569318ea 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
69f09506a5 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
51aa0032c4 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
79b92c20b2 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
b7b845adfd 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
7bbabd61e2 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
0f42bbf34f 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
6ed1078f05 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
e48bd89121 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
ef4455591a 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
a189246292 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
a1af034961 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
fccdaa79de 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