From 9a3878e0eba7accaefce4599b22384f8b0cc0dfc Mon Sep 17 00:00:00 2001
From: IvarStefansson <ivar.stefansson@uib.no>
Date: Sat, 27 Jul 2019 19:05:47 +0200
Subject: [PATCH] Update granite and water

---
 src/porepy/params/rock.py  |  9 +++++----
 src/porepy/params/water.py | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/porepy/params/rock.py b/src/porepy/params/rock.py
index c3c5b87c9e..d9e1fdb854 100644
--- a/src/porepy/params/rock.py
+++ b/src/porepy/params/rock.py
@@ -3,6 +3,8 @@
 Contains standard values (e.g. found in Wikipedia) for permeability, elastic
 moduli etc.
 
+Note that thermal expansion coefficients are linear (m/mK) for rocks, but
+volumetric (m^3/m^3) for fluids.
 """
 import porepy as pp
 
@@ -157,7 +159,7 @@ def __init__(self, theta_ref=None):
         self.PERMEABILITY = 1e-8 * pp.DARCY
         self.POROSITY = 0.01
         # Reported range for Young's modulus by jsg is 10-70GPa
-        self.YOUNG_MODULUS = 4.0 * pp.GIGA * pp.PASCAL
+        self.YOUNG_MODULUS = 40.0 * pp.GIGA * pp.PASCAL
         # Reported range for Poisson's ratio is 0.125-0.25
         self.POISSON_RATIO = 0.2
 
@@ -166,9 +168,8 @@ def __init__(self, theta_ref=None):
         self.LAMBDA, self.MU = lame_from_young_poisson(
             self.YOUNG_MODULUS, self.POISSON_RATIO
         )
-        self.THERMAL_EXPANSION = (
-            8e-6 * pp.METER / (pp.METER * pp.CELSIUS)
-        )  # from engineeringtoolbox.com
+        # Units of thermal expansion: m^3 / m^3 K, i.e. volumetric. From engineeringtoolbox.com
+        self.THERMAL_EXPANSION = 8e-6 * pp.METER / (pp.METER * pp.CELSIUS)
         if theta_ref is None:
             self.theta_ref = 20.0 * pp.CELSIUS
         else:
diff --git a/src/porepy/params/water.py b/src/porepy/params/water.py
index 7bb05fb32d..4e5e786da1 100644
--- a/src/porepy/params/water.py
+++ b/src/porepy/params/water.py
@@ -1,3 +1,10 @@
+""" Hard coded typical parameters that may be of use in simulations.
+
+Contains standard values (e.g. found in Wikipedia) for density, thermal properties etc.
+
+Note that thermal expansion coefficients are linear (m/mK) for rocks, but
+volumetric (m^3/m^3) for fluids.
+"""
 import numpy as np
 import porepy as pp
 
@@ -13,6 +20,7 @@ def __init__(self, theta_ref=None):
         self.BULK = 1 / self.COMPRESSIBILITY
 
     def thermal_expansion(self, delta_theta):
+        """ Units: m^3 / m^3 K, i.e. volumetric """
         return (
             0.0002115
             + 1.32 * 1e-6 * delta_theta
@@ -20,6 +28,7 @@ def thermal_expansion(self, delta_theta):
         )
 
     def density(self, theta=None):  # theta in CELSIUS
+        """ Units: kg / m^3 """
         if theta is None:
             theta = self.theta_ref
         theta_0 = 10 * (pp.CELSIUS)
@@ -27,6 +36,7 @@ def density(self, theta=None):  # theta in CELSIUS
         return rho_0 / (1.0 + self.thermal_expansion(theta - theta_0))
 
     def thermal_conductivity(self, theta=None):  # theta in CELSIUS
+        """ Units: W / m K """
         if theta is None:
             theta = self.theta_ref
         return (
@@ -37,11 +47,13 @@ def thermal_conductivity(self, theta=None):  # theta in CELSIUS
         )
 
     def specific_heat_capacity(self, theta=None):  # theta in CELSIUS
+        """ Units: J / kg K """
         if theta is None:
             theta = self.theta_ref
-        return (4245 - 1.841 * theta) / self.density(theta)
+        return 4245 - 1.841 * theta
 
     def dynamic_viscosity(self, theta=None):  # theta in CELSIUS
+        """Units: Pa s"""
         if theta is None:
             theta = self.theta_ref
         theta = pp.CELSIUS_to_KELVIN(theta)