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,255 Commits 6 Branches 4 Tags
Commit Graph

24 Commits

Author SHA1 Message Date
David Parkhurst
fa7a3c7192 Tony's changes and bug fixes 2018-02-17 20:09:31 -07:00
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
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
0ca9654356 Reversed logic to NO_STATIC_VOPTS, default is now static vopts. No changes to Makefile or project needed now. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6771 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2012-07-11 16:39:13 +00:00
David L Parkhurst
8823f0ff2f Added STATIC_VOPTS to make vopts static, not static unless defined. 
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
 2012-07-11 16:23:02 +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
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
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
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
e42590e581 Cleaned up NameDouble, still need to remove elt_list. 
Commented out some unused PHREEQC_PTR_ARGS in headers.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5654 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-09-27 21:31:39 +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
a36a7924cd Worked on bug with DUMP and read_raw of isotopes. 
Also checked that dump/read/dump gave equivalent files for isotopes. 

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5453 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2011-06-23 22:35:43 +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
cefe071f17 Reindented, fixed errors, ran test cases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3176 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2008-10-31 19:09:45 +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
1848045bd9 Added new functions to allow multiply. 
Now multiply to account for changes in pore volume due to
storage.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@2098 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2007-06-21 19:50:55 +00:00
David L Parkhurst
3261c99891 Added class SolutionIsotopeList 
Working through using C++ structures in transport




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@855 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-04-11 23:41:57 +00:00
David L Parkhurst
c42d985558 Moved Isotope to SolutionIsotope 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@793 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2006-02-16 20:09:24 +00:00