34 Commits

Author SHA1 Message Date
David L Parkhurst
af2dbfdce2 Added changes for serializing.
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
2015-12-28 23:35:36 +00:00
David L Parkhurst
9d4bb2e173 PHREEQC should now have no USE_MPI
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
2012-10-29 23:16:27 +00:00
David L Parkhurst
d4721e493e Wrote rebalance_load for MPI_Bcast
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
2012-10-26 00:39:14 +00:00
David L Parkhurst
b0b007ca92 const static vopts
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6793 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-17 17:12:50 +00:00
David L Parkhurst
3d2e4ae4be Removed Phreeqc_class.h.
Replaced all PHREEQC_PTR, P_INSTANCE, p_instance1.

Now uses Phreeqc * phreeqc_ptr for Phreeqc cookies.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6509 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-04-19 18:35:14 +00:00
Scott R Charlton
02460252f7 added const version of Get_SSs
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6349 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-04-04 00:03:43 +00:00
David L Parkhurst
91f650a5e9 Merged ErrorHandling 6119-6268 changes.
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
2012-03-06 23:42:49 +00:00
David L Parkhurst
d051a77711 compiles and runs solid_solution test case.
Need to compile on Linux and run all test cases.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6070 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-17 20:39:32 +00:00
David L Parkhurst
7683982877 changed all double to LDBLE
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6038 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-11 21:13:51 +00:00
David L Parkhurst
cbd736da15 Renaming SSassemblageSS to SS and cxxSS
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6019 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 19:14:07 +00:00
David L Parkhurst
f085546091 Renaming SSassemblageSS
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6018 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 19:10:05 +00:00
David L Parkhurst
fdd1cee2a2 Phreeqc_class.h case in #include statements.
Fixed warnings and errors in Unix.
Updated Makefile for class only versions.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5728 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-11-02 18:44:50 +00:00
David L Parkhurst
be8d41f2a9 removed MERGE_INCLUDE_FILES
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
2011-10-20 23:50:11 +00:00
David L Parkhurst
6e4445faf5 Working on reaction module and RM_interface.
Changed most declarations to protected: from private:

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5688 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-14 15:44:52 +00:00
David L Parkhurst
58c0e3f7c8 Added optional argument to dump_raw to a different user number.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5680 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-05 17:20:16 +00:00
David L Parkhurst
9fe532eaaf Cleaned up Get_ and Set_ except for parser.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5661 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-29 18:51:39 +00:00
David L Parkhurst
6acf05a1a0 Removed ORCHESTRA
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5658 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-28 22:30:46 +00:00
David L Parkhurst
4d728afcbe Removed MOVE_TO_STRUCTURES ifdefs.
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
2011-09-28 20:25:20 +00:00
David L Parkhurst
9561576af7 Finished SSassemblage.cxx
Cleaned up other files some.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5655 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-27 23:36:52 +00:00
David L Parkhurst
b7729cf254 Changed all check of input_error to get_input_errors for phreeqc.
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
2011-09-23 22:33:19 +00:00
David L Parkhurst
7eeeab4569 all classes inherit from PHRQ_base, except
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
2011-09-20 20:05:43 +00:00
David L Parkhurst
cd87eed340 Added some LDBLE, particularly for pow().
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
2011-04-14 21:22:09 +00:00
David L Parkhurst
9f4eefd214 Made all the changes to add phreeqc pointer as argument to
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
2009-12-08 18:09:39 +00:00
David L Parkhurst
157e5cc729 Slowly adding arguments and qualifiers to pass phreeqc class instance to routines that need it.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3873 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-08 00:56:50 +00:00
David L Parkhurst
2b76f04a8b Cleaned up header files to remove unnecessary includes of .h files. Moved includes to source code where possible.
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
2009-12-07 19:49:38 +00:00
David L Parkhurst
e65ab2ea73 cleaned up storagebin headers.
cleaned up ssassemblage.h headers.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3867 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-04 23:30:03 +00:00
David L Parkhurst
0a91aa5bec phreeqcpp (nonclass) compiles.
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
2009-12-04 22:47:55 +00:00
Scott R Charlton
07d5fa7413 merged 3750-3846 of plusify; system.cxx and system.h need to be formated
removed char * and used std::string's and std::map's

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3847 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-12-03 01:49:56 +00:00
David L Parkhurst
d54c04039a Have converted std::list to std::map for all entities.
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
2009-10-28 19:15:17 +00:00
David L Parkhurst
6ca3a6d3b2 Added the suite of modify keywords:
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
2009-10-21 19:40:43 +00:00
David L Parkhurst
d37ed2c6ae indented header files.
removed ^M from System.h





git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3169 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2008-10-31 15:32:53 +00:00
David L Parkhurst
7830f46d8d Merged 1727 through 2055 from orchestra/phreeqcpp_for_orch into phreeeqcpp trunk
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2057 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2007-05-30 23:43:59 +00:00
David L Parkhurst
11431ae291 packing and unpacking cxx classes for mpi is running
need to check result.

changed SurfComp.h SurfaceComp.h
changed SurfComp.cxx SurfaceComp.cxx

changed SurfCharge.h SurfaceCharge.h
changed SurfCharge.cxx SurfaceCharge.cxx

Added Dictionary.cxx and Dictionary.h




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@894 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-05-04 00:02:01 +00:00
David L Parkhurst
60a1544019 Copying new classes (cxx) and cpp files to src
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
2006-02-16 00:21:39 +00:00