rewrote WriteRestart to use DumpModule
Don't call DumpModule from manager/worker, now only in WriteFils
fixed DumpModule to work for serial and parallel. Uses dump_file_name with no adjustments to extensions.
added LastInitialPhreeqc2Module(vector<int> cell_numbers).
Changed args in RunFile and RunString in PhreeqcRM to bools, affected
RM_interface.cpp, RM_interface_C.cpp, Tests/advection_cpp.cpp
In Copy for cxxStorageBin, check if destination == source.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8411 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Moved DumpModule
Fixed logic in InitialPhreeqc2Concentrations
Fixed logic in cxxStorageBin::read_raw
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8283 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Restart may be working. Need to clean up RMHelper and WriteFiles.
Need to add dump facility.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8278 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
However, now need 4 configurations for IPhreeqc Debug/Release USE_MPI.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7036 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
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
Left old code commented.
Will remove old code next svn revision.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5948 1feff8c3-07ed-0310-ac33-dd36852eb9cd
works with sformatf to allow indefinite length strings.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5936 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
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
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
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
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
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