David L Parkhurst
eb5b95110d
Stray debug print removed from StorageBin.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1426 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-11-01 20:03:05 +00:00
David L Parkhurst
4230069264
fixed warn again.
...
fixed error when no doubles sent in message.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1422 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-11-01 16:00:47 +00:00
David L Parkhurst
915c4069b4
Added alternative diff with -bw
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1400 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-27 21:26:45 +00:00
David L Parkhurst
6b0ccbcc51
Fixed bugs with zero.sed.
...
Output should now be in standard form.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1398 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-26 23:36:58 +00:00
David L Parkhurst
753bbfc50e
Now using zero.sed.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1393 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-26 16:05:52 +00:00
David L Parkhurst
a286af2263
ran zero.sed on all files.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1392 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-26 15:59:40 +00:00
David L Parkhurst
f8c7968c72
Fixed incorrect casts.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1388 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-26 14:55:32 +00:00
David L Parkhurst
e78a8f5c1a
Fixed some bugs in C++ classes.
...
Ran test cases with test_classes enabled. Everything appeared to check
correctly.
Added new test cases to phreeqcpp/mytest.
Added zero.sed to examples and mytest.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1376 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-24 22:11:23 +00:00
David L Parkhurst
52ab13ec09
Fixed some bugs in C++ classes.
...
Ran test cases with test_classes enabled. Everything appeared to check
correctly.
Added new test cases to phreeqcpp/mytest.
Added zero.sed to examples and mytest.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1376 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-24 22:11:23 +00:00
David L Parkhurst
812bb1adcc
Updated with Tony's MCD additions to Surface and SurfaceComp classes.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1344 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-20 20:04:59 +00:00
David L Parkhurst
e4ca1d77c5
Forgot to include force_equality in PPassemblageComp
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1319 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-16 21:14:22 +00:00
David L Parkhurst
7953591e5c
Working through changes to surface structure
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1318 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-16 19:47:27 +00:00
David L Parkhurst
119b032594
Had not included formula_totals and formula_z in structure.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1316 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-16 18:46:30 +00:00
David L Parkhurst
89c12ec0e6
using type and dl_type in Surface
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1315 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-10-16 16:03:36 +00:00
Scott R Charlton
217bdd7708
Converted to VS2005.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1022 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-07-11 03:45:46 +00:00
David L Parkhurst
cb46a1debf
Removed warning messages from compiler
...
casts, bool conversion, others
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1009 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-07-07 22:13:43 +00:00
David L Parkhurst
309d3d7bee
Fixed cast warnings in c++
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1008 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-07-07 21:27:45 +00:00
David L Parkhurst
eb039d54e2
Updated to latest PHAST cpp files.
...
Ran test cases.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@954 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-24 13:50:19 +00:00
David L Parkhurst
a524c46106
Updated to latest PHAST cpp files.
...
Ran test cases.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@954 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-24 13:50:19 +00:00
David L Parkhurst
382075cc6a
Couple changes for exchange mixing
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@945 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-18 16:15:04 +00:00
Scott R Charlton
1e28de647f
changed automatic arrays to dynamic arrays
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@924 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-16 01:10:25 +00:00
David L Parkhurst
6df20749e2
Added mix_cxxExchange to storage bin with assorted routines and
...
changes to make it work.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@921 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-12 19:26:37 +00:00
David L Parkhurst
d8a1b2d7fa
Renaming some files
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@907 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-09 17:12:45 +00:00
David L Parkhurst
764d31c7ae
Added Dictionary to svn
...
Use pointer to vector instead of copying arrays.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@901 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-04 23:09:32 +00:00
David L Parkhurst
11431ae291
packing and unpacking cxx classes for mpi is running
...
need to check result.
changed SurfComp.h SurfaceComp.h
changed SurfComp.cxx SurfaceComp.cxx
changed SurfCharge.h SurfaceCharge.h
changed SurfCharge.cxx SurfaceCharge.cxx
Added Dictionary.cxx and Dictionary.h
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@894 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-04 00:02:01 +00:00
Scott R Charlton
297744eafa
Updated for VS7.Net
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@891 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-03 06:37:52 +00:00
David L Parkhurst
a38caf4970
Serial version is working for Linux with restart option.
...
Tried including printing just active cells, but went back to writing
entire storage bin in case wanted a new head condition with free
surface.
Waiting for Scott on Windows version.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@887 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-01 16:31:27 +00:00
David L Parkhurst
8356664d52
workds on serial and parallel using StorageBin for uz, sz, and phreeqc
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@878 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-04-21 22:37:51 +00:00
David L Parkhurst
cb5ccd55d1
Works with szBin on serial and parallel.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@876 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-04-21 20:00:26 +00:00
David L Parkhurst
a372f9a8a2
Simplified mix with add(int, factor) method
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@872 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-04-18 20:05:46 +00:00
David L Parkhurst
88e3ff6095
Initialize default NumKeyword n_user = 1.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@870 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-04-18 19:56:18 +00:00
David L Parkhurst
8c747cbbf2
Almost working on unsaturated zone serial version.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@867 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-04-17 23:42:03 +00:00
David L Parkhurst
b3028f79eb
Roughed in some printing for debugging phast
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@865 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-04-13 23:39:56 +00:00
David L Parkhurst
c41fb4e5ec
phastpp works on linear_ic in debug mode.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@862 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-04-13 21:16:33 +00:00
David L Parkhurst
574da9a1ac
Working on phast driver to use classes for main storage
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@859 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-04-12 21:44:32 +00:00
David L Parkhurst
3261c99891
Added class SolutionIsotopeList
...
Working through using C++ structures in transport
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@855 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-04-11 23:41:57 +00:00
David L Parkhurst
957551d0a7
Updates
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@837 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-03-08 14:54:34 +00:00
David L Parkhurst
e2b5a47014
Dump_raw for storage bin works, but have not tested.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@800 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-28 16:56:34 +00:00
David L Parkhurst
bc11981448
Adding StorageBin
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@798 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-27 21:24:28 +00:00
David L Parkhurst
90a787e420
Changed name to ISolutionComp.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@797 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-27 21:22:47 +00:00
David L Parkhurst
2fe8f7d44e
Working on saving state.
...
I think there is a compiler bug with map iterators in template definitions.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@796 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-27 21:17:46 +00:00
David L Parkhurst
c42d985558
Moved Isotope to SolutionIsotope
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@793 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 20:09:24 +00:00
David L Parkhurst
39494b0287
Renamed SolutionComp to ISolutionComp because it is not
...
used in cxxSolution.
Fixed Makefile to new names
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@792 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 19:52:52 +00:00
David L Parkhurst
75b28d81ca
Moved Conc to SolutionComp
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@791 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 18:34:28 +00:00
David L Parkhurst
0d1acff7da
removed classes and headers that are in phreeqc directory.
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@790 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 17:54:56 +00:00
David L Parkhurst
3da5643ae7
Makefile is working.
...
Will make pc version and then can move on.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@789 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 17:35:35 +00:00
David L Parkhurst
dff0e3454b
House cleaning for phreeqcpp
...
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@787 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 15:40:24 +00:00
David L Parkhurst
60a1544019
Copying new classes (cxx) and cpp files to src
...
Will remove cpp and header files and make phreeqc an external directory.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@785 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 00:21:39 +00:00
David L Parkhurst
faed814e2f
New project phreeqcpp
...
has test files only now.
Will copy cpp branch here as src
Phreeqc src will be subdirectory of src, like phast
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@784 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 00:19:14 +00:00