31 Commits

Author SHA1 Message Date
David L Parkhurst
9bf1411f42 Updated to PHREEQC3 12386
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12387 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-09 16:41:47 +00:00
David L Parkhurst
4405e60e4e Merged source up to phreeqc3-trunk SVN 10892
copied files from trunk and merged changes manually.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10893 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 18:13:43 +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
bef66de3c3 Fixed formula for pressure dependence of B1, B2, F1, F2. Previously had a limit of -10C, otherwise produced a floating point exception.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10385 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-10-15 20:04:36 +00:00
David L Parkhurst
1b4a307609 Null pointer if K-Cl interaction parameters (b0, b1, c0) were not defined.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10030 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-07-23 23:17:50 +00:00
David L Parkhurst
e5a9600447 Removed dead code from pitzer
Make lists only in prep.

Fixed bug, needed to use sit_count_cations, etc.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9809 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-06-09 16:16:20 +00:00
David L Parkhurst
b9b841411a Tweaking lists.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9808 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-06-09 15:58:10 +00:00
David L Parkhurst
7e2a34cc7d Make sure MacInnis pitzer parameters are calculated.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9806 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-06-09 15:32:12 +00:00
David L Parkhurst
6de09799c9 Trying Pitzer lists again.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9802 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-06-09 13:46:17 +00:00
David L Parkhurst
c319dc836e reverted Pitzer optimization.
Not sure what goes wrong.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9794 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-06-08 16:49:50 +00:00
David L Parkhurst
4e07ab28e7 Optimizations for pitzer.cpp
Change in PTEMP did not work for unknown reasons.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9793 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-06-08 15:43:42 +00:00
David L Parkhurst
51db3a1569 Shrink array for SIT
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9648 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-13 20:42:47 +00:00
Scott R Charlton
ba6f7f7bef fixed crash that occurred when pitzer.dat was loaded twice
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9509 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-04-13 23:31:45 +00:00
David L Parkhurst
793df0c22a error check for Pitzer parameter was wrong
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9421 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-03-27 14:33:23 +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
Scott R Charlton
25508288fb removed set but not used variables using gcc 4.8.2[-Wunused-but-set-variable]
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8821 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-07-09 01:46:43 +00:00
David L Parkhurst
7359b9dcb6 changed input_units_* to units_*.
thru GetMpiTasks
Changed GetIPhreeqcId to GetIPhreeqcPointer
added to tests RM_GetIPhreeqcId

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8586 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-03-21 00:00:00 +00:00
David L Parkhurst
47eec62e40 Redefinition of Pitzer parameter was bad wrong.
First exchange and surface species were included in lists.
Second, a map used to lookup the pitzer parameter number got out of date when tidy_pitzer was called.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8576 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-03-19 21:19:11 +00:00
David L Parkhurst
43f5baf0bd Tony's latest changes, including F1 and F2.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7962 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-26 20:20:16 +00:00
David L Parkhurst
d26571fbd7 Tony cleaned up XI in Pitzer.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7855 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-07-23 14:52:33 +00:00
David L Parkhurst
79698b010d Tony's fixes for Pitzer, High Pressure is still not right,
will require more fitting.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7854 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-07-23 14:51:26 +00:00
David L Parkhurst
7da9c7b1e3 Merge Tony's changes.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7844 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-07-18 15:54:14 +00:00
David L Parkhurst
7848242e28 Fixed error for malloc introduced in recent Basic function.
Fixed error with Pitzer paramenters that were not recalculated with
a change in pressure. Parameters depend on density of water I think.
Also changed SIT, although I am not sure the parameters have a pressure
dependence.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7837 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-07-17 21:15:01 +00:00
David L Parkhurst
7d90df4e69 Pointers for MacInnis scaling were not reset when -B0 was redefined with Cl- K+ order.
Now check for either order.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7825 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-07-16 14:38:04 +00:00
David L Parkhurst
c176fe3b2e Cleaning up code.
Removed PHREEQC2 ifdef.

Some SKIP.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7717 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-05-14 20:15:31 +00:00
David L Parkhurst
7bb4d37189 cvode
MAX_ITERS 40
   hnew = hg
   predict_fail
   CVMEM cvode_error == TRUE || predict_fail after CVnls
   if (CVMEM cvode_error == TRUE) after CVNewtonIteration
   CVDoErrorTest exit(4);

model
Phreeqc.cpp
pitzer.cpp
sit.cpp
   new status ifdef'd with NPP
   250 ms delay
   new global variable std::string string_status

!!prep: switch_bases 10 to 100 orders of mag. Need to check

utilities.cpp: new status



git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7585 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-03-29 16:03:51 +00:00
David L Parkhurst
047414274f Working on Phreeqc copy
Running ion association model with equilibrium phases
Running Pitzer.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7449 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-07 22:07:33 +00:00
David L Parkhurst
c8c26e81e9 Tony's new Pitzer test cases
Updated Run_salt.bat
Updated Makefile

Tony's changes through 20130129a

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7400 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-29 16:37:25 +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