max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,123 Commits 6 Branches 4 Tags
Commit Graph

25 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
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
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
4863913297 pp_assemblage is mostly working. Need final checking 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5996 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-01-09 16:38:58 +00:00
David L Parkhurst
a8ad82586f hsave_string returns const char *. 
all other changes follow from this.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5940 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-12-21 23:18:58 +00:00
David L Parkhurst
f8887170b9 Implemented Tony's Peng-Robinson changes. Need to run his test cases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5731 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-11-03 18:02:02 +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
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
02ab5c208c Finished PPassemblage and Reaction P_INSTANCE removal. 
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
 2011-09-27 19:59:49 +00:00
David L Parkhurst
12d62e8e54 Removed P_INSTANCE for error_msg, which removed entirely from 
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
 2011-09-26 20:24:17 +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
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
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
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
cbfb768381 Initial testing of SOLUTION_MODIFY and EQUILIBRIUM_PHASES_MODIFY. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3721 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2009-10-27 16:38:25 +00:00
David L Parkhurst
e398c418f0 Updated PHREEQCPP to have precipitate_only option for pp_assemblage. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3200 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2008-11-24 17:44:38 +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
e4ca1d77c5 Forgot to include force_equality in PPassemblageComp 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1319 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-10-16 21:14:22 +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