Merge branch 'mix_error' of github.com:dlparkhurst/phreeqc3-1 into mi…

…x_error
usgs-coupled · Nov 16, 2024 · 8796722 · 8796722
2 parents 5926e35 + 2920b46
commit 8796722
Show file tree

Hide file tree

Showing 814 changed files with 75,406 additions and 77,015 deletions.
diff --git a/examples/ex1.out b/examples/ex1.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex10.out b/examples/ex10.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex11.out b/examples/ex11.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex12.out b/examples/ex12.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex12a.out b/examples/ex12a.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex13a.out b/examples/ex13a.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex13ac.out b/examples/ex13ac.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex13b.out b/examples/ex13b.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex13c.out b/examples/ex13c.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex14.out b/examples/ex14.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex16.out b/examples/ex16.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex17.out b/examples/ex17.out
@@ -10,6 +10,7 @@ Reading data base.
 	SOLUTION_SPECIES
 	PHASES
 	PITZER
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES
@@ -91,10 +92,10 @@ Initial solution 1.	Black Sea water
 
                                        pH  =   8.000    
                                        pe  =   4.000    
-      Specific Conductance (µS/cm,  25°C)  = 29777
+      Specific Conductance (µS/cm,  25°C)  = 29778
                           Density (g/cm³)  =   1.01091
                                Volume (L)  =   1.00789
-                        Viscosity (mPa s)  =   0.92658
+                        Viscosity (mPa s)  =   0.92655
                         Activity of water  =   0.990
                  Ionic strength (mol/kgw)  =   3.751e-01
                        Mass of water (kg)  =   1.000e+00
@@ -213,10 +214,10 @@ Initial solution 2.	Composition during halite precipitation
 
                                        pH  =   5.000    
                                        pe  =   4.000    
-      Specific Conductance (µS/cm,  25°C)  = 150248
+      Specific Conductance (µS/cm,  25°C)  = 150307
                           Density (g/cm³)  =   1.27237
                                Volume (L)  =   1.13163
-                        Viscosity (mPa s)  =   3.75438
+                        Viscosity (mPa s)  =   3.75254
                         Activity of water  =   0.678
                  Ionic strength (mol/kgw)  =   1.111e+01
                        Mass of water (kg)  =   1.000e+00

diff --git a/examples/ex17b.out b/examples/ex17b.out
diff --git a/examples/ex18.out b/examples/ex18.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex19.out b/examples/ex19.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex19b.out b/examples/ex19b.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex2.out b/examples/ex2.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES

diff --git a/examples/ex21.out b/examples/ex21.out
@@ -9,6 +9,7 @@ Reading data base.
 	SOLUTION_MASTER_SPECIES
 	SOLUTION_SPECIES
 	PHASES
+	GAS_BINARY_PARAMETERS
 	EXCHANGE_MASTER_SPECIES
 	EXCHANGE_SPECIES
 	SURFACE_MASTER_SPECIES