Skip to content

Implement CO2Brine model on GPU #1325

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
merged 14 commits into from
Mar 19, 2021
Merged

Implement CO2Brine model on GPU #1325

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e70a4bd
implemented CO2Brine with new tables and without autodiff
francoishamon Feb 17, 2021
14c4bc2
Merge branch 'develop' into feature/hamon/co2GPU
francoishamon Feb 26, 2021
44ea6fb
implemented Sergey's suggestion
francoishamon Feb 26, 2021
9de00b7
remove outdated rst to make sure all CI tests pass
francoishamon Feb 27, 2021
092bcf6
Merge branch 'develop' into feature/hamon/co2GPU
francoishamon Mar 10, 2021
601518c
addressed Thomas' comments
francoishamon Mar 10, 2021
0c489b2
addressed Sergey's and Thomas' comments
francoishamon Mar 11, 2021
dd748f5
addressed Thomas' comments
francoishamon Mar 11, 2021
ef9869e
implemented Sergey's suggestion; addressed Thomas' comments
francoishamon Mar 12, 2021
6535857
with constructor in cpp
francoishamon Mar 12, 2021
7e054f0
addressed review comments
francoishamon Mar 13, 2021
5532731
Merge branch 'develop' into feature/hamon/co2GPU
francoishamon Mar 16, 2021
2a038ad
updated integratedTests submodule
francoishamon Mar 18, 2021
19a404c
update integratedTests submodule; changed testMultiFluid comment
francoishamon Mar 18, 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
148 changes: 102 additions & 46 deletions src/coreComponents/constitutive/fluid/MultiPhaseMultiComponentFluid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,33 @@ namespace constitutive

using namespace PVTProps;

MultiPhaseMultiComponentFluid::MultiPhaseMultiComponentFluid( string const & name, Group * const parent ):
namespace
{
template< typename P1DENS, typename P1VISC, typename P2DENS, typename P2VISC, typename FLASH > class
TwoPhaseCatalogNames {};

template<> class
TwoPhaseCatalogNames< PVTProps::BrineCO2Density,
PVTProps::BrineViscosity,
PVTProps::SpanWagnerCO2Density,
PVTProps::FenghourCO2Viscosity,
PVTProps::CO2Solubility >
{
public:
static string name() { return "CO2BrineFluid"; }
};
} // end namespace

// provide a definition for catalogName()
template< typename P1DENS, typename P1VISC, typename P2DENS, typename P2VISC, typename FLASH >
string MultiPhaseMultiComponentFluid< P1DENS, P1VISC, P2DENS, P2VISC, FLASH >::catalogName()
{
return TwoPhaseCatalogNames< P1DENS, P1VISC, P2DENS, P2VISC, FLASH >::name();
}

template< typename P1DENS, typename P1VISC, typename P2DENS, typename P2VISC, typename FLASH >
MultiPhaseMultiComponentFluid< P1DENS, P1VISC, P2DENS, P2VISC, FLASH >::
MultiPhaseMultiComponentFluid( string const & name, Group * const parent ):
MultiFluidBase( name, parent )
{
registerWrapper( viewKeyStruct::phasePVTParaFilesString(), &m_phasePVTParaFiles ).
Expand All @@ -47,51 +73,61 @@ MultiPhaseMultiComponentFluid::MultiPhaseMultiComponentFluid( string const & nam
setDescription( "Name of the file defining the parameters of the flash model" );
}

MultiPhaseMultiComponentFluid::~MultiPhaseMultiComponentFluid()
{}


template< typename P1DENS, typename P1VISC, typename P2DENS, typename P2VISC, typename FLASH >
std::unique_ptr< ConstitutiveBase >
MultiPhaseMultiComponentFluid::deliverClone( string const & name,
Group * const parent ) const
MultiPhaseMultiComponentFluid< P1DENS, P1VISC, P2DENS, P2VISC, FLASH >::
deliverClone( string const & name, Group * const parent ) const
{
std::unique_ptr< ConstitutiveBase > clone = MultiFluidBase::deliverClone( name, parent );

MultiPhaseMultiComponentFluid * const newConstitutiveRelation = dynamic_cast< MultiPhaseMultiComponentFluid * >(clone.get());
newConstitutiveRelation->m_phaseGasIndex = this->m_phaseGasIndex;
newConstitutiveRelation->m_phaseLiquidIndex = this->m_phaseLiquidIndex;
newConstitutiveRelation->m_p1Index = this->m_p1Index;
newConstitutiveRelation->m_p2Index = this->m_p2Index;

newConstitutiveRelation->createPVTModels();

return clone;
}

void MultiPhaseMultiComponentFluid::postProcessInput()
template< typename P1DENS, typename P1VISC, typename P2DENS, typename P2VISC, typename FLASH >
void MultiPhaseMultiComponentFluid< P1DENS, P1VISC, P2DENS, P2VISC, FLASH >::postProcessInput()
{
MultiFluidBase::postProcessInput();

localIndex const numPhases = numFluidPhases();
localIndex const numComps = numFluidComponents();
GEOSX_ERROR_IF( numPhases != 2, "The number of phases in this model should be equal to 2" );
GEOSX_ERROR_IF( numComps != 2, "The number of components in this model should be equal to 2" );
GEOSX_ERROR_IF( m_phasePVTParaFiles.size() != 2, "The number of phasePVTParaFiles is not the same as the number of phases!" );

char const * expectedGasPhaseNames[] = { "CO2", "co2", "gas", "Gas" };
m_phaseGasIndex = PVTFunctionHelpers::findName( m_phaseNames,
expectedGasPhaseNames );
GEOSX_ERROR_IF( m_phaseGasIndex < 0 || m_phaseGasIndex >= m_phaseNames.size(),
"Phase co2/gas is not found!" );
GEOSX_THROW_IF( numPhases != 2,
"The number of phases in this model should be equal to 2",
InputError );
GEOSX_THROW_IF( numComps != 2,
"The number of components in this model should be equal to 2",
InputError );
GEOSX_THROW_IF( m_phasePVTParaFiles.size() != 2,
"The number of phasePVTParaFiles is not the same as the number of phases!",
InputError );

// NOTE: for now, the names of the phases are still hardcoded here
// Later, we could read them from the XML file and we would then have a general class here

char const * expectedWaterPhaseNames[] = { "Water", "water", "Liquid", "liquid" };
m_phaseLiquidIndex = PVTFunctionHelpers::findName( m_phaseNames,
expectedWaterPhaseNames );
GEOSX_ERROR_IF( m_phaseLiquidIndex < 0 || m_phaseLiquidIndex >= m_phaseNames.size(),
"Phase water/liquid is not found!" );
m_p1Index = PVTFunctionHelpers::findName( m_phaseNames,
expectedWaterPhaseNames );
GEOSX_THROW_IF( m_p1Index < 0 || m_p1Index >= m_phaseNames.size(),
"Phase water/liquid is not found!",
InputError );

char const * expectedGasPhaseNames[] = { "CO2", "co2", "gas", "Gas" };
m_p2Index = PVTFunctionHelpers::findName( m_phaseNames,
expectedGasPhaseNames );
GEOSX_THROW_IF( m_p2Index < 0 || m_p2Index >= m_phaseNames.size(),
"Phase co2/gas is not found!",
InputError );

createPVTModels();
}

void MultiPhaseMultiComponentFluid::createPVTModels()
template< typename P1DENS, typename P1VISC, typename P2DENS, typename P2VISC, typename FLASH >
void MultiPhaseMultiComponentFluid< P1DENS, P1VISC, P2DENS, P2VISC, FLASH >::createPVTModels()
{
// 1) Create the viscosity and density models
for( string const & filename : m_phasePVTParaFiles )
Expand All @@ -100,49 +136,60 @@ void MultiPhaseMultiComponentFluid::createPVTModels()
constexpr std::streamsize buf_size = 256;
char buf[buf_size];

// NOTE: for now, the names of the models are still hardcoded here
// Later, we could read them from the XML file and we would then have a general class here

while( is.getline( buf, buf_size ) )
{
string const str( buf );
string_array const strs = stringutilities::tokenize( str, " " );

if( strs[0] == "DensityFun" )
{
if( strs[1] == "SpanWagnerCO2Density" )
if( strs[1] == "BrineCO2Density" )
{
m_co2Density = std::make_unique< SpanWagnerCO2Density >( strs, m_componentNames, m_componentMolarWeight );
m_co2DensityWrapper.emplace_back( m_co2Density->createKernelWrapper() );
m_p1Density = std::make_unique< P1DENS >( strs, m_componentNames, m_componentMolarWeight );
m_p1DensityWrapper.emplace_back( m_p1Density->createKernelWrapper() );
}
else if( strs[1] == "BrineCO2Density" )
else if( strs[1] == "SpanWagnerCO2Density" )
{
m_brineDensity = std::make_unique< BrineCO2Density >( strs, m_componentNames, m_componentMolarWeight );
m_brineDensityWrapper.emplace_back( m_brineDensity->createKernelWrapper() );
m_p2Density = std::make_unique< P2DENS >( strs, m_componentNames, m_componentMolarWeight );
m_p2DensityWrapper.emplace_back( m_p2Density->createKernelWrapper() );
}
}
else if( strs[0] == "ViscosityFun" )
{
if( strs[1] == "FenghourCO2Viscosity" )
if( strs[1] == "BrineViscosity" )
{
m_co2Viscosity = std::make_unique< FenghourCO2Viscosity >( strs, m_componentNames, m_componentMolarWeight );
m_co2ViscosityWrapper.emplace_back( m_co2Viscosity->createKernelWrapper() );
m_p1Viscosity = std::make_unique< P1VISC >( strs, m_componentNames, m_componentMolarWeight );
m_p1ViscosityWrapper.emplace_back( m_p1Viscosity->createKernelWrapper() );
}
else if( strs[1] == "BrineViscosity" )
else if( strs[1] == "FenghourCO2Viscosity" )
{
m_brineViscosity = std::make_unique< BrineViscosity >( strs, m_componentNames, m_componentMolarWeight );
m_brineViscosityWrapper.emplace_back( m_brineViscosity->createKernelWrapper() );
m_p2Viscosity = std::make_unique< P2VISC >( strs, m_componentNames, m_componentMolarWeight );
m_p2ViscosityWrapper.emplace_back( m_p2Viscosity->createKernelWrapper() );
}
}
else
{
GEOSX_ERROR( "Error: Invalid PVT function: " << strs[0] << "." );
GEOSX_THROW( "Error: Invalid PVT function: " << strs[0] << ".", InputError );
}
}
is.close();
}

GEOSX_ERROR_IF( m_co2Density == nullptr, "SpanWagnerCO2Density model not found" );
GEOSX_ERROR_IF( m_brineDensity == nullptr, "BrineCO2Density model not found" );
GEOSX_ERROR_IF( m_co2Viscosity == nullptr, "FenghourCO2Viscosity model not found" );
GEOSX_ERROR_IF( m_brineViscosity == nullptr, "BrineViscosity model not found" );
GEOSX_THROW_IF( m_p1Density == nullptr,
"BrineCO2Density model not found",
InputError );
GEOSX_THROW_IF( m_p2Density == nullptr,
"SpanWagnerCO2Density model not found",
InputError );
GEOSX_THROW_IF( m_p1Viscosity == nullptr,
"BrineViscosity model not found",
InputError );
GEOSX_THROW_IF( m_p2Viscosity == nullptr,
"FenghourCO2Viscosity model not found",
InputError );

// 2) Create the flash model
{
Expand All @@ -156,21 +203,30 @@ void MultiPhaseMultiComponentFluid::createPVTModels()
string_array const strs = stringutilities::tokenize( str, " " );
if( strs[0] == "FlashModel" && strs[1] == "CO2Solubility" )
{
m_co2Solubility = std::make_unique< CO2Solubility >( strs, m_phaseNames, m_componentNames, m_componentMolarWeight );
m_co2SolubilityWrapper.emplace_back( m_co2Solubility->createKernelWrapper() );
m_flash = std::make_unique< FLASH >( strs, m_phaseNames, m_componentNames, m_componentMolarWeight );
m_flashWrapper.emplace_back( m_flash->createKernelWrapper() );
}
else
{
GEOSX_ERROR( "Error: Invalid flash model: " << strs[0] << ", " << strs[1] << "." );
GEOSX_THROW( "Error: Invalid flash model: " << strs[0] << ", " << strs[1] << ".", InputError );
}
}
is.close();
}

GEOSX_ERROR_IF( m_co2Solubility == nullptr, "CO2Solubility model not found" );
GEOSX_THROW_IF( m_flash == nullptr,
"CO2Solubility model not found",
InputError );
}

REGISTER_CATALOG_ENTRY( ConstitutiveBase, MultiPhaseMultiComponentFluid, string const &, Group * const )
// explicit instantiation of the model template; unfortunately we can't use CO2BrineFluid alias for this
template class MultiPhaseMultiComponentFluid< PVTProps::BrineCO2Density,
PVTProps::BrineViscosity,
PVTProps::SpanWagnerCO2Density,
PVTProps::FenghourCO2Viscosity,
PVTProps::CO2Solubility >;

REGISTER_CATALOG_ENTRY( ConstitutiveBase, CO2BrineFluid, string const &, Group * const )

} //namespace constitutive

Expand Down
Loading