From f747d724c9942b99133865dd6e0df95395575c88 Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Thu, 3 Jul 2014 09:56:05 -0700 Subject: [PATCH] Make working in log conductivity a bit more explicit. Should be fixed in the actual implementation, and use SimPEG maps instead of forcing the user to work in weird units. --- docs/examples/richards_comparisonToCeiliaEtAl1990.py | 1 + simpegFLOW/Richards/Empirical.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/examples/richards_comparisonToCeiliaEtAl1990.py b/docs/examples/richards_comparisonToCeiliaEtAl1990.py index ae7f5d1d..95f58cd8 100644 --- a/docs/examples/richards_comparisonToCeiliaEtAl1990.py +++ b/docs/examples/richards_comparisonToCeiliaEtAl1990.py @@ -9,6 +9,7 @@ import matplotlib.pyplot as plt M = Mesh.TensorMesh([np.ones(40)]) M.setCellGradBC('dirichlet') params = Richards.Empirical.HaverkampParams().celia1990 +params['Ks'] = np.log(params['Ks']) E = Richards.Empirical.Haverkamp(M, **params) bc = np.array([-61.5,-20.7]) diff --git a/simpegFLOW/Richards/Empirical.py b/simpegFLOW/Richards/Empirical.py index c3e5066e..a28f58af 100644 --- a/simpegFLOW/Richards/Empirical.py +++ b/simpegFLOW/Richards/Empirical.py @@ -153,7 +153,7 @@ class HaverkampParams(object): """ return {'alpha':1.611e+06, 'beta':3.96, 'theta_r':0.075, 'theta_s':0.287, - 'Ks':np.log(9.44e-03), 'A':1.175e+06, + 'Ks':9.44e-03, 'A':1.175e+06, 'gamma':4.74} @@ -243,7 +243,7 @@ class Haverkamp(RichardsMap): theta_r = _ModelProperty('theta_r', ['thetaModel'], default=0.075) theta_s = _ModelProperty('theta_s', ['thetaModel'], default=0.287) - Ks = _ModelProperty('Ks', ['kModel'], default=np.log(24.96)) + Ks = _ModelProperty('Ks', ['kModel'], default=24.96) A = _ModelProperty('A', ['kModel'], default=1.1750e+06) gamma = _ModelProperty('gamma', ['kModel'], default=4.74) @@ -357,7 +357,7 @@ class VanGenuchten(RichardsMap): alpha = _ModelProperty('alpha', ['thetaModel', 'kModel'], default=0.036) n = _ModelProperty('n', ['thetaModel', 'kModel'], default=1.560) - Ks = _ModelProperty('Ks', ['kModel'], default=np.log(24.96)) + Ks = _ModelProperty('Ks', ['kModel'], default=24.96) I = _ModelProperty('I', ['kModel'], default=0.500) def __init__(self, mesh, **kwargs):