Merge pull request #2484 from akva2/janitoring

avoid potentially uninitialized warnings in serial
This commit is contained in:
Markus Blatt 2020-03-19 13:07:08 +01:00 committed by GitHub
commit 0970867e47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -161,13 +161,15 @@ public:
// compute the axis specific "centroids" used for the transmissibilities. for
// consistency with the flow simulator, we use the element centers as
// computed by opm-parser's Opm::EclipseGrid class for all axes.
const double* centroid;
std::array<double, 3> centroid;
if (vanguard_.gridView().comm().rank() == 0) {
const auto& eclGrid = eclState.getInputGrid();
unsigned cartesianCellIdx = cartMapper.cartesianIndex(elemIdx);
centroid = &eclGrid.getCellCenter(cartesianCellIdx)[0];
centroid = eclGrid.getCellCenter(cartesianCellIdx);
} else
centroid = &centroids[centroidIdx * dimWorld];
std::copy(centroids.begin() + centroidIdx * dimWorld,
centroids.begin() + (centroidIdx + 1) * dimWorld,
centroid.begin());
for (unsigned axisIdx = 0; axisIdx < dimWorld; ++axisIdx)
for (unsigned dimIdx = 0; dimIdx < dimWorld; ++dimIdx)