From 4b4647ba2c0d743c5a667b83fbdecd913e6dc7de Mon Sep 17 00:00:00 2001 From: fparisio Date: Tue, 31 Jul 2018 14:52:40 +0200 Subject: [PATCH] Porosity limit --- .../PorosityDependentFractureRockPermeability.cpp | 8 ++++---- .../PorousMedium/Porosity/TheoreticalPorosity.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/FEM/Material/PorousMedium/Permeability/PorosityDependentFractureRockPermeability.cpp b/FEM/Material/PorousMedium/Permeability/PorosityDependentFractureRockPermeability.cpp index f6871010f..d892dec40 100644 --- a/FEM/Material/PorousMedium/Permeability/PorosityDependentFractureRockPermeability.cpp +++ b/FEM/Material/PorousMedium/Permeability/PorosityDependentFractureRockPermeability.cpp @@ -48,10 +48,10 @@ PorosityDependentFractureRockPermeability::PorosityDependentFractureRockPermeabi double PorosityDependentFractureRockPermeability::getPermeability(const std::size_t element_id, const double porosity) { - const double omega = _omega[element_id]; - return std::pow(10.0, - (1. - omega) * std::log10(4.979 * 1.e-11 * std::pow(porosity, 3.11)) - + omega * std::log10(1.143 * 1.e-11 * std::pow(porosity, 0.64))); + const double omega = _omega[element_id]; + return std::pow(2.7182818284590451, + (1. - omega) * std::log(4.979e-11 * std::pow(porosity, 3.11)) + + omega * std::log(1.143e-11 * std::pow(porosity, 0.64))); } } // End of name space diff --git a/FEM/Material/PorousMedium/Porosity/TheoreticalPorosity.cpp b/FEM/Material/PorousMedium/Porosity/TheoreticalPorosity.cpp index d7c716721..dc2288701 100644 --- a/FEM/Material/PorousMedium/Porosity/TheoreticalPorosity.cpp +++ b/FEM/Material/PorousMedium/Porosity/TheoreticalPorosity.cpp @@ -22,7 +22,7 @@ namespace MaterialLib TheoreticalPorosity::TheoreticalPorosity(const CRFProcess& process_T, const CRFProcess& process_H, const CRFProcess& process_M, const double n0, const double K, const double alpha_B, double alpha_T) - : _process_T(process_T), _process_H(process_H), _process_M(process_M), _n_min(0.001), _n_max(0.999), _n0(n0), + : _process_T(process_T), _process_H(process_H), _process_M(process_M), _n_min(0.01), _n_max(0.99), _n0(n0), _Ks( K / (1.0 - alpha_B)), _alpha_B(alpha_B), _alpha_T(alpha_T), _index_T(_process_T.GetNodeValueIndex(_process_T.GetPrimaryVName(0))), _index_p(_process_H.GetNodeValueIndex(_process_H.GetPrimaryVName(0)))