max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
977 Commits 6 Branches 4 Tags
Commit Graph

977 Commits

This Branch
This Branch
All Branches
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
9bf1411f42 Updated to PHREEQC3 12386 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12387 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2017-02-09 16:41:47 +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
8604336e09 Update from phreeqc3 through 10983. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10984 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-03-26 20:35:41 +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
4405e60e4e Merged source up to phreeqc3-trunk SVN 10892 
copied files from trunk and merged changes manually.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10893 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-03-04 18:13:43 +00:00
David L Parkhurst
626d678296 Added setdiff_c method. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10891 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-03-04 16:38:33 +00:00
David L Parkhurst
2a9ab26516 For concrete, this is correct. For phreeqc-trunk without the new transport changes, previous is needed. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10807 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-04 16:51:39 +00:00
David L Parkhurst
8152581920 Needed for old test cases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10805 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 22:05:56 +00:00
David L Parkhurst
998f194b9b To read multiple lines of porosities. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10799 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 16:27:19 +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
7c56b9195e free pors. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10739 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-27 01:49:10 +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
1fcb85d634 use space for cell_data 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10729 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-21 17:45:57 +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
9644278e49 added Dictionary and Serializer 
Deleted unused files.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10720 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-20 18:19:12 +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
c15e56ad5b -potential not defined for solution read_raw. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10567 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-14 20:09:32 +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
David L Parkhurst
2fe6313f47 Avoid a null pointer. Not really sure what causes it, combination of charge balance, pe constraint, alkalinity, and C(4). 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10432 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-10-26 20:05:47 +00:00
David L Parkhurst
bef66de3c3 Fixed formula for pressure dependence of B1, B2, F1, F2. Previously had a limit of -10C, otherwise produced a floating point exception. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10385 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-10-15 20:04:36 +00:00
David L Parkhurst
218f4f5fab Avoid negative moles of equilibrium phase. 
Typo in RELEASE

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10368 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-10-09 13:29:30 +00:00
Scott R Charlton
34f7921371 fixed BUILD_SHARED_LIBS build on windows 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10347 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-10-06 03:15:13 +00:00
David L Parkhurst
f997d62a13 [ not handled as upper for solution_spread in copy_token_tab. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10327 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-10-01 17:07:17 +00:00
David L Parkhurst
e8553de46e Debug prints for Peter de Moel. 
Possible null reference in tidy_solution.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10325 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-10-01 15:46:09 +00:00
David L Parkhurst
3f332d180b Trap null pointer missing gas components. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10317 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-29 19:33:39 +00:00
Scott R Charlton
64703778f0 updated for R 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10311 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-25 06:30:33 +00:00
Scott R Charlton
190128c155 updated for R 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10310 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-25 06:18:48 +00:00
Scott R Charlton
6e752e26c4 windows java working with callback 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10300 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-24 06:10:03 +00:00
Scott R Charlton
fbaeb7dcbd working on swig callback 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10293 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-23 04:24:40 +00:00
David L Parkhurst
8f1eb25c3a Added SetScreenOn to C++, C, and Fortran. 
Updated PhreeqcRM tests to include a call to the new methods.
Set minimum concentration (moles) to 1e-18 in Solution.cxx.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10255 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-15 16:41:50 +00:00
David L Parkhurst
560306e061 reran test cases. Diffs caused by CO2 changes in database 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10233 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-09-10 22:10:13 +00:00
David L Parkhurst
e6d44638b3 Extra print for Donnan Layer psi from Tony. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10177 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-27 15:22:34 +00:00
Scott R Charlton
adbe4d666f added common directory for Parser/PHRQ_base/PHRQ_io/phrqtype/Utils 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10053 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-08 00:32:59 +00:00
David L Parkhurst
eef31c954d Iterator bug. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10040 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-08-04 19:18:25 +00:00