Also no MERGE_FILES in PHREEQC
Not sure about deallocates in worker_closef
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7045 1feff8c3-07ed-0310-ac33-dd36852eb9cd
updated project.
moved PHAST_IPhreeqc to IPhreeqcPhast
removed const from StorageBin getters.
Fixed some compile errors.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6776 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
finished rename of s_s_assemblage and SSassemblageSS
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6032 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Still need to look at copy, dump, and maybe others.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5844 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
Missing KT_MIX_RAW in Parser.
Storage bin, renamed removeXxx to Remove_Xxx.
Added missing mix, reaction, temperature to dump_raw.
Added missing mix read_raw to storagebin read_raw.
Removed storagebin add(struct system), not used.
Added missing mix, reaction, temperature in storagebin remove.
Added storagebin Clear to remove all data. Hopefully does not leak memory.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5692 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
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
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
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
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
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
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
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
Added lines at end of files.
Ran test cases, a few had changes from format and Tony.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2182 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Worked out relation between phreeqc components H,O,charge and Orchestra H+, e-, H2O.
It's a lot of code and still have not implemented SURFACE, EXCHANGE, GAS_PHASE,
much les KINETICS.
Convergence problem when including pyrite.
Also have REACTION (REQCTION_TEMP?);
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2181 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Have worked on mixing solutions.
Roughed in mixing Exchange.h
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1722 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Tried including printing just active cells, but went back to writing
entire storage bin in case wanted a new head condition with free
surface.
Waiting for Scott on Windows version.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@887 1feff8c3-07ed-0310-ac33-dd36852eb9cd