39 Commits

Author SHA1 Message Date
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
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
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
7413759ae2 csv to tsv
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6645 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-06-07 15:20:39 +00:00
David L Parkhurst
a8b09b7a93 tsv updated in code.
ex2b updated.

through example 2 in examples.fm.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6616 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-05-31 22:44:48 +00:00
David L Parkhurst
c9dfe61640 Rewrote -batch of USER_GRAPH to handle filenames with spaces.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6587 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-05-24 16:28:13 +00:00
Scott R Charlton
4a8e2ca9dd fixed heap error:
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
2012-05-24 05:20:49 +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
David L Parkhurst
b984ef5a61 Tony added function DH and Qbrn.
Added Cyan, Brown, Lime, Gray.

NPP def for PHRQ_io_output

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6583 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-05-23 15:18:27 +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
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
7271b9d5cb Replaced TRY/RECOVER with try/catch
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
2011-11-10 15:30:43 +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
601d8515b8 Removed PHREEQC_CPP and some PHREEQC_CLASS.
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
2011-10-20 20:06:32 +00:00
David L Parkhurst
6fa41ac02e Rewrote PHRQ_io. Removed handlers.
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
2011-09-30 18:36:28 +00:00
David L Parkhurst
9efcd6ecb8 Finished all but loose ends with P_INSTANCEs.
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
2011-09-28 17:05:01 +00:00
David L Parkhurst
9561576af7 Finished SSassemblage.cxx
Cleaned up other files some.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5655 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-09-27 23:36:52 +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
b7729cf254 Changed all check of input_error to get_input_errors for phreeqc.
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
2011-09-23 22:33:19 +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
3be93e8f78 Renaming Form2 to Form1.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5558 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-08-08 16:23:35 +00:00
David L Parkhurst
dc45fa365e Tony changed csv symbols.
Got a complete pdf with no errors

Ready for review?

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5548 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-08-02 18:27:56 +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
72298ad6e3 Simplified logic, but left old commented.
Next step will remove unused logic.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5405 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-16 15:30:31 +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
24eabcb5d7 Couple errors in parsing chart parameters.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5382 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-12 16:33:25 +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
2d59bd8c29 Worked on logic for Tony. If headings are defined, don't remove Basic code. If no definitions in USER_GRAPH, remove Basic code.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5372 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-05-09 16:55:57 +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