OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce scope of variables to avoid dead store warnings

Browse Source
This commit is contained in:
Arne Morten Kvarving 2023-06-01 09:37:52 +02:00
parent 5ab4c3dfa0
commit 237b63e674
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opm/io/eclipse/rst/state.cpp
View File

@ -321,10 +321,11 @@ void RstState::add_actions(const Parser& parser,
for (std::size_t icond = 0; icond < actdims.max_conditions(); icond++) {
const auto zacn_offset = index * zacn_action_size + icond * zacn_cond_size;
const auto iacn_offset = index * iacn_action_size + icond * iacn_cond_size;
const auto sacn_offset = index * sacn_action_size + icond * sacn_cond_size;
if (RstAction::Condition::valid(&zacn[zacn_offset], &iacn[iacn_offset]))
if (RstAction::Condition::valid(&zacn[zacn_offset], &iacn[iacn_offset])) {
const auto sacn_offset = index * sacn_action_size + icond * sacn_cond_size;
conditions.emplace_back(&zacn[zacn_offset], &iacn[iacn_offset], &sacn[sacn_offset]);
}
}
const auto& name = zact[index * zact_action_size + 0];

6
tests/test_EclipseIO.cpp
View File

@ -130,8 +130,6 @@ void compareErtData(const std::vector<int> &src, const std::vector<int> &dst)
void checkEgridFile( const EclipseGrid& eclGrid ) {
auto egridFile = EclIO::EGrid("FOO.EGRID");
const auto numCells = eclGrid.getNX() * eclGrid.getNY() * eclGrid.getNZ();
{
const auto& coord = egridFile.get<float>("COORD");
const auto& expect = eclGrid.getCOORD();
@ -148,8 +146,10 @@ void checkEgridFile( const EclipseGrid& eclGrid ) {
const auto& actnum = egridFile.get<int>("ACTNUM");
auto expect = eclGrid.getACTNUM();
if (expect.empty())
if (expect.empty()) {
const auto numCells = eclGrid.getNX() * eclGrid.getNY() * eclGrid.getNZ();
expect.assign(numCells, 1);
}
compareErtData(expect, actnum);
}