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
1,470 Commits 6 Branches 4 Tags
Commit Graph

1470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David L Parkhurst
810f51a257 two changes for vm_tc, always calc_delta_v 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10929 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-03-09 17:35:12 +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
8bc5862769 Switch back for now. Tony will fix later. 
if (s_ptr->logk[vm_tc])

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10883 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-03-03 18:44:50 +00:00
David L Parkhurst
ed231a9109 calc_logk_s, removed 
if (s_ptr->logk[vm_tc]) at line 489.

Added rho_0.

k_temp, line 5720
		//if (s_x[i]->rxn_x->logk[vm_tc])

Added mol/kgw for units of ionic strength.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10881 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-03-03 17:56:35 +00:00
David L Parkhurst
78c5daa0a9 Negative mass of water bug. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10834 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-16 19:34:12 +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
bde722c21e Another try on porosities. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10804 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 21:42:14 +00:00
David L Parkhurst
7c77eda952 Forgot to remove testing code for differences in porosity between old and new version. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10803 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 17:54:58 +00:00
David L Parkhurst
320aef185a Merged Tony's 2/3/16 changes for setting porosities. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10800 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 16:37:58 +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
2c3cd3e3bc To read multiple lines of porosities. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10798 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-02-03 16:25:36 +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
Scott R Charlton
e04d06e1af documented new optional slength argument to GetSelectedOutputValue 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10770 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 06:02:29 +00:00
Scott R Charlton
bd84d2a56f added code to initialize slength to zero for Fortran GetSelectedOutputValue 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10768 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 01:24:53 +00:00
Scott R Charlton
d9b02af0e0 added optional fortran argument to GetSelectedOutputValue for the string length 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10767 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-30 00:21:32 +00:00
David L Parkhurst
0bd85c1604 reverting to old porosity definition. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10764 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-29 17:51:02 +00:00
David L Parkhurst
279acc25a1 Merging Tony's changes for reading porosity. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10762 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-29 17:06:45 +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
b8ee7f645c Another temporary fix. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10756 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-27 23:57:15 +00:00
David L Parkhurst
4cd0224ee5 Temporary fix for Jenkins. 
Need Tony's fix for porosity of stagnant zone if porosity defined for mobile zone.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10755 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-27 23:06:21 +00:00
David L Parkhurst
a6390ed8c2 free pors 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10740 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-27 01:53:27 +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
f5ea53e0e4 Added porosities. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10738 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-27 01:17:30 +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
5af5488477 Switching back to diagonal_scale false for default. No obvious advantage in test cases to change, and it 
could break someone's runs.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10711 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-20 16:01:03 +00:00
David L Parkhurst
716a978be0 Made diagonal_scale true by default. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10703 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-19 23:06:50 +00:00
David L Parkhurst
516d6937ee Another check for null pointers. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10664 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-11 21:47:58 +00:00
David L Parkhurst
6f7a2e50dd Fixed segvs from Kinniburgh. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10663 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-11 21:01:54 +00:00
David L Parkhurst
a94659326b Fixed formatting for temperature of Specific Conductance. 
Added test cases missing_surf_related_equi, missing_surf_related_kin, and SC_temp.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10641 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2016-01-04 17:17:15 +00:00
David L Parkhurst
8f51d9279b Need to set new_def to trap error with surface related to rate. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10634 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-30 21:25:06 +00:00
David L Parkhurst
dec66bb848 tweak if tidy_min_surface is invoked on a _raw definition. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10633 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-30 18:23:01 +00:00
David L Parkhurst
ae2286eb41 Added serializer for rebalance by cell. 
Made fix to tidy_min_surface, same as tidy_kin_surface; skip if not new def.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10632 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-30 18:14:48 +00:00
David L Parkhurst
a702035139 totals of surface comp set incorrectly after read_raw. Skipping tidy for these cases. 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10630 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-30 17:39:12 +00:00
Scott R Charlton
6ae25495c5 added ifdef for R (R_SO) 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10618 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-29 05:17:03 +00:00
Scott R Charlton
6ecc3a10d2 added Dictionary/Serializer 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10612 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-29 02:11:34 +00:00
David L Parkhurst
b33a28fa91 fgets warning 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10610 1feff8c3-07ed-0310-ac33-dd36852eb9cd
 2015-12-29 00:27:52 +00:00