Copied files from concrete_parallel, without merging or svn_copy.
Added Dictionary.cpp and Serializer.cxx + header files.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10607 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
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
In parser, do not echo if using last line.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5982 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
PBasic not used here. Will compare to this.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5748 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
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
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
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
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
Made dependencies the same for serial and parallel,
can check with make depends and make depends_parallel,
dependencies and dependencies_parallel should be the same.
Modified fortran with -I/usr/include for gfortran compiler
to find mpif.h.
Now use mpif.h in mpimod.F90 to define MPI_COMM_WORLD.
Dictionary.h moved in cxx files to make serial and parallel
dependencies the same.
Ifdef'd mpimod to exclude everything in module for serial version.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2707 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
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