Removed some commented PHREEQC_PTR_ARG from headers.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5652 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
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
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
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
Fixed some of the initializations for keywords, was missing the initial count.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5466 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Added some methods, mostly getter methods.
Was calculating maximup precipitation for mineral based on limiting element in step.c. Not sure if I will used this or not. Not checking in at this time.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5322 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Rewrote error.inp printout.
Rewrote cxxStorageBin constructor from use structure.
Added reaction, temperature, and mix to StorageBin dump_raw.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5281 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Have rewritten get_line, but need to redo the parser get_line.
Works on include test case.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4987 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Added REACTION_MODIFY for completeness.
Fixed bugs in ReadClass.cxx where alpha for id number
caused an endless loop.
Also fixed some error messages where line_save was no
longer meaningful.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4857 1feff8c3-07ed-0310-ac33-dd36852eb9cd
and MgSO4 aqueous species.
Changed indentation for llnl parameters in model.c
Added capability to include files within the input
file. Files included in include files are also
included. Files are included verbatim and need not
contain complete keyword datablocks; however, the
combination of included files must result in a
legal PHREEQC input file.
#$include file_name
Updated #$include to work with all configurations. Added
MERGE_INCLUDE_FILES define to all configurations of
phreeqcpp.
Updated phreeqc and phreeqcpp revisions.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4843 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Now process database and input files into streams in process_file_names. Uses alternate getc from streams to
read the streams.
I have not set the necessary #define MERGE_INCLUDE_FILES to
implement the new capability. Also requires #define PHREEQC_CLASS.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4816 1feff8c3-07ed-0310-ac33-dd36852eb9cd
of stream.
Now closes original input file and replaces cookie (file pointer) with the merged input file pointer, which is a temporary file. It should get closed at the end of the run and disappear.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4814 1feff8c3-07ed-0310-ac33-dd36852eb9cd
main input file.
Need to compile with MERGE_INCLUDE_FILES defined.
creates a new input file with all include files merged.
Syntax for include files is #include file_name (include may
be upper or lower case).
Want to make a temporary input file to avoid having to find
a place to write.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4813 1feff8c3-07ed-0310-ac33-dd36852eb9cd
need to split up initialization for static variables.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4695 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Removed Void definition in p2c, and changed all references to just void.
Moved all structures, globals, and prototypes to global_structures.h, global.h, and Phreeqc.h.
Initialized chart variables in Phreeqc.cpp.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4552 1feff8c3-07ed-0310-ac33-dd36852eb9cd
removed prototype from phreeqcpp/Phreeqc.h and phreeqcpp/phreeqc/print.c
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4388 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
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
Rearranged pitaer.h creating pitzer_structures.h.
Need to figure out conversion routines from C++ classes to C structures.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3869 1feff8c3-07ed-0310-ac33-dd36852eb9cd
SSassemblage.cxx compiles, but need to work on header files.
Need to fix header files throughout.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3865 1feff8c3-07ed-0310-ac33-dd36852eb9cd
