From bce2d6ad1a162168bc11956e2286deb620d6b84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Mon, 24 Nov 2014 10:55:10 +0100 Subject: [PATCH] Avoid using VLAs (C99 feature). Regular C fixed-size arrays are sufficient here, although in general std::vector is the preferred replacement (if needing the dynamic size). --- tests/test_satfunc.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/test_satfunc.cpp b/tests/test_satfunc.cpp index 406ca81fd..549dc55cf 100644 --- a/tests/test_satfunc.cpp +++ b/tests/test_satfunc.cpp @@ -62,12 +62,12 @@ BOOST_AUTO_TEST_CASE (GwsegStandard) Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); - const int np = props.numPhases(); + const int np = 3; const int wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; - BOOST_REQUIRE(np == 3); + BOOST_REQUIRE(np == props.numPhases()); BOOST_REQUIRE(wpos == 0); BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(gpos == 2); @@ -147,12 +147,12 @@ BOOST_AUTO_TEST_CASE (GwsegEPSBase) Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); - const int np = props.numPhases(); + const int np = 3; const int wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; - BOOST_REQUIRE(np == 3); + BOOST_REQUIRE(np == props.numPhases()); BOOST_REQUIRE(wpos == 0); BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(gpos == 2); @@ -232,12 +232,12 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_A) Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); - const int np = props.numPhases(); + const int np = 3; const int wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; - BOOST_REQUIRE(np == 3); + BOOST_REQUIRE(np == props.numPhases()); BOOST_REQUIRE(wpos == 0); BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(gpos == 2); @@ -478,12 +478,12 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_C) Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); - const int np = props.numPhases(); + const int np = 3; const int wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; - BOOST_REQUIRE(np == 3); + BOOST_REQUIRE(np == props.numPhases()); BOOST_REQUIRE(wpos == 0); BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(gpos == 2); @@ -576,12 +576,12 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_D) Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); - const int np = props.numPhases(); + const int np = 3; const int wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; - BOOST_REQUIRE(np == 3); + BOOST_REQUIRE(np == props.numPhases()); BOOST_REQUIRE(wpos == 0); BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(gpos == 2);