OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Switch to Using Constructor Syntax for CellData

Browse Source 
This is in preparation of adding actual constructors to the type.
This commit is contained in:
Bård Skaflestad
2023-03-15 11:33:13 +01:00
parent 56ea715cf3
commit 601301355a
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebos/eclgenericwriter.cc
+15 -13
View File
@@ -274,21 +274,21 @@ writeInit(const std::function<unsigned int(unsigned int)>& map)
template<class Grid, class EquilGrid, class GridView, class ElementMapper, class Scalar> template<class Grid, class EquilGrid, class GridView, class ElementMapper, class Scalar>
data::Solution EclGenericWriter<Grid,EquilGrid,GridView,ElementMapper,Scalar>:: data::Solution EclGenericWriter<Grid,EquilGrid,GridView,ElementMapper,Scalar>::
computeTrans_(const std::unordered_map<int,int>& cartesianToActive, const std::function<unsigned int(unsigned int)>& map) const computeTrans_(const std::unordered_map<int,int>& cartesianToActive,
const std::function<unsigned int(unsigned int)>& map) const
{ {
const auto& cartMapper = *equilCartMapper_; const auto& cartMapper = *equilCartMapper_;
const auto& cartDims = cartMapper.cartesianDimensions(); const auto& cartDims = cartMapper.cartesianDimensions();
const int globalSize = cartDims[0]*cartDims[1]*cartDims[2]; const int globalSize = cartDims[0] * cartDims[1] * cartDims[2];
data::CellData tranx = {UnitSystem::measure::transmissibility, std::vector<double>(globalSize), data::TargetType::INIT}; auto tranx = data::CellData {
data::CellData trany = {UnitSystem::measure::transmissibility, std::vector<double>(globalSize), data::TargetType::INIT}; UnitSystem::measure::transmissibility,
data::CellData tranz = {UnitSystem::measure::transmissibility, std::vector<double>(globalSize), data::TargetType::INIT}; std::vector<double>(globalSize, 0.0),
data::TargetType::INIT
};
for (size_t i = 0; i < tranx.data.size(); ++i) { auto trany = tranx;
tranx.data[0] = 0.0; auto tranz = tranx;
trany.data[0] = 0.0;
tranz.data[0] = 0.0;
}
using GlobalGridView = typename EquilGrid::LeafGridView; using GlobalGridView = typename EquilGrid::LeafGridView;
const GlobalGridView& globalGridView = equilGrid_->leafGridView(); const GlobalGridView& globalGridView = equilGrid_->leafGridView();
@@ -336,9 +336,11 @@ computeTrans_(const std::unordered_map<int,int>& cartesianToActive, const std::f
} }
} }
return {{"TRANX", tranx}, return {
{"TRANY", trany}, {"TRANX", tranx},
{"TRANZ", tranz}}; {"TRANY", trany},
{"TRANZ", tranz},
};
} }
template<class Grid, class EquilGrid, class GridView, class ElementMapper, class Scalar> template<class Grid, class EquilGrid, class GridView, class ElementMapper, class Scalar>