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

Merge pull request #4802 from bska/remove-unused-return

Browse Source 
Remove Unused Return Value
This commit is contained in:
Markus Blatt 2023-08-17 14:33:06 +02:00 committed by GitHub
commit cc359a25cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ebos/ecltransmissibility.hh
View File

@ -192,12 +192,9 @@ protected:
* *
* \param cartesianToCompressed Vector containing the compressed index (or -1 for inactive * \param cartesianToCompressed Vector containing the compressed index (or -1 for inactive
* cells) as the element at the cartesian index. * cells) as the element at the cartesian index.
* \return Two vector of NNCs (scaled by EDITNNC). The first one are the NNCs that have been applied * \return Nothing.
* and the second the NNCs not resembled by faces of the grid. NNCs specified for
* inactive cells are omitted in these vectors.
*/ */
std::tuple<std::vector<NNCdata>, std::vector<NNCdata>> void applyNncToGridTrans_(const std::unordered_map<std::size_t,int>& cartesianToCompressed);
applyNncToGridTrans_(const std::unordered_map<std::size_t,int>& cartesianToCompressed);
/// \brief Multiplies the grid transmissibilities according to EDITNNC. /// \brief Multiplies the grid transmissibilities according to EDITNNC.
void applyEditNncToGridTrans_(const std::unordered_map<std::size_t,int>& globalToLocal); void applyEditNncToGridTrans_(const std::unordered_map<std::size_t,int>& globalToLocal);

15
ebos/ecltransmissibility_impl.hh
View File

@ -823,16 +823,12 @@ computeFaceProperties(const Intersection& intersection,
} }
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar> template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>
std::tuple<std::vector<NNCdata>, std::vector<NNCdata>> void
EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>:: EclTransmissibility<Grid,GridView,ElementMapper,CartesianIndexMapper,Scalar>::
applyNncToGridTrans_(const std::unordered_map<std::size_t,int>& cartesianToCompressed) applyNncToGridTrans_(const std::unordered_map<std::size_t,int>& cartesianToCompressed)
{ {
// First scale NNCs with EDITNNC. // First scale NNCs with EDITNNC.
std::vector<NNCdata> unprocessedNnc;
std::vector<NNCdata> processedNnc;
const auto& nnc_input = eclState_.getInputNNC().input(); const auto& nnc_input = eclState_.getInputNNC().input();
if (nnc_input.empty())
return std::make_tuple(processedNnc, unprocessedNnc);
for (const auto& nncEntry : nnc_input) { for (const auto& nncEntry : nnc_input) {
auto c1 = nncEntry.cell1; auto c1 = nncEntry.cell1;
@ -859,20 +855,13 @@ applyNncToGridTrans_(const std::unordered_map<std::size_t,int>& cartesianToCompr
} }
auto candidate = trans_.find(isId(low, high)); auto candidate = trans_.find(isId(low, high));
if (candidate != trans_.end()) {
if (candidate == trans_.end())
// This NNC is not resembled by the grid. Save it for later
// processing with local cell values
unprocessedNnc.push_back(nncEntry);
else {
// NNC is represented by the grid and might be a neighboring connection // NNC is represented by the grid and might be a neighboring connection
// In this case the transmissibilty is added to the value already // In this case the transmissibilty is added to the value already
// set or computed. // set or computed.
candidate->second += nncEntry.trans; candidate->second += nncEntry.trans;
processedNnc.push_back(nncEntry);
} }
} }
return std::make_tuple(processedNnc, unprocessedNnc);
} }
template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar> template<class Grid, class GridView, class ElementMapper, class CartesianIndexMapper, class Scalar>