From 48d952740c344516d2d238bc7f1ae41807a0b7d2 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Tue, 7 Jan 2025 20:00:03 +0000 Subject: [PATCH] Squashed 'database/' changes from bf60c1ca..4e898381 4e898381 Merge branch 'master' into mix_error 20d3a9e5 Fixed examples to have fewer warnings. Fixed headers of some database files. Changed some output from warnings to comments. git-subtree-dir: database git-subtree-split: 4e898381542ce722cd7c3c74fe9c2592ec34d41b --- Amm.dat | 2 +- Kinec.v2.dat | 2 +- Kinec_v3.dat | 2 +- Tipping_Hurley.dat | 1 - phreeqc.dat | 6 +++--- phreeqc_rates.dat | 2 +- pitzer.dat | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Amm.dat b/Amm.dat index d38840e9..c095a395 100644 --- a/Amm.dat +++ b/Amm.dat @@ -1,4 +1,4 @@ -# PHREEQC.DAT for calculating temperature and pressure dependence of reactions, and the specific conductance and viscosity of the solution. Based on: +# Amm.dat for calculating temperature and pressure dependence of reactions, and the specific conductance and viscosity of the solution. Based on: # diffusion coefficients and molal volumina of aqueous species, solubility and volume of minerals, and critical temperatures and pressures of gases in Peng-Robinson's EOS. # Details are given at the end of this file. diff --git a/Kinec.v2.dat b/Kinec.v2.dat index e4c1339b..e3cb6865 100644 --- a/Kinec.v2.dat +++ b/Kinec.v2.dat @@ -1,4 +1,4 @@ -# KINEC.v2.dat - last edited April 18, 2024 by MA and EHO. +# Kinec.v2.dat - last edited April 18, 2024 by MA and EHO. # # This database contains the parameters for calculating mineral dissolution rates for primary and secondary silicate minerals using the equations and parameters reported by Hermanska et al. (2022, 2023), # and dissolution rates for other non)-silicate mineral systems using the equations and parameters reported by Oelkers and Addassi (2024, in preparation). diff --git a/Kinec_v3.dat b/Kinec_v3.dat index fd613fd7..8a753756 100644 --- a/Kinec_v3.dat +++ b/Kinec_v3.dat @@ -1,4 +1,4 @@ -# KINEC_v3.dat - last edited July 23, 2024 by MA and EHO. +# Kinec_v3.dat - last edited July 23, 2024 by MA and EHO. # # This database contains the parameters for calculating mineral dissolution rates for primary and secondary silicate minerals using the equations and parameters reported by Hermanska et al. (2022, 2023), # and dissolution rates for other mineral systems using the equations and parameters reported by Oelkers and addassi (2024*). diff --git a/Tipping_Hurley.dat b/Tipping_Hurley.dat index 471fe128..ea61af2b 100644 --- a/Tipping_Hurley.dat +++ b/Tipping_Hurley.dat @@ -2,7 +2,6 @@ # Created 17 May 2024 14:30:44 # c:\3rdParty\lsp\lsp.exe -f2 -k="asis" -ts "Tipping_Hurley.dat" -# $Id: wateq4f.dat 6895 2012-08-21 18:10:05Z dlpark $ # Revised arsenic data from Archer and Nordstrom (2002) SOLUTION_MASTER_SPECIES diff --git a/phreeqc.dat b/phreeqc.dat index 01cdbe3c..d89cef0d 100644 --- a/phreeqc.dat +++ b/phreeqc.dat @@ -1,8 +1,8 @@ -# File 1 = C:\GitPrograms\phreeqc3-1\database\Amm.dat, 22/05/2024 19:38, 1948 lines, 55817 bytes, md5=78b3659799b73ddca128328b6ee7533b +# File 1 = C:\GitPrograms\phreeqc3-1\database\phreeqc.dat, 22/05/2024 19:38, 1948 lines, 55817 bytes, md5=78b3659799b73ddca128328b6ee7533b # Created 22 May 2024 19:55:37 -# C:\3rdParty\lsp\lsp.exe -f2 -k=asis -ts Amm.dat +# C:\3rdParty\lsp\lsp.exe -f2 -k=asis -ts phreeqc.dat -# PHREEQC.DAT for calculating temperature and pressure dependence of reactions, and the specific conductance and viscosity of the solution. Based on: +# phreeqc.dat for calculating temperature and pressure dependence of reactions, and the specific conductance and viscosity of the solution. Based on: # diffusion coefficients and molal volumina of aqueous species, solubility and volume of minerals, and critical temperatures and pressures of gases in Peng-Robinson's EOS. # Details are given at the end of this file. diff --git a/phreeqc_rates.dat b/phreeqc_rates.dat index 2c777a45..2721908d 100644 --- a/phreeqc_rates.dat +++ b/phreeqc_rates.dat @@ -1,4 +1,4 @@ -# PHREEQC.DAT for calculating temperature and pressure dependence of reactions, and the specific conductance and viscosity of the solution. Augmented with kinetic rates for minerals from compilations. Based on: +# phreeqc_rates.dat for calculating temperature and pressure dependence of reactions, and the specific conductance and viscosity of the solution. Augmented with kinetic rates for minerals from compilations. Based on: # diffusion coefficients and molal volumina of aqueous species, solubility and volume of minerals, and critical temperatures and pressures of gases in Peng-Robinson's EOS. # Details are given at the end of this file. diff --git a/pitzer.dat b/pitzer.dat index eb1c87f2..d18b8023 100644 --- a/pitzer.dat +++ b/pitzer.dat @@ -1,4 +1,4 @@ -# Pitzer.DAT for calculating temperature and pressure dependence of reactions, and the specific conductance and viscosity of the solution, using +# pitzer.dat for calculating temperature and pressure dependence of reactions, and the specific conductance and viscosity of the solution, using # diffusion coefficients of species, molal volumina of aqueous species and minerals, and critical temperatures and pressures of gases used in Peng-Robinson's EOS. # Details are given at the end of this file.