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 routine to switch back to input stream after a parser.
PHRQ_io_output error msg still needs a \n to make the screen paint correctly.
See if change works for Scott.
Need to move last line from parser to line.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5855 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Dump reaction_pressure raw also works.
Started using templates in Utils.h for map manipulations.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5842 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
Trim example overflowed allowed space (256?). Modified factor to use
std::strings to avoid overwrite.
Made string pad const char argument.
Assert in check_line was incorrect for EOF.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5826 1feff8c3-07ed-0310-ac33-dd36852eb9cd
eliminated call in tidy.c. and step.c.
eliminated call to k_temp in step.c.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5807 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Merges Crapsi changes with his changes.
Some new test cases.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5797 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Fixed one or two bugs with PR, copying or saving. (v_m in xgas_save.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5739 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Comment in Phreeqc.h for prep.c
s_init initializes all variables.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5733 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Put almost everything into Phreeqc.h.
SVN deleted global.h, input.h, pitzer.h, and pitzer_structures.h.
Added basic_class.h in preparation for making Basic into a class.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5724 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
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
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
Removed cxxStorageBin2phreeqc0. Now writes reactants n from storage bin to phreeqc without restrictions with extra arg to cxxStorageBin2phreeqc.
cxxStorageBin2phreeqc with just a storagebin copies all reactants into phreeqc.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5691 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
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
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
Not sure about the cxx to system. Commented for now.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5660 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Did Surface, charge and comp.
Now can clean up some more.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5656 1feff8c3-07ed-0310-ac33-dd36852eb9cd
