19 Commits

Author SHA1 Message Date
David L Parkhurst
b0b007ca92 const static vopts
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6793 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-17 17:12:50 +00:00
David L Parkhurst
9758c574e4 Last of SKIPs
In parser, do not echo if using last line.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5982 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-05 19:39:34 +00:00
David L Parkhurst
acf62c7881 gas_phase and irrev removed.
get_line moved to PHRQ_io.

Still debugging some.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5967 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-04 16:07:40 +00:00
David L Parkhurst
02839d601d Removed struct mix.
Left old code commented.

Will remove old code next svn revision.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5948 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-27 18:41:46 +00:00
David L Parkhurst
be8d41f2a9 removed MERGE_INCLUDE_FILES
some static and extern
unused static maps

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5717 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-20 23:50:11 +00:00
David L Parkhurst
ee9dcce40b writing cxxStorageBin2phreeqc.
clean up some consts.

Adding methods for Mix, Reaction, Temperature.

Need parallel method for exchange_ptr_to_user for mix, irrev, temperature.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5689 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-15 00:40:56 +00:00
David L Parkhurst
58c0e3f7c8 Added optional argument to dump_raw to a different user number.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5680 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-05 17:20:16 +00:00
David L Parkhurst
9561576af7 Finished SSassemblage.cxx
Cleaned up other files some.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5655 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-27 23:36:52 +00:00
David L Parkhurst
2dab6f8ed8 Removed PHREEQC_PTR_ARG from gas phase and temperature.
Removed commented PHREEQC_PTR from some of the header files.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5651 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-27 17:15:14 +00:00
David L Parkhurst
12d62e8e54 Removed P_INSTANCE for error_msg, which removed entirely from
some methods.

Began moving xx2struct into phreeqc from class definitions.

First moved was cxxMix2mix to structures.c.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5648 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-26 20:24:17 +00:00
David L Parkhurst
7eeeab4569 all classes inherit from PHRQ_base, except
NameDouble, StorageBinListItem.

NumKeyword inherits from PHRQ_base, others inherit NumKeyword.

ChartHandler and ChartObject inherit from PHRQ_base.

CurveObject does not inherit from PHRQ_base.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5637 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-20 20:05:43 +00:00
David L Parkhurst
f6ed50af7e Added base to kinetics, mix, and exchange.
Going in alphabetical order in src.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5629 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-09 22:32:09 +00:00
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