From 076005a7e94fd74337a900dffc730898b902a27d Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Thu, 3 Jul 2014 10:03:42 -0700 Subject: [PATCH] fix tests for now. --- simpegFLOW/Richards/Empirical.py | 4 ++-- simpegFLOW/Tests/test_Richards.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/simpegFLOW/Richards/Empirical.py b/simpegFLOW/Richards/Empirical.py index a28f58af..0e45ed57 100644 --- a/simpegFLOW/Richards/Empirical.py +++ b/simpegFLOW/Richards/Empirical.py @@ -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=24.96) + Ks = _ModelProperty('Ks', ['kModel'], default=np.log(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=24.96) + Ks = _ModelProperty('Ks', ['kModel'], default=np.log(24.96)) I = _ModelProperty('I', ['kModel'], default=0.500) def __init__(self, mesh, **kwargs): diff --git a/simpegFLOW/Tests/test_Richards.py b/simpegFLOW/Tests/test_Richards.py index ab2cbc1a..f8ec6358 100644 --- a/simpegFLOW/Tests/test_Richards.py +++ b/simpegFLOW/Tests/test_Richards.py @@ -67,6 +67,7 @@ class RichardsTests1D(unittest.TestCase): 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])