33 Commits

Author SHA1 Message Date
David L Parkhurst
025d2a1ee1 Merged in Tony's changes for electro diffusion.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12388 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-09 17:17:10 +00:00
David L Parkhurst
e8aa08af26 Tony's latest.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@11223 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-06-07 14:43:36 +00:00
David L Parkhurst
06e41e92ae Tony's changes for advection/diffusion with irregular grid.
He was not able to get a robust result.

Have not run test casees with this change.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@11171 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-05-17 15:33:46 +00:00
David L Parkhurst
9683907272 Needed to write around signbit.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@11135 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-05-03 17:05:03 +00:00
David L Parkhurst
03c9d56c09 Tony's updates to allow fixed current.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@11133 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-05-03 16:27:32 +00:00
David L Parkhurst
d2dba8c291 Tony's latest changes.
New test case SC_Ohm, added to Makefile.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10983 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-26 20:11:29 +00:00
David L Parkhurst
d5e7aa0ab3 Tony's changes.
Call calc_delta_v always.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10930 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-09 19:59:35 +00:00
David L Parkhurst
383227282a Tony's fixes
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10771 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-02-01 15:50:11 +00:00
David L Parkhurst
72991f1acc First fix of day.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10758 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-28 21:24:32 +00:00
David L Parkhurst
95133f2b54 Tony's changes.
Added porosities.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10737 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-26 21:39:37 +00:00
David L Parkhurst
8dc42fee7e Tony fixed the memory problem.
Will rerun Valgrind one more time.

Revised Amm.dat

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10736 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-25 17:40:40 +00:00
David L Parkhurst
96e537f08d Initialization, memory leak.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10732 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-22 15:42:59 +00:00
David L Parkhurst
891e33bf47 More initialization
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10731 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-22 01:34:20 +00:00
David L Parkhurst
24dd5ede7a Working on valgrind uninitialized variables.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10730 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-22 00:07:22 +00:00
David L Parkhurst
964b1665eb Initialize sol_D[l_cell_no].spec
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10728 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-21 17:32:09 +00:00
David L Parkhurst
7f842da63e removed MPI.
Fixed memory leak.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10727 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-21 16:29:14 +00:00
David L Parkhurst
7fbf8779ce Removed parallelization.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10726 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-21 00:20:02 +00:00
David L Parkhurst
41bb948377 fix for linux, but Cl has NaN
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10723 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-20 22:02:20 +00:00
David L Parkhurst
dbaabe0180 initialize variables
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10722 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-20 21:30:24 +00:00
David L Parkhurst
174c739d26 Updated concrete source from concrete_parallel source (not using parallel).
Now going to run test cases on Linux.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10719 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-20 18:12:15 +00:00
David L Parkhurst
0970c44067 using old viscosity
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10570 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-12-14 21:18:25 +00:00
David L Parkhurst
301d2d009c transport.cpp, ifdefd old viscosity, initialized variables; basicsubs call viscosity();phreeqc, revert ineq_tol
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10569 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-12-14 20:35:26 +00:00
David L Parkhurst
fb18be24e2 Tony's implementation of electric current.
Test case current1.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10550 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-12-08 16:54:38 +00:00
Scott R Charlton
25508288fb removed set but not used variables using gcc 4.8.2[-Wunused-but-set-variable]
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8821 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-07-09 01:46:43 +00:00
David L Parkhurst
8e81c17eb2 Next try on DELETE; -all
Fixed warnings for MAC lion operating system

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8724 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-05-07 21:27:47 +00:00
David L Parkhurst
e284f1167e Next fix for MCD
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8520 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-24 19:35:03 +00:00
David L Parkhurst
a59b8b7abf Tony's fix for MCD after unequal cell lengths for diffusion.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8518 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-24 15:41:21 +00:00
David L Parkhurst
4922f9efe0 Tony's fix for unequal cells in diffusion.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8484 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-02-12 17:26:54 +00:00
David L Parkhurst
a1d93167ae Tony's changes to the status timer.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7438 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-02-04 19:25:05 +00:00
David L Parkhurst
c8c26e81e9 Tony's new Pitzer test cases
Updated Run_salt.bat
Updated Makefile

Tony's changes through 20130129a

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7400 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-29 16:37:25 +00:00
Scott R Charlton
564a0f8af5 moved phreeqc files into src
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/reorg@7308 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-01-10 06:04:12 +00:00
David L Parkhurst
dff0e3454b House cleaning for phreeqcpp
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@787 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 15:40:24 +00:00
David L Parkhurst
60a1544019 Copying new classes (cxx) and cpp files to src
Will remove cpp and header files and make phreeqc an external directory.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@785 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2006-02-16 00:21:39 +00:00