Skip to content

Implemented Dead-Oil model working on device #1313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
francoishamon merged 9 commits into from
Mar 10, 2021
Merged

Implemented Dead-Oil model working on device #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cfef232
implemented DO model
Feb 9, 2021
28be9f8
Merge branch 'develop' into feature/hamon/do
Feb 23, 2021
ff1773c
updated xml files for integratedTests and benchmarks
Feb 25, 2021
e7428df
small fixes
Feb 25, 2021
9252e48
Merge branch 'develop' into feature/hamon/do
Feb 25, 2021
10c3c5f
post-merge fixes
Feb 25, 2021
8b44bd9
addressed review comments
Mar 3, 2021
fd89ac8
Merge branch 'develop' into feature/hamon/do
Mar 10, 2021
f7e6dee
updated integratedTests submodule
Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions examples/AdaptiveTimeStepping/deadoil_3ph_baker_1d.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,8 @@
</ElementRegions>

<Constitutive>
<BlackOilFluid
<DeadOilFluid
name="fluid1"
fluidType="DeadOil"
phaseNames="{ oil, gas, water }"
surfaceDensities="{ 800.0, 0.9907, 1022.0 }"
componentMolarWeight="{ 114e-3, 16e-3, 18e-3 }"
Expand Down
2 changes: 1 addition & 1 deletion integratedTests
Open in desktop
Submodule integratedTests updated from 45858a to d977a5
2 changes: 2 additions & 0 deletions src/coreComponents/constitutive/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ set( constitutive_headers
capillaryPressure/VanGenuchtenCapillaryPressure.hpp
contact/ContactRelationBase.hpp
contact/Coulomb.hpp
fluid/DeadOilFluid.hpp
fluid/MultiPhaseMultiComponentFluid.hpp
fluid/PVTFunctions/BrineCO2DensityFunction.hpp
fluid/PVTFunctions/BrineViscosityFunction.hpp
Expand Down Expand Up @@ -72,6 +73,7 @@ set( constitutive_sources
capillaryPressure/VanGenuchtenCapillaryPressure.cpp
contact/ContactRelationBase.cpp
contact/Coulomb.cpp
fluid/DeadOilFluid.cpp
fluid/CompressibleSinglePhaseFluid.cpp
fluid/MultiPhaseMultiComponentFluid.cpp
fluid/PVTFunctions/BrineCO2DensityFunction.cpp
Expand Down
21 changes: 1 addition & 20 deletions src/coreComponents/constitutive/fluid/BlackOilFluid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@ BlackOilFluid::BlackOilFluid( string const & name, Group * const parent )
setRestartFlags( RestartFlags::NO_WRITE ).
setDescription( "List of filenames with input PVT tables" );

registerWrapper( viewKeyStruct::fluidTypeString(), &m_fluidType ).
setInputFlag( InputFlags::REQUIRED ).
setDescription( "Type of black-oil fluid. Valid options:\n* " + EnumStrings< FluidType >::concat( "\n* " ) );
}

BlackOilFluid::~BlackOilFluid()
Expand Down Expand Up @@ -97,23 +94,7 @@ void BlackOilFluid::createFluid()
std::vector< double > densities( m_surfaceDensities.begin(), m_surfaceDensities.end() );
std::vector< double > molarWeights( m_componentMolarWeight.begin(), m_componentMolarWeight.end() );

switch( m_fluidType )
{
case FluidType::LiveOil:
{
m_fluid = pvt::MultiphaseSystemBuilder::buildLiveOil( phases, tableFiles, densities, molarWeights );
break;
}
case FluidType::DeadOil:
{
m_fluid = pvt::MultiphaseSystemBuilder::buildDeadOil( phases, tableFiles, densities, molarWeights );
break;
}
default:
{
GEOSX_ERROR( "Unknown fluid type" );
}
}
m_fluid = pvt::MultiphaseSystemBuilder::buildLiveOil( phases, tableFiles, densities, molarWeights );
}

REGISTER_CATALOG_ENTRY( ConstitutiveBase, BlackOilFluid, string const &, Group * const )
Expand Down
12 changes: 0 additions & 12 deletions src/coreComponents/constitutive/fluid/BlackOilFluid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ class BlackOilFluid : public MultiFluidPVTPackageWrapper
{
public:

enum class FluidType : integer
{
DeadOil,
LiveOil
};

BlackOilFluid( string const & name, Group * const parent );

virtual ~BlackOilFluid() override;
Expand All @@ -55,7 +49,6 @@ class BlackOilFluid : public MultiFluidPVTPackageWrapper
{
static constexpr char const * surfaceDensitiesString() { return "surfaceDensities"; }
static constexpr char const * tableFilesString() { return "tableFiles"; }
static constexpr char const * fluidTypeString() { return "fluidType"; }
};

protected:
Expand All @@ -71,13 +64,8 @@ class BlackOilFluid : public MultiFluidPVTPackageWrapper
// Black-oil table filenames
path_array m_tableFiles;

// Type of black-oil fluid (live/dead)
FluidType m_fluidType;

};

ENUM_STRINGS( BlackOilFluid::FluidType, "DeadOil", "LiveOil" )

} /* namespace constitutive */

} /* namespace geosx */
Expand Down
Loading