OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

getFieldPropDouble(IntType)Assigner_ added

Browse Source
This commit is contained in:
Antonella Ritorto 2023-12-11 17:54:31 +01:00
parent df0daa1a16
commit 924eb72acd
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebos/eclgenericproblem.hh
View File

@ -377,12 +377,6 @@ protected:
using LookUpData = Opm::LookUpData<Grid,GridView>; using LookUpData = Opm::LookUpData<Grid,GridView>;
const LookUpData lookUpData_; const LookUpData lookUpData_;
auto getLookUpData(unsigned elemIdx) const
{
using GridType = std::remove_cv_t< typename std::remove_reference<decltype(gridView_.grid())>::type>;
return lookUpData_.template getFieldPropIdx<GridType>(elemIdx);
}
private: private:
template<class T> template<class T>
void updateNum(const std::string& name, std::vector<T>& numbers, std::size_t num_regions); void updateNum(const std::string& name, std::vector<T>& numbers, std::size_t num_regions);

36
ebos/eclproblem.hh
View File

@ -1955,6 +1955,38 @@ protected:
} }
} }
// \brief Function to assign field properties of type double, on the leaf grid view.
//
// 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<std::vector<double>(const FieldPropsManager&, const std::string&, const unsigned int&)>
getFieldPropDoubleOnLeafAssigner_()
{
const auto& lookup = this->lookUpData_;
return [&lookup](const FieldPropsManager& fieldPropManager, const std::string& propString,
const unsigned int& numElems)
{
return lookup.assignFieldPropsDoubleOnLeaf(fieldPropManager, propString, numElems);
};
}
// \brief Function to assign field properties of type int, unsigned int, ..., on the leaf grid view.
//
// 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.
template<typename IntType>
std::function<std::vector<IntType>(const FieldPropsManager&, const std::string&, const unsigned int&, bool)>
getFieldPropIntTypeOnLeafAssigner_()
{
const auto& lookup = this->lookUpData_;
return [&lookup](const FieldPropsManager& fieldPropManager, const std::string& propString,
const unsigned int& numElems, bool needsTranslation)
{
return lookup.template assignFieldPropsIntOnLeaf<IntType>(fieldPropManager, propString,
numElems, needsTranslation);
};
}
void readMaterialParameters_() void readMaterialParameters_()
{ {
OPM_TIMEBLOCK(readMaterialParameters); OPM_TIMEBLOCK(readMaterialParameters);
@ -1999,7 +2031,9 @@ protected:
// fluid-matrix interactions (saturation functions; relperm/capillary pressure) // fluid-matrix interactions (saturation functions; relperm/capillary pressure)
thermalLawManager_ = std::make_shared<EclThermalLawManager>(); thermalLawManager_ = std::make_shared<EclThermalLawManager>();
thermalLawManager_->initParamsForElements(eclState, this->model().numGridDof()); thermalLawManager_->initParamsForElements(eclState, this->model().numGridDof(),
this-> getFieldPropDoubleOnLeafAssigner_(),
this-> template getFieldPropIntTypeOnLeafAssigner_<unsigned int>());
} }
} }