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
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 most SKIP ifdefs
ran test cases OK.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5657 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
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
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
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
done if a series of USE and SAVE.
Modified the logic when time step is defined in run_cells. Equivalent to time_step in nmax steps, where nmax is max steps
in kinetics, reaction, reaction_temperature.
Wrote dump for chart and chart_handler. chart_handler calls dump for all user_graph.
Fixed bug in chart_object with log definition. Had wrong logic when looking for t/T/l/L.
initial_total_time initialized twice in mainsubs and twice in phreeqc.cpp.
Fixed heading logic for mixing graph_x, graph_y, graph_sy with plot_xy.
Moved NA to header file.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5431 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
changed pitzer_exchange_gammas to exchange_gammas.
Fixed null pointer in prep.c
Tidy equilibirium phases after equilibirium_phases_modify, but not other reactants. For equilibrium phases, recalculates an element list.
input.fm throug exchange_modify.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4831 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Fixed up read_input to use correct keyword numbers. Updated tidy to tidy the appropriate data blocks when _modify blocks are read.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4830 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Selects anything with the specified user numbers.
Fixed bug in read_class where end of file caused the
last line of input to be repeated in the output.
removed warning print from copy_entities, which is nicer
for copy -cell and some reactants are not present.
rewrote read_copy to include -cell, but also changed logic
for selection of appropriate keywords. Now has list that are acceptable, whereas before it was a list of unacceptable.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4823 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
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
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
Added brief documentation in revisions.
Fixed dump feature of TRANSPORT to work with
dump_raw of C++.
ppdump now has testing for DUMP, DELETE, and MODIFY.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3727 1feff8c3-07ed-0310-ac33-dd36852eb9cd
surface is completed but needs testing.
SS and kinetics need to have reread of components implemented for MODIFY option.
gas_phase may be done, needs to be tested.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3726 1feff8c3-07ed-0310-ac33-dd36852eb9cd
changed list of comps to map of comps.
made sure that description changes were captured for solution, equilibrium_phases, and exchange.
surface is next.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3725 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
