From 237b63e67476ee60f89e64a7e063382eb14661c8 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 1 Jun 2023 09:37:52 +0200 Subject: [PATCH] reduce scope of variables to avoid dead store warnings --- src/opm/io/eclipse/rst/state.cpp | 5 +++-- tests/test_EclipseIO.cpp | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/opm/io/eclipse/rst/state.cpp b/src/opm/io/eclipse/rst/state.cpp index 52335d9c1..68fd33734 100644 --- a/src/opm/io/eclipse/rst/state.cpp +++ b/src/opm/io/eclipse/rst/state.cpp @@ -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]; diff --git a/tests/test_EclipseIO.cpp b/tests/test_EclipseIO.cpp index c85e3cd2f..d1d05b24c 100644 --- a/tests/test_EclipseIO.cpp +++ b/tests/test_EclipseIO.cpp @@ -130,8 +130,6 @@ void compareErtData(const std::vector &src, const std::vector &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("COORD"); const auto& expect = eclGrid.getCOORD(); @@ -148,8 +146,10 @@ void checkEgridFile( const EclipseGrid& eclGrid ) { const auto& actnum = egridFile.get("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); }