From 9419966036582a7ea5582df5e8c7aecd3b5c53a0 Mon Sep 17 00:00:00 2001 From: Antonella Ritorto Date: Tue, 12 Dec 2023 18:48:58 +0100 Subject: [PATCH] Assigner for material props on leaf used --- ebos/eclproblem.hh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh index a6feeb838..f740ca44c 100644 --- a/ebos/eclproblem.hh +++ b/ebos/eclproblem.hh @@ -1960,7 +1960,7 @@ protected: // For CpGrid with local grid refinement, the field property of a cell on the leaf // is inherited from its parent or equivalent (when has no parent) cell on level zero. std::function(const FieldPropsManager&, const std::string&, const unsigned int&)> - getFieldPropDoubleOnLeafAssigner_() + fieldPropDoubleOnLeafAssigner_() { const auto& lookup = this->lookUpData_; return [&lookup](const FieldPropsManager& fieldPropManager, const std::string& propString, @@ -1976,7 +1976,7 @@ protected: // is inherited from its parent or equivalent (when has no parent) cell on level zero. template std::function(const FieldPropsManager&, const std::string&, const unsigned int&, bool)> - getFieldPropIntTypeOnLeafAssigner_() + fieldPropIntTypeOnLeafAssigner_() { const auto& lookup = this->lookUpData_; return [&lookup](const FieldPropsManager& fieldPropManager, const std::string& propString, @@ -2017,7 +2017,8 @@ protected: // fluid-matrix interactions (saturation functions; relperm/capillary pressure) materialLawManager_ = std::make_shared(); materialLawManager_->initFromState(eclState); - materialLawManager_->initParamsForElements(eclState, this->model().numGridDof()); + materialLawManager_->initParamsForElements(eclState, this->model().numGridDof(), + this-> template fieldPropIntTypeOnLeafAssigner_()); //////////////////////////////// } @@ -2032,8 +2033,8 @@ protected: // fluid-matrix interactions (saturation functions; relperm/capillary pressure) thermalLawManager_ = std::make_shared(); thermalLawManager_->initParamsForElements(eclState, this->model().numGridDof(), - this-> getFieldPropDoubleOnLeafAssigner_(), - this-> template getFieldPropIntTypeOnLeafAssigner_()); + this-> fieldPropDoubleOnLeafAssigner_(), + this-> template fieldPropIntTypeOnLeafAssigner_()); } }