mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Move lookupAssigner to remove shadow decl warnings
This commit is contained in:
parent
1f77b0c199
commit
bba5833332
@ -377,6 +377,15 @@ protected:
|
|||||||
using LookUpData = Opm::LookUpData<Grid,GridView>;
|
using LookUpData = Opm::LookUpData<Grid,GridView>;
|
||||||
const LookUpData lookUpData_;
|
const LookUpData lookUpData_;
|
||||||
|
|
||||||
|
// \brief Function to assign the origin cell index on level zero, for a cell 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<unsigned(unsigned)> lookupIdxOnLevelZeroAssigner_()
|
||||||
|
{
|
||||||
|
return [this](unsigned elemIdx) { return lookUpData_.template getFieldPropIdx<Grid>(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);
|
||||||
|
@ -1987,18 +1987,6 @@ protected:
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// \brief Function to assign the origin cell index on level zero, for a cell 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<unsigned(unsigned)> lookupIdxOnLevelZeroAssigner_()
|
|
||||||
{
|
|
||||||
const auto& lookup = this->lookUpData_;
|
|
||||||
// Get Grid Type
|
|
||||||
using GridType = std::remove_cv_t< typename std::remove_reference<decltype(this->gridView().grid())>::type>;
|
|
||||||
return [&lookup](unsigned elemIdx) { return lookup.template getFieldPropIdx<GridType>(elemIdx);};
|
|
||||||
}
|
|
||||||
|
|
||||||
void readMaterialParameters_()
|
void readMaterialParameters_()
|
||||||
{
|
{
|
||||||
OPM_TIMEBLOCK(readMaterialParameters);
|
OPM_TIMEBLOCK(readMaterialParameters);
|
||||||
|
Loading…
Reference in New Issue
Block a user