All reactant structs have been removed.
Tony's pressure uses mu in pressure term of log_k.
Test cases run, discriminant check at 1e-8.
Still want to optimize out some k_temp calls and checks for same T, P, mu.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6269 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
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
removed all PHREEQC_CLASS ifdefs
Need to remove old_io ifdefs
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5712 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Will continue to remove PHREEQC_CLASS.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5711 1feff8c3-07ed-0310-ac33-dd36852eb9cd
removes old handler code from PHRQ_io.cpp
remove error_msg, warning_msg from Parser.
Removed commented lines.
rewrote a couple places in parser that used cerr instead of error_msg.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5666 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Now 1-1 correspondence between phreeqc output methods and PHRQ_io output methods.
Removed error_msg and output_msg from Parser.
Moved prototype for fpnunchf, _user, _end_row, to output.h.
Scott needs to finalize as interface.
Next will remove dead code from PHRQ_io, PHRQ_io_output.cpp, and Parse.cxx.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5665 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Need to keep stripping P_INSTANCE and PHREEQC_PTR from code.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5647 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Started removing PHREEQC_PTR and P_INSTANCE. Redid all read_raw.
Breaks some echoing or printing of output. Need to check why.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5646 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Does not use callbacks.
Uses phrq_io instance of PHRQ_io.
I am sure it will not compile as plain phreeqc without modification.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5640 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
Added ex20 files to Version3/ex.
Modified parser to accept " or ' for titles.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5412 1feff8c3-07ed-0310-ac33-dd36852eb9cd
USE_PHRQ_ALLOC + NDEBUG
USE_PHRQ_ALLOC without NDEBUG
and
no USE_PHRQ_ALLOC
Works with 6 configurations, but not
clrClass_debug
nor clrClass_release.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4679 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Fixed project, directories for versions were all messed up.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3881 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Added eol and other changes for linux.
Had statics in ReadClass.cxx, removed.
Problems with .dmp files. May be because of statics.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3879 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Requires recompilation of the entire solution for some reason.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3878 1feff8c3-07ed-0310-ac33-dd36852eb9cd
methods are not implemented.
Modified the parser to accumulate lines so that they
could be turned into a stream and reread. Modified
kinetics, exchange, ppassemblage, ssassemblage, and surface to use the new way to reread lines for component values.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3742 1feff8c3-07ed-0310-ac33-dd36852eb9cd
SOLUTION_MODIFY seems to work, but need to check all features.
EQUILIBRIUM_PHASES_MODIFY fails. Need to use maps to allow update I think.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3719 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Turned off echo for initial_condition read of restart file.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1604 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Main difference is the logic for rebuilding a model. Should
run faster now, but has slight differences in example files.
Imported changes from ph2orch.
Plan to make phreeqcpp a subdirectory of ph2orch/src.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1601 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
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
