19 Commits

Author SHA1 Message Date
David Parkhurst
369733e9b5 converted to classes 2021-04-06 22:21:54 -06:00
David L Parkhurst
baf4566356 Added second logical in batch. First is color, second is grid.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6827 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-08-01 20:03:47 +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
Scott R Charlton
692cd611bd added const methods
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6588 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-05-24 22:01:04 +00:00
David L Parkhurst
6dd55677f5 Added -batch option to USER_GRAPH.
Finally got emf working.

Has a memory error somewhere. Heap gets corrupted when running debug mode and -batch fn defined.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6584 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-05-24 01:16:21 +00:00
Scott R Charlton
cbba2c248d added const versions for ChartHandler/ChartObject
made ExtractCurveInfo static in order to use in phreeqci

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6542 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-04-28 04:28:06 +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
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
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
2b11772777 Rewrote run_cells to do all of the calculations that would be
done if a series of USE and SAVE.

Modified the logic when time step is defined in run_cells. Equivalent to time_step in nmax steps, where nmax is max steps
in kinetics, reaction, reaction_temperature.

Wrote dump for chart and chart_handler. chart_handler calls dump for all user_graph.

Fixed bug in chart_object with log definition. Had wrong logic when looking for t/T/l/L.

initial_total_time initialized twice in mainsubs and twice in phreeqc.cpp.

Fixed heading logic for mixing graph_x, graph_y, graph_sy with plot_xy.

Moved NA to header file.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5431 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-06-10 22:00:46 +00:00
David L Parkhurst
db5f8e6a98 Removed dead code and dead logic for adding series.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5406 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-16 15:56:23 +00:00
David L Parkhurst
c323063457 Trying modification of logic of user_graph
seems to work, but I have no idea why.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5389 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-13 20:48:13 +00:00
David L Parkhurst
1238db9163 Made fixes for Tony's 5/06/11 zedgraph tests.
Fixed connect simulations.

Not sure all logic is yet correct. 

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5375 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-10 22:58:45 +00:00
David L Parkhurst
f2fcaea142 Revised for Tony's comments. CSV colors have separate default_color_csv. Added -active. If csv for graph_y or graph_sy, no symbols.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5373 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-09 20:05:13 +00:00
David L Parkhurst
2a491b71a4 merged MULTICHART branch back to trunk
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5365 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-04 00:24:40 +00:00
David L Parkhurst
8060c0654d Removed chart files that were accidently checked in.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5364 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-04 00:04:23 +00:00
David L Parkhurst
eb2227ac27 Before reloading from home.
Adding new files for chart, curve, form2

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5342 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-04-25 16:39:38 +00:00