7 Commits

Author SHA1 Message Date
David L Parkhurst
490fd2be41 Added options to the UNITS keyword to allow moles of solid
reactants to be interpreted as moles per liter of WATER or
 	moles per liter of ROCK:
	
	UNITS
		-equilibrium_phases   ROCK
		-exchange             ROCK
		-surface              WATER
		-solid_solution       WATER
		-kinetics             WATER
		-gas_phase            WATER
		
	By default, the number of moles of solid reactants are
	interpreted as per liter of water. Using the ROCK option,
	PHAST interprets the number of moles of solid
	reactants obtained from the initial PHREEQC calculation
	as per liter of rock. 
	
	Note that an initial PHREEQC calculation is made at the
	beginning of a PHAST run. During this calculation all 
	reaction calculations interpret the concentration of solid
	reactants as simply moles. (When a solution is reacted with
	the solids, the solution contains a mass of water, which is
	usually 1 kg, but not necessarily.) It is only when initial 
	conditions are subsequently distributed in the PHAST calculation 
	that solid reactants are scaled. If the units are WATER, t
	here is no scaling and the number of moles of solids is the 
	number of moles per liter of water. If the units are ROCK, 
	the number of moles of a solid reactant	is multiplied by 
	(1-phi)/phi, where phi is the porosity in the cell receiving 
	the initial condition, to arrive at the	number of moles of 
	solid reactant per liter of water. 
	
	The addition of the ROCK option is motivated by the possibility
	of a domain with a distribution of porosities. In this case, 
	the number of moles of solid reactants per liter of water--
	the units used by PHAST--also vary spatially. By using the 
	ROCK option, a constant rock composition can be defined and 
	the factor (1-phi)/phi is used to scale the number of moles 
	of solid reactant to obtain the number of moles per liter 
	of water in each cell.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3902 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-21 20:36:36 +00:00
David L Parkhurst
9f4eefd214 Made all the changes to add phreeqc pointer as argument to
Phreeqcpp class methods.

Still compiles on Debug and Release, but problem with
phrq_malloc in cvdense and cvode.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3876 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-08 18:09:39 +00:00
David L Parkhurst
2b76f04a8b Cleaned up header files to remove unnecessary includes of .h files. Moved includes to source code where possible.
Moved some methods for .h to source files to avoid need for includes.

Debug and Release compile. 

Still need to get class version working. 

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3868 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-07 19:49:38 +00:00
David L Parkhurst
d37ed2c6ae indented header files.
removed ^M from System.h





git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3169 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2008-10-31 15:32:53 +00:00
David L Parkhurst
193e8ef865 Bug with adding mixing solution when already in list. Replaced old fraction with new
fraction. Now adds the two fractions. 

This created a bug with rivers when mixing with the same solution. The mass fraction
was calculated incorrectly because only the second part of the solution was used (solution, frac 2).


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2888 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2008-04-24 23:59:55 +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
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