29 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
aee604b56e Changed read _modify to warning if entity not found.
Tony's bug in phrq_io. punch_ostream was deleted twice.

roughed in REACTION_TEMPERATURE_MODIFY and REACTION_PRESSURE_MODIFY. Think they work, and 
added to test case modify_ignore.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8453 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-06 18:28:24 +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
ea54bb8f57 reworked logic for using previously read line from parser.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6076 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-18 01:40:57 +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
4bb72929ed Change count in dump_raw for temperature.
Bugs in include.out and errorinp.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5944 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-22 23:46:40 +00:00
David L Parkhurst
b5c652e254 Removed struct temperature.
Uses only cxxTemperature.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5942 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-22 23:13:07 +00:00
David L Parkhurst
99b8eac54d Have read_reaction_pressure and read_reaction_pressure_raw working.
Dump reaction_pressure raw also works.

Started using templates in Utils.h for map manipulations.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5842 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-01 20:03:56 +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
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
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
2dab6f8ed8 Removed PHREEQC_PTR_ARG from gas phase and temperature.
Removed commented PHREEQC_PTR from some of the header files.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5651 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-27 17:15:14 +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
b1fca87a57 Added -mix, -reaction, -temperature, -cells to DUMP.
Added warning for use of REACTION and kinetics.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4800 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-09-08 20:33: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
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
309d3d7bee Fixed cast warnings in c++
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1008 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-07-07 21:27:45 +00:00
David L Parkhurst
3da5643ae7 Makefile is working.
Will make pc version and then can move on.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@789 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 17:35:35 +00:00