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
Changed to supcrit for phreeqc.dat and pitzer.dat.
Updated test cases.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6528 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This is really just 6324 without deleting Phreeqc.h and keeping the history. In order
to keep the history you need to do a reverse merge.
see http://stackoverflow.com/questions/2863028/recover-a-folder-or-file-in-tortoisesvn-whilst-also-retaining-all-history
answer attached:
Do a "reverse merge":
1.Ensure that your working copy is updated to HEAD and completely clean (not strictly necessary, but always a good idea before trying to merge)
2.Right click on the folder and select TortoiseSVN > Merge...
3.Select "Merge a range of revisions" and hit "Next"
4.The URL to merge from is the repo path for your current directory (ie. the one containing the deleted file)
5.The revision range to merge is the revision in which you deleted the file (show log might help here)
6.Be sure to select "Reverse merge"
7.Hit "Next"
8.All the default merge options should be sufficient, so hit "Merge"
The file should now be added and still retain all of its previous history.
Explanation:
This "rolls back" the revision containing the deletion, but adds the merge information to the directory properties. SVN can track the original file through this metadata. On the command line you would to do a backwards merge of the revision in which you deleted it:
svn merge -c -<revision-number> path/containing/file
Note the hyphen before the rev number (ie. a "negative" revision nunber).
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6328 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
Need to compile on Linux and run all test cases.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6070 1feff8c3-07ed-0310-ac33-dd36852eb9cd
finished rename of s_s_assemblage and SSassemblageSS
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6032 1feff8c3-07ed-0310-ac33-dd36852eb9cd
fixed exch_kin_related bug, by commenting exchange code in quick_setup (prep). Will have to test if this works.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5977 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
Left old code commented.
Will remove old code next svn revision.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5948 1feff8c3-07ed-0310-ac33-dd36852eb9cd
works with sformatf to allow indefinite length strings.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5936 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Removed REVISED_GASES.
numerical_fixed_volume is switch; can be read in knobs.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5921 1feff8c3-07ed-0310-ac33-dd36852eb9cd
correct tanh version of activity of water.
switch is dampen_ah2o.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5919 1feff8c3-07ed-0310-ac33-dd36852eb9cd
There is a bug, CO2_conc_PR_GP runs, but gives wrong answer.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5893 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Have to merge Tony's changes, and make it work without having to use -numerical_jacobian.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5891 1feff8c3-07ed-0310-ac33-dd36852eb9cd
dampen for activity of water is true by default.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5884 1feff8c3-07ed-0310-ac33-dd36852eb9cd
Added a slack variable to equations, will see if it affects convergences.
Had changed the mu equation to be limited at 50, but commented this out.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5879 1feff8c3-07ed-0310-ac33-dd36852eb9cd
