From 103e079b69b38ef0c944b95740866368e6b7539b Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Sat, 8 Jun 2024 00:13:34 +0000 Subject: [PATCH] Squashed 'database/' changes from 9bf3c42d..4fc5a196 4fc5a196 [phreeqc3] Updated databases git-subtree-dir: database git-subtree-split: 4fc5a196119c09ee6337f6c13618c8031bc6acaa --- CMakeLists.txt | 8 +++++--- Makefile.am | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 680d81f14..2bc7947dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,18 @@ set(phreeqc_DATABASE Amm.dat - core10.dat ColdChem.dat + Concrete_PHR.dat + Concrete_PZ.dat + core10.dat frezchem.dat iso.dat - llnl.dat Kinec.v2.dat + llnl.dat minteq.dat minteq.v4.dat - phreeqc.dat phreeqc_rates.dat PHREEQC_ThermoddemV1.10_15Dec2020.dat + phreeqc.dat pitzer.dat sit.dat Tipping_Hurley.dat diff --git a/Makefile.am b/Makefile.am index b16ff7182..ad40b735b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,8 @@ dist_database_DATA=$(DATABASE) DATABASE=\ Amm.dat\ ColdChem.dat\ + Concrete_PHR.dat\ + Concrete_PZ.dat\ core10.dat\ frezchem.dat\ iso.dat\ @@ -16,9 +18,9 @@ DATABASE=\ llnl.dat\ minteq.dat\ minteq.v4.dat\ + phreeqc_rates.dat\ PHREEQC_ThermoddemV1.10_15Dec2020.dat\ phreeqc.dat\ - phreeqc_rates.dat\ pitzer.dat\ sit.dat\ Tipping_Hurley.dat\