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

Merge pull request #1540 from andlaus/remove_FluidSystems_namespace

Browse Source 
adapt to the fluid system naming convention change in opm-material
This commit is contained in:
Bård Skaflestad 2018-07-27 21:06:23 +02:00 committed by GitHub
commit 6a3199dbe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/compute_initial_state.cpp
View File

@ -129,7 +129,7 @@ try
std::vector<int> compressedToCartesianIdx std::vector<int> compressedToCartesianIdx
= Opm::compressedToCartesian(grid.number_of_cells, grid.global_cell); = Opm::compressedToCartesian(grid.number_of_cells, grid.global_cell);
typedef FluidSystems::BlackOil<double> FluidSystem; typedef BlackOilFluidSystem<double> FluidSystem;
// Forward declaring the MaterialLawManager template. // Forward declaring the MaterialLawManager template.
typedef Opm::ThreePhaseMaterialTraits<double, typedef Opm::ThreePhaseMaterialTraits<double,

2
opm/autodiff/BlackoilPropsAdFromDeck.hpp
View File

@ -62,7 +62,7 @@ namespace Opm
{ {
friend class BlackoilPropsDataHandle; friend class BlackoilPropsDataHandle;
public: public:
typedef FluidSystems::BlackOil<double> FluidSystem; typedef BlackOilFluidSystem<double> FluidSystem;
typedef Opm::GasPvtMultiplexer<double> GasPvt; typedef Opm::GasPvtMultiplexer<double> GasPvt;
typedef Opm::OilPvtMultiplexer<double> OilPvt; typedef Opm::OilPvtMultiplexer<double> OilPvt;
typedef Opm::WaterPvtMultiplexer<double> WaterPvt; typedef Opm::WaterPvtMultiplexer<double> WaterPvt;

2
opm/autodiff/FlowMain.hpp
View File

@ -636,7 +636,7 @@ namespace Opm
props.numPhases())); props.numPhases()));
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
FluidSystem::initFromDeck(*deck_ , *eclipse_state_); FluidSystem::initFromDeck(*deck_ , *eclipse_state_);
typedef EQUIL::DeckDependent::InitialStateComputer<FluidSystem> ISC; typedef EQUIL::DeckDependent::InitialStateComputer<FluidSystem> ISC;

2
opm/core/simulator/EquilibrationHelpers.hpp
View File

@ -87,7 +87,7 @@ namespace Opm
namespace EQUIL { namespace EQUIL {
typedef Opm::FluidSystems::BlackOil<double> FluidSystemSimple; typedef Opm::BlackOilFluidSystem<double> FluidSystemSimple;
// Adjust oil pressure according to gas saturation and cap pressure // Adjust oil pressure according to gas saturation and cap pressure
typedef Opm::SimpleModularFluidState<double, typedef Opm::SimpleModularFluidState<double,

16
tests/test_equil_legacy.cpp
View File

@ -45,7 +45,7 @@
#include <vector> #include <vector>
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
// Forward declaring the MaterialLawManager template. // Forward declaring the MaterialLawManager template.
typedef Opm::ThreePhaseMaterialTraits<double, typedef Opm::ThreePhaseMaterialTraits<double,
/*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx, /*wettingPhaseIdx=*/FluidSystem::waterPhaseIdx,
@ -409,7 +409,7 @@ BOOST_AUTO_TEST_CASE (DeckAllDead)
MaterialLawManager materialLawManager = MaterialLawManager(); MaterialLawManager materialLawManager = MaterialLawManager();
materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx);
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
// Initialize the fluid system // Initialize the fluid system
FluidSystem::initFromDeck(deck, eclipseState); FluidSystem::initFromDeck(deck, eclipseState);
@ -448,7 +448,7 @@ BOOST_AUTO_TEST_CASE (CapillaryInversion)
MaterialLawManager materialLawManager = MaterialLawManager(); MaterialLawManager materialLawManager = MaterialLawManager();
materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx);
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
typedef MaterialLawManager::MaterialLaw MaterialLaw; typedef MaterialLawManager::MaterialLaw MaterialLaw;
if (!FluidSystem::isInitialized()) { if (!FluidSystem::isInitialized()) {
@ -514,7 +514,7 @@ BOOST_AUTO_TEST_CASE (DeckWithCapillary)
MaterialLawManager materialLawManager = MaterialLawManager(); MaterialLawManager materialLawManager = MaterialLawManager();
materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx);
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
// Initialize the fluid system // Initialize the fluid system
FluidSystem::initFromDeck(deck, eclipseState); FluidSystem::initFromDeck(deck, eclipseState);
@ -565,7 +565,7 @@ BOOST_AUTO_TEST_CASE (DeckWithCapillaryOverlap)
MaterialLawManager materialLawManager = MaterialLawManager(); MaterialLawManager materialLawManager = MaterialLawManager();
materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx);
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
// Initialize the fluid system // Initialize the fluid system
FluidSystem::initFromDeck(deck, eclipseState); FluidSystem::initFromDeck(deck, eclipseState);
@ -638,7 +638,7 @@ BOOST_AUTO_TEST_CASE (DeckWithLiveOil)
MaterialLawManager materialLawManager = MaterialLawManager(); MaterialLawManager materialLawManager = MaterialLawManager();
materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx);
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
// Initialize the fluid system // Initialize the fluid system
FluidSystem::initFromDeck(deck, eclipseState); FluidSystem::initFromDeck(deck, eclipseState);
@ -726,7 +726,7 @@ BOOST_AUTO_TEST_CASE (DeckWithLiveGas)
MaterialLawManager materialLawManager = MaterialLawManager(); MaterialLawManager materialLawManager = MaterialLawManager();
materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx);
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
// Initialize the fluid system // Initialize the fluid system
FluidSystem::initFromDeck(deck, eclipseState); FluidSystem::initFromDeck(deck, eclipseState);
@ -817,7 +817,7 @@ BOOST_AUTO_TEST_CASE (DeckWithRSVDAndRVVD)
MaterialLawManager materialLawManager = MaterialLawManager(); MaterialLawManager materialLawManager = MaterialLawManager();
materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx); materialLawManager.initFromDeck(deck, eclipseState, compressedToCartesianIdx);
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
// Initialize the fluid system // Initialize the fluid system
FluidSystem::initFromDeck(deck, eclipseState); FluidSystem::initFromDeck(deck, eclipseState);

4
tests/test_wellmodel.cpp
View File

@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE(TestStandardWellInput) {
const Opm::BlackoilModelParameters param; const Opm::BlackoilModelParameters param;
// For the conversion between the surface volume rate and resrevoir voidage rate // For the conversion between the surface volume rate and resrevoir voidage rate
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
using RateConverterType = Opm::RateConverter:: using RateConverterType = Opm::RateConverter::
SurfaceToReservoirVoidage<FluidSystem, std::vector<int> >; SurfaceToReservoirVoidage<FluidSystem, std::vector<int> >;
// Compute reservoir volumes for RESV controls. // 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 // we should always be able to find the well in wells_ecl
BOOST_CHECK(index_well != wells_ecl.size()); BOOST_CHECK(index_well != wells_ecl.size());
// For the conversion between the surface volume rate and resrevoir voidage rate // For the conversion between the surface volume rate and resrevoir voidage rate
typedef Opm::FluidSystems::BlackOil<double> FluidSystem; typedef Opm::BlackOilFluidSystem<double> FluidSystem;
using RateConverterType = Opm::RateConverter:: using RateConverterType = Opm::RateConverter::
SurfaceToReservoirVoidage<FluidSystem, std::vector<int> >; SurfaceToReservoirVoidage<FluidSystem, std::vector<int> >;
// Compute reservoir volumes for RESV controls. // Compute reservoir volumes for RESV controls.