26 Commits

Author SHA1 Message Date
Scott R Charlton
d0c821238d [phreeqci] added 'new' debugging 2021-04-19 17:17:02 -06:00
David L Parkhurst
a9906af5f6 Fixing VS static checker warnings.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9300 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-02-24 19:22:09 +00:00
Scott R Charlton
25508288fb removed set but not used variables using gcc 4.8.2[-Wunused-but-set-variable]
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8821 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-07-09 01:46:43 +00:00
Scott R Charlton
8fdb7313f9 fixed bug in DELETE reported by laurin.wissmeier@web.de 2013-06-01
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7755 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-06-03 22:05:52 +00:00
Scott R Charlton
6c4f7253a9 added some const and added cell for use in phreeqci
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7743 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-05-29 23:38:00 +00:00
Scott R Charlton
bdadfbeba4 added GetAllItems method
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7465 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-15 01:24:37 +00:00
David L Parkhurst
c9380090ed There was a long gap before this was checked in.
I think the load balancing by cell is done.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7444 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-05 20:54:30 +00:00
David L Parkhurst
f6498feecc DELETE; -cells #no list of cells
Causes all reactants to be deleted, same as DELETE; -all

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7085 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-11-16 01:18:33 +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
4f0fb6c928 Finished ss_assemblage rename.
Added Use class

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6020 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 20:11:15 +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
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
0a98983f48 Think reaction_pressure is done.
worked on dumper and copy.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5846 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-12-02 00:07:18 +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
5aafb6d533 Added some identifier synonyms for DUMP and DELETE.
Moved comments on DUMP and DELETE to phreeqcpp revisions
from phreeeqc revisions.

Updated keywords through DUMP.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4829 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-09-20 22:59:32 +00:00
David L Parkhurst
8e65d00c75 Fixed duplicate lines in echoing output at end of file
Streamify checks for OPTION_KEYWORD; check_line is 
KEYWORD.

basic_test.out, ppdump.out has warning for REACTION and KINETICS.

ppdump.dmp has USE mix, reaction, reaction_temperature none

now ppdump.dmp dumps reaction_raw, mix, react_temperature_raw

cell_operations is now linux.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4828 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-09-20 17:09:14 +00:00
David L Parkhurst
d34b328b06 Added -cell to dump, copy, delete.
Selects anything with the specified user numbers.

Fixed bug in read_class where end of file caused the
last line of input to be repeated in the output.

removed warning print from copy_entities, which is nicer 
for copy -cell and some reactants are not present.

rewrote read_copy to include -cell, but also changed logic
for selection of appropriate keywords. Now has list that are acceptable, whereas before it was a list of unacceptable.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4823 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2010-09-17 21:39:00 +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
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
259c0839f0 Added new class runner.
Finished new keyword RUN_CELLS.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3730 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-10-30 22:27:43 +00:00
David L Parkhurst
5f9cf78f01 Modified for parallel version. Had some lists
in the pack and unpack routines that now are 
maps.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3728 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-10-29 20:08:56 +00:00
David L Parkhurst
b9e38f4da8 Updated phreeqcpp to have examples from phreeqc.
equilibrium_phases_read_raw has duplicate lines.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3724 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-10-27 20:29:04 +00:00
David L Parkhurst
74bb0bc5d0 For dump and delete, added StorageBinList
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@3718 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2009-10-22 19:26:38 +00:00