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
Tony revised density calculation.
Toyed with the following when testing for amdtreat in Copy equations to optimize into ineq_array
//if (x[i]->f > 1e-14/*0e-8*/ && x[i]->moles <= 0
checked for a null pointer in prep (could happen when _modify used).
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6967 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Guy had problems with static variables with OpenMP.
Also removed other static variables fpunchf_user s_warning and buffer, spread length, utilities spinner. Put in Phreeqc.h.
Removed static fnbuf from Pbasic.cpp, put in Pbasic.h.
I think only static variables are in Keywords.h and are necessary for initialization.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6770 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
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
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
Will continue to remove PHREEQC_CLASS.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5711 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
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
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
M src/cxxKinetics.cxx
M src/NameDouble.cxx
M src/Exchange.cxx
M src/ISolution.cxx
M src/ISolutionComp.cxx
M src/ISolutionComp.h
M src/SSassemblage.cxx
M src/Solution.cxx
M src/GasPhase.cxx
M src/PPassemblage.cxx
M src/ISolution.h
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4654 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
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
SOLUTION_MODIFY
EQUILIBRIUM_PHASES_MODIFY
EXCHANGE_MODIFY
SURFACE_MODIFY
SOLID_SOLUTIONS_MODIFY
GAS_PHASE_MODIFY
KINETICS_MODIFY
May now revisit dump to add a delete capability.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3714 1feff8c3-07ed-0310-ac33-dd36852eb9cd
as constructor methods for Solution and Exchange.
Takes c storage and makes C++ objects after a calculation.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2062 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Will remove cpp and header files and make phreeqc an external directory.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@785 1feff8c3-07ed-0310-ac33-dd36852eb9cd