Skip to content

Activated thermal option in CO2-brine fluid model #1755

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 11 commits into from
Feb 25, 2022
Merged

Activated thermal option in CO2-brine fluid model #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
acf0be6
modified the CO2-brine model to support thermal simulation
francoishamon Feb 1, 2022
823969c
Merge branch 'develop' into feature/hamon/CO2thermal
francoishamon Feb 1, 2022
6eff128
fixed bug in thermal array sizes
francoishamon Feb 1, 2022
81d60b4
apply Sergey's suggestions
francoishamon Feb 2, 2022
ccb0a2e
removed forgotten thermal flag
francoishamon Feb 2, 2022
e76410f
Merge branch 'develop' into feature/hamon/CO2thermal
francoishamon Feb 11, 2022
b6b5943
Merge branch 'develop' into feature/hamon/CO2thermal
francoishamon Feb 23, 2022
0f587e6
removed deleted files
francoishamon Feb 23, 2022
d8f3bfe
Merge branch 'develop' into feature/hamon/CO2thermal
francoishamon Feb 25, 2022
42b5edf
fixed bug
francoishamon Feb 25, 2022
3e040aa
updated integratedTests submodule
francoishamon Feb 25, 2022
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
2 changes: 1 addition & 1 deletion integratedTests
Open in desktop
Submodule integratedTests updated from 398a45 to 03fce3
8 changes: 5 additions & 3 deletions src/coreComponents/constitutive/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ set( constitutive_headers
fluid/BlackOilFluidBase.hpp
fluid/BlackOilFluid.hpp
fluid/CompressibleSinglePhaseFluid.hpp
fluid/CO2BrineFluid.hpp
fluid/DeadOilFluid.hpp
fluid/MultiFluidBase.hpp
fluid/MultiFluidUtils.hpp
fluid/MultiFluidExtrinsicData.hpp
fluid/MultiPhaseMultiComponentFluid.hpp
fluid/PhaseModel.hpp
fluid/PVTDriver.hpp
fluid/PVTOData.hpp
fluid/PVTFunctions/PhillipsBrineDensity.hpp
Expand All @@ -38,7 +39,8 @@ set( constitutive_headers
fluid/PVTFunctions/CO2Solubility.hpp
fluid/PVTFunctions/FenghourCO2Viscosity.hpp
fluid/PVTFunctions/FlashModelBase.hpp
fluid/PVTFunctions/PVTFunctionBase.hpp
fluid/PVTFunctions/PVTFunctionBase.hpp
fluid/PVTFunctions/NoOpPVTFunction.hpp
fluid/PVTFunctions/PVTFunctionHelpers.hpp
fluid/PVTFunctions/SpanWagnerCO2Density.hpp
fluid/PVTFunctions/BrineEnthalpy.hpp
Expand Down Expand Up @@ -131,11 +133,11 @@ set( constitutive_sources
contact/CoulombContact.cpp
contact/FrictionlessContact.cpp
fluid/CompressibleSinglePhaseFluid.cpp
fluid/CO2BrineFluid.cpp
fluid/BlackOilFluidBase.cpp
fluid/BlackOilFluid.cpp
fluid/DeadOilFluid.cpp
fluid/MultiFluidBase.cpp
fluid/MultiPhaseMultiComponentFluid.cpp
fluid/PVTDriver.cpp
fluid/PVTOData.cpp
fluid/PVTFunctions/PhillipsBrineDensity.cpp
Expand Down
6 changes: 6 additions & 0 deletions src/coreComponents/constitutive/fluid/BlackOilFluid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,8 @@ BlackOilFluid::KernelWrapper::
PhaseProp::ViewType phaseDensity,
PhaseProp::ViewType phaseMassDensity,
PhaseProp::ViewType phaseViscosity,
PhaseProp::ViewType phaseEnthalpy,
PhaseProp::ViewType phaseInternalEnergy,
PhaseComp::ViewType phaseCompFraction,
FluidProp::ViewType totalDensity )
: BlackOilFluidBase::KernelWrapper( std::move( phaseTypes ),
Expand All @@ -511,6 +513,8 @@ BlackOilFluid::KernelWrapper::
std::move( phaseDensity ),
std::move( phaseMassDensity ),
std::move( phaseViscosity ),
std::move( phaseEnthalpy ),
std::move( phaseInternalEnergy ),
std::move( phaseCompFraction ),
std::move( totalDensity ) ),
m_PVTOView( PVTO.createKernelWrapper() )
Expand All @@ -533,6 +537,8 @@ BlackOilFluid::createKernelWrapper()
m_phaseDensity.toView(),
m_phaseMassDensity.toView(),
m_phaseViscosity.toView(),
m_phaseEnthalpy.toView(),
m_phaseInternalEnergy.toView(),
m_phaseCompFraction.toView(),
m_totalDensity.toView() );
}
Expand Down
20 changes: 17 additions & 3 deletions src/coreComponents/constitutive/fluid/BlackOilFluid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ class BlackOilFluid : public BlackOilFluidBase
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseDensity,
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseMassDensity,
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseViscosity,
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseEnthalpy,
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseInternalEnergy,
arraySlice2d< real64, multifluid::USD_PHASE_COMP-2 > const & phaseCompFraction,
real64 & totalDensity ) const override;

Expand All @@ -80,6 +82,8 @@ class BlackOilFluid : public BlackOilFluidBase
PhaseProp::SliceType const phaseDensity,
PhaseProp::SliceType const phaseMassDensity,
PhaseProp::SliceType const phaseViscosity,
PhaseProp::SliceType const phaseEnthalpy,
PhaseProp::SliceType const phaseInternalEnergy,
PhaseComp::SliceType const phaseCompFraction,
FluidProp::SliceType const totalDensity ) const override;

Expand Down Expand Up @@ -127,6 +131,8 @@ class BlackOilFluid : public BlackOilFluidBase
PhaseProp::ViewType phaseDensity,
PhaseProp::ViewType phaseMassDensity,
PhaseProp::ViewType phaseViscosity,
PhaseProp::ViewType phaseEnthalpy,
PhaseProp::ViewType phaseInternalEnergy,
PhaseComp::ViewType phaseCompFraction,
FluidProp::ViewType totalDensity );

Expand Down Expand Up @@ -368,10 +374,12 @@ BlackOilFluid::KernelWrapper::
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseDensity,
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseMassDensity,
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseViscosity,
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseEnthalpy,
arraySlice1d< real64, multifluid::USD_PHASE - 2 > const & phaseInternalEnergy,
arraySlice2d< real64, multifluid::USD_PHASE_COMP - 2 > const & phaseCompFraction,
real64 & totalDensity ) const
{
GEOSX_UNUSED_VAR( temperature );
GEOSX_UNUSED_VAR( temperature, phaseEnthalpy, phaseInternalEnergy );

real64 compMoleFrac[NC_BO]{};
real64 phaseMolecularWeight[NP_BO]{};
Expand Down Expand Up @@ -435,10 +443,12 @@ BlackOilFluid::KernelWrapper::
PhaseProp::SliceType const phaseDensity,
PhaseProp::SliceType const phaseMassDensity,
PhaseProp::SliceType const phaseViscosity,
PhaseProp::SliceType const phaseEnthalpy,
PhaseProp::SliceType const phaseInternalEnergy,
PhaseComp::SliceType const phaseCompFraction,
FluidProp::SliceType const totalDensity ) const
{
GEOSX_UNUSED_VAR( temperature );
GEOSX_UNUSED_VAR( temperature, phaseEnthalpy, phaseInternalEnergy );

real64 compMoleFrac[NC_BO]{};
real64 dCompMoleFrac_dCompMassFrac[NC_BO][NC_BO]{};
Expand Down Expand Up @@ -492,7 +502,9 @@ BlackOilFluid::KernelWrapper::
phaseFraction,
phaseCompFraction,
phaseDensity.derivs,
phaseViscosity.derivs );
phaseViscosity.derivs,
phaseEnthalpy.derivs,
phaseInternalEnergy.derivs );
}

// 5. Compute total fluid mass/molar density and derivatives
Expand Down Expand Up @@ -1101,6 +1113,8 @@ BlackOilFluid::KernelWrapper::
m_phaseDensity( k, q ),
m_phaseMassDensity( k, q ),
m_phaseViscosity( k, q ),
m_phaseEnthalpy( k, q ),
m_phaseInternalEnergy( k, q ),
m_phaseCompFraction( k, q ),
m_totalDensity( k, q ) );
}
Expand Down
4 changes: 4 additions & 0 deletions src/coreComponents/constitutive/fluid/BlackOilFluidBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,8 @@ BlackOilFluidBase::KernelWrapper::
PhaseProp::ViewType phaseDensity,
PhaseProp::ViewType phaseMassDensity,
PhaseProp::ViewType phaseViscosity,
PhaseProp::ViewType phaseEnthalpy,
PhaseProp::ViewType phaseInternalEnergy,
PhaseComp::ViewType phaseCompFraction,
FluidProp::ViewType totalDensity )
: MultiFluidBase::KernelWrapper( std::move( componentMolarWeight ),
Expand All @@ -307,6 +309,8 @@ BlackOilFluidBase::KernelWrapper::
std::move( phaseDensity ),
std::move( phaseMassDensity ),
std::move( phaseViscosity ),
std::move( phaseEnthalpy ),
std::move( phaseInternalEnergy ),
std::move( phaseCompFraction ),
std::move( totalDensity ) ),
m_phaseTypes( std::move( phaseTypes ) ),
Expand Down
2 changes: 2 additions & 0 deletions src/coreComponents/constitutive/fluid/BlackOilFluidBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ class BlackOilFluidBase : public MultiFluidBase
PhaseProp::ViewType phaseDensity,
PhaseProp::ViewType phaseMassDensity,
PhaseProp::ViewType phaseViscosity,
PhaseProp::ViewType phaseEnthalpy,
PhaseProp::ViewType phaseInternalEnergy,
PhaseComp::ViewType phaseCompFraction,
FluidProp::ViewType totalDensity );

Expand Down
Loading