From ac2bc410f341f3efb48faef6fef329b98d15f705 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Fri, 27 Jul 2018 12:54:02 +0200 Subject: [PATCH] adapt to the fluid system naming convention change in opm-material note that almost the only thing which is affected is legacy code. --- examples/compute_initial_state.cpp | 2 +- opm/autodiff/BlackoilPropsAdFromDeck.hpp | 2 +- opm/autodiff/FlowMain.hpp | 2 +- opm/core/simulator/EquilibrationHelpers.hpp | 2 +- tests/test_equil_legacy.cpp | 16 ++++++++-------- tests/test_wellmodel.cpp | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/compute_initial_state.cpp b/examples/compute_initial_state.cpp index 099f55c0d..2ec37c568 100644 --- a/examples/compute_initial_state.cpp +++ b/examples/compute_initial_state.cpp @@ -129,7 +129,7 @@ try std::vector compressedToCartesianIdx = Opm::compressedToCartesian(grid.number_of_cells, grid.global_cell); - typedef FluidSystems::BlackOil FluidSystem; + typedef BlackOilFluidSystem FluidSystem; // Forward declaring the MaterialLawManager template. typedef Opm::ThreePhaseMaterialTraits FluidSystem; + typedef BlackOilFluidSystem FluidSystem; typedef Opm::GasPvtMultiplexer GasPvt; typedef Opm::OilPvtMultiplexer OilPvt; typedef Opm::WaterPvtMultiplexer WaterPvt; diff --git a/opm/autodiff/FlowMain.hpp b/opm/autodiff/FlowMain.hpp index 540bdd0c5..cee2242db 100644 --- a/opm/autodiff/FlowMain.hpp +++ b/opm/autodiff/FlowMain.hpp @@ -636,7 +636,7 @@ namespace Opm props.numPhases())); - typedef Opm::FluidSystems::BlackOil FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; FluidSystem::initFromDeck(*deck_ , *eclipse_state_); typedef EQUIL::DeckDependent::InitialStateComputer ISC; diff --git a/opm/core/simulator/EquilibrationHelpers.hpp b/opm/core/simulator/EquilibrationHelpers.hpp index bff675e1f..c9c49c62c 100644 --- a/opm/core/simulator/EquilibrationHelpers.hpp +++ b/opm/core/simulator/EquilibrationHelpers.hpp @@ -87,7 +87,7 @@ namespace Opm namespace EQUIL { - typedef Opm::FluidSystems::BlackOil FluidSystemSimple; + typedef Opm::BlackOilFluidSystem FluidSystemSimple; // Adjust oil pressure according to gas saturation and cap pressure typedef Opm::SimpleModularFluidState -typedef Opm::FluidSystems::BlackOil FluidSystem; +typedef Opm::BlackOilFluidSystem FluidSystem; // Forward declaring the MaterialLawManager template. typedef Opm::ThreePhaseMaterialTraits FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; // Initialize the fluid system FluidSystem::initFromDeck(deck, eclipseState); @@ -448,7 +448,7 @@ BOOST_AUTO_TEST_CASE (CapillaryInversion) MaterialLawManager materialLawManager = MaterialLawManager(); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); - typedef Opm::FluidSystems::BlackOil FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; typedef MaterialLawManager::MaterialLaw MaterialLaw; if (!FluidSystem::isInitialized()) { @@ -514,7 +514,7 @@ BOOST_AUTO_TEST_CASE (DeckWithCapillary) MaterialLawManager materialLawManager = MaterialLawManager(); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); - typedef Opm::FluidSystems::BlackOil FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; // Initialize the fluid system FluidSystem::initFromDeck(deck, eclipseState); @@ -565,7 +565,7 @@ BOOST_AUTO_TEST_CASE (DeckWithCapillaryOverlap) MaterialLawManager materialLawManager = MaterialLawManager(); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); - typedef Opm::FluidSystems::BlackOil FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; // Initialize the fluid system FluidSystem::initFromDeck(deck, eclipseState); @@ -638,7 +638,7 @@ BOOST_AUTO_TEST_CASE (DeckWithLiveOil) MaterialLawManager materialLawManager = MaterialLawManager(); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); - typedef Opm::FluidSystems::BlackOil FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; // Initialize the fluid system FluidSystem::initFromDeck(deck, eclipseState); @@ -726,7 +726,7 @@ BOOST_AUTO_TEST_CASE (DeckWithLiveGas) MaterialLawManager materialLawManager = MaterialLawManager(); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); - typedef Opm::FluidSystems::BlackOil FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; // Initialize the fluid system FluidSystem::initFromDeck(deck, eclipseState); @@ -817,7 +817,7 @@ BOOST_AUTO_TEST_CASE (DeckWithRSVDAndRVVD) MaterialLawManager materialLawManager = MaterialLawManager(); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); - typedef Opm::FluidSystems::BlackOil FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; // Initialize the fluid system FluidSystem::initFromDeck(deck, eclipseState); diff --git a/tests/test_wellmodel.cpp b/tests/test_wellmodel.cpp index 2c8b41daa..92fcb85ad 100644 --- a/tests/test_wellmodel.cpp +++ b/tests/test_wellmodel.cpp @@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE(TestStandardWellInput) { const Opm::BlackoilModelParameters param; // For the conversion between the surface volume rate and resrevoir voidage rate - typedef Opm::FluidSystems::BlackOil FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; using RateConverterType = Opm::RateConverter:: SurfaceToReservoirVoidage >; // Compute reservoir volumes for RESV controls. @@ -172,7 +172,7 @@ BOOST_AUTO_TEST_CASE(TestBehavoir) { // we should always be able to find the well in wells_ecl BOOST_CHECK(index_well != wells_ecl.size()); // For the conversion between the surface volume rate and resrevoir voidage rate - typedef Opm::FluidSystems::BlackOil FluidSystem; + typedef Opm::BlackOilFluidSystem FluidSystem; using RateConverterType = Opm::RateConverter:: SurfaceToReservoirVoidage >; // Compute reservoir volumes for RESV controls.