From 4e1d1cf4b12ee928e24e5b27028dacc47ba6cda1 Mon Sep 17 00:00:00 2001 From: Antonella Ritorto Date: Mon, 23 Oct 2023 17:06:15 +0200 Subject: [PATCH] Update LookUpData --- ebos/eclgenericproblem.hh | 2 +- ebos/eclgenericproblem_impl.hh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ebos/eclgenericproblem.hh b/ebos/eclgenericproblem.hh index fd8a0c6b9..ae1945ec4 100644 --- a/ebos/eclgenericproblem.hh +++ b/ebos/eclgenericproblem.hh @@ -380,7 +380,7 @@ protected: auto getLookUpData(unsigned elemIdx) const { using GridType = std::remove_cv_t< typename std::remove_reference::type>; - return lookUpData_.template getOriginIndex(elemIdx); + return lookUpData_.template getFieldPropIdx(elemIdx); } private: diff --git a/ebos/eclgenericproblem_impl.hh b/ebos/eclgenericproblem_impl.hh index b123e36e2..5e6b54fb5 100644 --- a/ebos/eclgenericproblem_impl.hh +++ b/ebos/eclgenericproblem_impl.hh @@ -351,13 +351,11 @@ template Scalar EclGenericProblem:: rockFraction(unsigned elementIdx, unsigned timeIdx) const { - const auto& fp = eclState_.fieldProps(); - const std::vector& poro = fp.get_double("PORO"); // the reference porosity is defined as the accumulated pore volume divided by the // geometric volume of the element. Note that it can // be larger than 1.0 if porevolume multipliers are used // to for instance implement larger boundary cells - Scalar porosity = poro[this->getLookUpData(elementIdx)]; + auto porosity = this->lookUpData_.fieldPropDouble(eclState_.fieldProps(), "PORO", elementIdx); return referencePorosity(elementIdx, timeIdx) / porosity * (1 - porosity); }