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
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
Input streams are still in Phreeqc, not in PHRQ_io.
Process_file_names and open_input_stream and open_output_stream are in PHRQ_io_output.cpp, maybe should be in PHRQ_io.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5869 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Added screen_msg and echo_msg to PHRQ_base.
Added screen_msg and echo_msg to PHRQ_io
Added enum to direct echo to log or output.
Switched back to 3 digit exponent in mainsubs.cpp.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5833 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Guarded use of *phrq_io for NULL.
Changed PHRQ_io error_msg to write only to error file.
PHRQ_base error message writes to output, log, and error.
PHRQ_io_output writes to output, log, and error.
Just 4 configurations
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5721 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Old output_msg is commented.
Seems to work.
Ran all test cases.
Time to clean up and make class-only versions.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5709 1feff8c3-07ed-0310-ac33-dd36852eb9cd
The switch between user_punch and inverse modeling punch may not work exactly right.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5708 1feff8c3-07ed-0310-ac33-dd36852eb9cd
sformatf now returns char *. Should be more efficient.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5706 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Wrote individual methods for each file to open, close, rewind, flush, isopen.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5698 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Added a PHRQ_io to RM_interface class for now.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5697 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Changed most declarations to protected: from private:
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5688 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
added some safe_close for PHRQ_io.cpp
added isopen_handler
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5663 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
Rewrote output_msg in PHRQ_io_output.cpp to move phreeqc processing out of PHRQ_io.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5639 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Set dump, log, and punch file_on variables whereever
pr.dump, pr.log, and pr.punch were set in PHREEQC.
Added base class to Solution, ISolution, and StorageBin. Required a PHRQ_io in the constructor to find all places they were constructed.
Need to do the same to all other classes (Exchange, Surface, NameDouble, etc.)
Then need to take PHREEQC instance out of parser and fix all places a parser is constructed.
Need to move phreeqc2class constructors to phreeqc.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5628 1feff8c3-07ed-0310-ac33-dd36852eb9cd
PHRQ_base has not been added to the C++ classes yet.
PHRQ_io is implemented enough to run. Need to work on
reimplementing logic by moving some things that were in
phreeqc_files.cpp (now implemented as PHRQ_io class) to PHRQ_io_output, which is derived from output.cpp.
PHRQ_io_output has methods of Phreeqc class and knows the data in the phreeqc class. PHRQ_io does not know about the phreeqc class.
The ifdef USE_OLD_IO should cause io to revert to the old way of doing it.
I have only worked on ClrClass_debug to now.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5627 1feff8c3-07ed-0310-ac33-dd36852eb9cd
