OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using VLAs (C99 feature).

Browse Source 
Regular C fixed-size arrays are sufficient here, although in general
std::vector is the preferred replacement (if needing the dynamic size).
This commit is contained in:
Atgeirr Flø Rasmussen 2014-11-24 10:55:10 +01:00
parent f279629bf1
commit bce2d6ad1a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/test_satfunc.cpp
View File

@ -62,12 +62,12 @@ BOOST_AUTO_TEST_CASE (GwsegStandard)
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); 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 wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua];
const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid];
const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; 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(wpos == 0);
BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(opos == 1);
BOOST_REQUIRE(gpos == 2); BOOST_REQUIRE(gpos == 2);
@ -147,12 +147,12 @@ BOOST_AUTO_TEST_CASE (GwsegEPSBase)
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); 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 wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua];
const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid];
const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; 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(wpos == 0);
BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(opos == 1);
BOOST_REQUIRE(gpos == 2); BOOST_REQUIRE(gpos == 2);
@ -232,12 +232,12 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_A)
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); 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 wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua];
const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid];
const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; 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(wpos == 0);
BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(opos == 1);
BOOST_REQUIRE(gpos == 2); BOOST_REQUIRE(gpos == 2);
@ -478,12 +478,12 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_C)
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); 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 wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua];
const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid];
const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; 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(wpos == 0);
BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(opos == 1);
BOOST_REQUIRE(gpos == 2); BOOST_REQUIRE(gpos == 2);
@ -576,12 +576,12 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_D)
Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck)); Opm::EclipseStateConstPtr eclipseState(new Opm::EclipseState(deck));
Opm::BlackoilPropertiesFromDeck props(deck, eclipseState, grid, param, false); 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 wpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Aqua];
const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid]; const int opos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Liquid];
const int gpos = props.phaseUsage().phase_pos[Opm::BlackoilPhases::Vapour]; 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(wpos == 0);
BOOST_REQUIRE(opos == 1); BOOST_REQUIRE(opos == 1);
BOOST_REQUIRE(gpos == 2); BOOST_REQUIRE(gpos == 2);