19 Commits

Author SHA1 Message Date
David L Parkhurst
7c56b9195e free pors.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10739 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-27 01:49:10 +00:00
David L Parkhurst
95133f2b54 Tony's changes.
Added porosities.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10737 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-26 21:39:37 +00:00
David L Parkhurst
1fcb85d634 use space for cell_data
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10729 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-21 17:45:57 +00:00
David L Parkhurst
174c739d26 Updated concrete source from concrete_parallel source (not using parallel).
Now going to run test cases on Linux.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10719 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-20 18:12:15 +00:00
David L Parkhurst
fb18be24e2 Tony's implementation of electric current.
Test case current1.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10550 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-12-08 16:54:38 +00:00
David L Parkhurst
660042da0e Changed variable from max to max_cells.
Added variable all_cells to be able to initialize new cell_data.
moved old_cells, max_cells, all_cells to phreeqc class.

initialized old_cells, max_cells, all_cells in init of phreeqc class. 
Added to copy constructor.

changed logic for switching to numerical derivatives by adding && numerical_fixed_volume == false
if (iterations > 99 && numerical_fixed_volume == false)

Added 
			gammas_pz();
			jacobian_sums();
For restart in pitzer.cpp

Added 
			gammas_sit();
			jacobian_sums();
for restart in sit.cpp.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8835 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-07-11 20:05:09 +00:00
David L Parkhurst
96f839e181 fixed uninitialized values
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8834 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-07-10 20:12:14 +00:00
David L Parkhurst
f9eff4b835 Use MIX_RAW in dump to read negative numbered mixes.
Added testcase negative_user_number

Tony's fix for start time units

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8403 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-01-27 22:04:45 +00:00
David L Parkhurst
7c66a50b9b changed back to using high_precision bool for diffc and disp in dump_cpp
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7994 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-29 17:17:13 +00:00
David L Parkhurst
92a7861814 Added -high_precision to PRINT for USER_PRINT.
Made dump_cpp always high precision.

Needed to modify ex12a to be consistent with new SELECTED_OUTPUT -active;
SELECTED_OUTPUT -user_print now has different meaning.
No longer set global high_precision from SELECTED_OUTPUT; only SelectedOutput instance value

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7992 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-29 16:43:04 +00:00
David L Parkhurst
8474b53520 dump precision
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/multi_punch@7877 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-01 23:37:05 +00:00
David L Parkhurst
27b3c05684 Working on multipunch
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/multi_punch@7875 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-01 21:00:50 +00:00
David L Parkhurst
d436c9cf4f bugs linux caught, something different about when to print headings
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/multi_punch@7874 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-01 20:35:33 +00:00
David L Parkhurst
276322a936 Have multiple SELECTED_OUTPUT working.
Need to have multiple USER_PUNCH.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/multi_punch@7864 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-07-31 19:26:34 +00:00
Scott R Charlton
8e3394ca8c fixed checks for successful opening of std::ofstream
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7661 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-04-30 04:38:05 +00:00
Scott R Charlton
709e117619 modified source files for rearranged directories
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/reorg@7310 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-11 01:05:51 +00:00
Scott R Charlton
564a0f8af5 moved phreeqc files into src
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/reorg@7308 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-10 06:04:12 +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