22 Commits

Author SHA1 Message Date
David L Parkhurst
0e78b17230 memory leak when chart was closed before it plotting was finished.
ex15b was used for debugging.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9735 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-28 23:38:01 +00:00
Scott R Charlton
d3ed690461 updated to allow charts to stay open in phreeqci
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7997 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-08-30 04:29:19 +00:00
David L Parkhurst
2832b3ad71 Flushing error file.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7262 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-12-31 16:21:17 +00:00
David L Parkhurst
2109cc8f22 Added active_charts to ChartHandler.
Incremented when form starts, decremented when form ends.

Removed revisions and PHREEQCPP-RELEASE.txt

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7248 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-12-20 23:22:16 +00:00
Scott R Charlton
c0a8627fbe fixed all System::Threading::Interlocked::CompareExchange and added some debugging code
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7200 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-12-13 22:20:53 +00:00
Scott R Charlton
a7acb6fff3 added trys between System::Threading::Interlocked::CompareExchange and System::Threading::Interlocked::Exchange
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6825 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-08-01 04:24:39 +00:00
David L Parkhurst
64024732db Don't print chart detached unless there are charts.
Missing error message when mix solution not found.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6781 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-13 19:32:08 +00:00
David L Parkhurst
81521287cf Tony's fix for reaction in transport.cpp
Used Sleep(5) instead of Sleep(1) throughout.
Removed timeout on detaching charts. It will just hang if something goes wrong.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6779 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-13 15:14:25 +00:00
Scott R Charlton
d369d0f7fd added __cplusplus_cli defines for methods that require CLR for faster linkage with USER_GRAPH editing in phreeqci
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6589 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-05-24 22:03:41 +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
fdd1cee2a2 Phreeqc_class.h case in #include statements.
Fixed warnings and errors in Unix.
Updated Makefile for class only versions.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5728 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-11-02 18:44:50 +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
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
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
5af51e0c96 May need to free rate even if Form has not started.
Revised ex8 to use two charts.

Changed RXN to give value for ADVECTION and TRANSPORT states, in addition to REACTION state.

Reset point_added to false in time1_Tick.

Changed NA value to -98.765 to avoid conflict with -10 for axis scale.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5370 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-05 17:59:21 +00:00
David L Parkhurst
99f7eab602 Had duplicate chart_start code.
Memory bug, chart_start did not set form_start.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5366 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-04 15:07:52 +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