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
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
HEAP[phreeqcpp.exe]: HEAP: Free Heap block XXXXXXX modified at XXXXXXX after it was freed
Windows has triggered a breakpoint in phreeqcpp.exe.
This may be due to a corruption of the heap, which indicates a bug in phreeqcpp.exe or any of the DLLs it has loaded.
This may also be due to the user pressing F12 while phreeqcpp.exe has focus.
Contains temporary code before cleanup
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6585 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
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
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
Replaced boolean with bool.
Tony's minor changes to basicsubs and ChartObject.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5760 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Will continue to remove PHREEQC_CLASS.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5711 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Now 1-1 correspondence between phreeqc output methods and PHRQ_io output methods.
Removed error_msg and output_msg from Parser.
Moved prototype for fpnunchf, _user, _end_row, to output.h.
Scott needs to finalize as interface.
Next will remove dead code from PHRQ_io, PHRQ_io_output.cpp, and Parse.cxx.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5665 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Did Surface, charge and comp.
Now can clean up some more.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5656 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
Started removing PHREEQC_PTR and P_INSTANCE. Redid all read_raw.
Breaks some echoing or printing of output. Need to check why.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5646 1feff8c3-07ed-0310-ac33-dd36852eb9cd
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
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
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