Squashed 'database/' changes from 9bf3c42d..4fc5a196

4fc5a196 [phreeqc3] Updated databases git-subtree-dir: database git-subtree-split: 4fc5a196119c09ee6337f6c13618c8031bc6acaa
usgs-coupled · Jun 8, 2024 · 103e079 · 103e079
1 parent 2621f71
commit 103e079
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -9,16 +9,18 @@ dist_database_DATA=$(DATABASE)
 DATABASE=\
 	Amm.dat\
 	ColdChem.dat\
+	Concrete_PHR.dat\
+	Concrete_PZ.dat\
 	core10.dat\
 	frezchem.dat\
 	iso.dat\
 	Kinec.v2.dat\
 	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\