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

27 Commits

Author SHA1 Message Date
Scott R Charlton
63175ab743 [phreeqci] fixed header error with phast 2021-04-23 14:06:58 -06:00
Scott R Charlton
d0c821238d [phreeqci] added 'new' debugging 2021-04-19 17:17:02 -06:00
David Parkhurst
a99253764f (void)sscanf, removed SKIP, removed PHREEQ98 2021-03-12 18:11:29 -07:00
David L Parkhurst
9048a9be86 Bugs fixes noted by Marco De-Vroed 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8371 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2014-01-14 20:42:12 +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
acf62c7881 gas_phase and irrev removed. 
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
 2012-01-04 16:07:40 +00:00
David L Parkhurst
95aa3278de Removed phrqproto.h from project and svn deleted. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5718 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-10-20 23:53:44 +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
7e26eec197 Last checkin svn deleted obsolete files output.h, output.cpp, phreeqc_files, main.cpp. 
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
 2011-10-20 21:14:33 +00:00
David L Parkhurst
601d8515b8 Removed PHREEQC_CPP and some PHREEQC_CLASS. 
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
 2011-10-20 20:06:32 +00:00
David L Parkhurst
7ccdb1613b removed dead code, mostly P_INSTANCE and PHREEQC_PTR 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5681 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-10-05 19:32:29 +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
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
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
4b31197710 Redid modifications for hidden variables using l_ prefix. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4674 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2010-07-21 00:18:01 +00:00
David L Parkhurst
579a283747 Fixing hidden variables in 
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
 2010-07-16 20:45:26 +00:00
David L Parkhurst
3131740cfb Compiles as class, debug, and Release. 
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
 2009-12-08 22:12:42 +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
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
3313c814a9 Ran indent program on phreeqcpp 
indent -bli0 -i4 -ts4 -npcs -nbc *.cxx




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3168 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2008-10-31 15:19:39 +00:00
David L Parkhurst
25666df97c Used new gcc on srv2rcolkr. 
Cleaned up all the const errors when using constant string in 
arguments to functions.

removed ex1.

Modified makefile to include/exclude cl1mp.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2712 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2008-02-19 22:05:11 +00:00
David L Parkhurst
888140c4a5 Updated with phreeqc files. 
Main difference is the logic for rebuilding a model. Should
run faster now, but has slight differences in example files.

Imported changes from ph2orch.

Plan to make phreeqcpp a subdirectory of ph2orch/src.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1601 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2007-01-10 00:03:03 +00:00
David L Parkhurst
90a787e420 Changed name to ISolutionComp. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@797 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-02-27 21:22:47 +00:00