Skip to content

Implemented new kernel interface for compositional properties #1698

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 4 commits into from
Dec 21, 2021
Merged

Implemented new kernel interface for compositional properties #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89f5c8d
implemented new kernel interface for properties
francoishamon Nov 30, 2021
db9d264
fixed compilation error
francoishamon Nov 30, 2021
175de09
Merge branch 'develop' into feature/hamon/propertiesKernel
francoishamon Dec 9, 2021
2ae37ee
addressed Sergey's comments
francoishamon Dec 14, 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
2 changes: 0 additions & 2 deletions src/coreComponents/physicsSolvers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ set( physicsSolvers_sources
PhysicsSolverManager.cpp
SolverBase.cpp
fluidFlow/CompositionalMultiphaseBase.cpp
fluidFlow/CompositionalMultiphaseBaseKernels.cpp
fluidFlow/CompositionalMultiphaseFVM.cpp
fluidFlow/CompositionalMultiphaseFVMKernels.cpp
fluidFlow/CompositionalMultiphaseHybridFVM.cpp
Expand All @@ -93,7 +92,6 @@ set( physicsSolvers_sources
fluidFlow/proppantTransport/ProppantTransport.cpp
fluidFlow/proppantTransport/ProppantTransportKernels.cpp
fluidFlow/SinglePhaseBase.cpp
fluidFlow/SinglePhaseBaseKernels.cpp
fluidFlow/SinglePhaseFVM.cpp
fluidFlow/SinglePhaseHybridFVM.cpp
fluidFlow/SinglePhaseProppantBase.cpp
Expand Down
93 changes: 18 additions & 75 deletions src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,79 +353,25 @@ void CompositionalMultiphaseBase::updateComponentFraction( ObjectManagerBase & d
{
GEOSX_MARK_FUNCTION;

// outputs
ComponentFractionKernelFactory::
createAndLaunch< parallelDevicePolicy<> >( m_numComponents,
dataGroup );

arrayView2d< real64, compflow::USD_COMP > const & compFrac = dataGroup.getExtrinsicData< extrinsicMeshData::flow::globalCompFraction >();

arrayView3d< real64, compflow::USD_COMP_DC > const & dCompFrac_dCompDens =
dataGroup.getExtrinsicData< extrinsicMeshData::flow::dGlobalCompFraction_dGlobalCompDensity >();

// inputs
arrayView2d< real64 const, compflow::USD_COMP > const compDens =
dataGroup.getExtrinsicData< extrinsicMeshData::flow::globalCompDensity >();

arrayView2d< real64 const, compflow::USD_COMP > const dCompDens =
dataGroup.getExtrinsicData< extrinsicMeshData::flow::deltaGlobalCompDensity >();

KernelLaunchSelector1< ComponentFractionKernel >( m_numComponents,
dataGroup.size(),
compDens,
dCompDens,
compFrac,
dCompFrac_dCompDens );
}

void CompositionalMultiphaseBase::updatePhaseVolumeFraction( ObjectManagerBase & dataGroup,
localIndex const targetIndex ) const
{
GEOSX_MARK_FUNCTION;

// outputs

arrayView2d< real64, compflow::USD_PHASE > const phaseVolFrac =
dataGroup.getExtrinsicData< extrinsicMeshData::flow::phaseVolumeFraction >();

arrayView2d< real64, compflow::USD_PHASE > const dPhaseVolFrac_dPres =
dataGroup.getExtrinsicData< extrinsicMeshData::flow::dPhaseVolumeFraction_dPressure >();

arrayView3d< real64, compflow::USD_PHASE_DC > const dPhaseVolFrac_dComp =
dataGroup.getExtrinsicData< extrinsicMeshData::flow::dPhaseVolumeFraction_dGlobalCompDensity >();

// inputs

arrayView3d< real64 const, compflow::USD_COMP_DC > const dCompFrac_dCompDens =
dataGroup.getExtrinsicData< extrinsicMeshData::flow::dGlobalCompFraction_dGlobalCompDensity >();

arrayView2d< real64 const, compflow::USD_COMP > const compDens =
dataGroup.getExtrinsicData< extrinsicMeshData::flow::globalCompDensity >();

arrayView2d< real64 const, compflow::USD_COMP > const dCompDens =
dataGroup.getExtrinsicData< extrinsicMeshData::flow::deltaGlobalCompDensity >();

MultiFluidBase const & fluid = getConstitutiveModel< MultiFluidBase >( dataGroup, m_fluidModelNames[targetIndex] );

arrayView3d< real64 const, multifluid::USD_PHASE > const & phaseFrac = fluid.phaseFraction();
arrayView3d< real64 const, multifluid::USD_PHASE > const & dPhaseFrac_dPres = fluid.dPhaseFraction_dPressure();
arrayView4d< real64 const, multifluid::USD_PHASE_DC > const & dPhaseFrac_dComp = fluid.dPhaseFraction_dGlobalCompFraction();

arrayView3d< real64 const, multifluid::USD_PHASE > const & phaseDens = fluid.phaseDensity();
arrayView3d< real64 const, multifluid::USD_PHASE > const & dPhaseDens_dPres = fluid.dPhaseDensity_dPressure();
arrayView4d< real64 const, multifluid::USD_PHASE_DC > const & dPhaseDens_dComp = fluid.dPhaseDensity_dGlobalCompFraction();

KernelLaunchSelector2< PhaseVolumeFractionKernel >( m_numComponents, m_numPhases,
dataGroup.size(),
compDens,
dCompDens,
dCompFrac_dCompDens,
phaseDens,
dPhaseDens_dPres,
dPhaseDens_dComp,
phaseFrac,
dPhaseFrac_dPres,
dPhaseFrac_dComp,
phaseVolFrac,
dPhaseVolFrac_dPres,
dPhaseVolFrac_dComp );
PhaseVolumeFractionKernelFactory::
createAndLaunch< parallelDevicePolicy<> >( m_numComponents,
m_numPhases,
dataGroup,
fluid );

}

void CompositionalMultiphaseBase::updateFluidModel( ObjectManagerBase & dataGroup, localIndex const targetIndex ) const
Expand Down Expand Up @@ -998,19 +944,16 @@ void CompositionalMultiphaseBase::assembleAccumulationAndVolumeBalanceTerms( Dom
MultiFluidBase const & fluid = getConstitutiveModel< MultiFluidBase >( subRegion, fluidModelNames()[targetIndex] );
CoupledSolidBase const & solid = getConstitutiveModel< CoupledSolidBase >( subRegion, m_solidModelNames[targetIndex] );

bool const isIsothermal = true;
ElementBasedAssemblyKernelFactory::
createAndLaunch< parallelDevicePolicy<> >
( isIsothermal,
m_numComponents,
m_numPhases,
dofManager.rankOffset(),
dofKey,
subRegion,
fluid,
solid,
localMatrix,
localRhs );
createAndLaunch< parallelDevicePolicy<> >( m_numComponents,
m_numPhases,
dofManager.rankOffset(),
dofKey,
subRegion,
fluid,
solid,
localMatrix,
localRhs );

} );
}
Expand Down
Loading