diff --git a/integratedTests b/integratedTests
index d79950933dc..4bbb2f2ffd0 160000
--- a/integratedTests
+++ b/integratedTests
@@ -1 +1 @@
-Subproject commit d79950933dc9fc6497b126ed0eacfcf32ed4d57a
+Subproject commit 4bbb2f2ffd0a9fd8531fad6706f9e0afa1124a07
diff --git a/src/coreComponents/constitutive/fluid/MultiFluidBase.cpp b/src/coreComponents/constitutive/fluid/MultiFluidBase.cpp
index 3df8114a3de..7f34d7a61ad 100644
--- a/src/coreComponents/constitutive/fluid/MultiFluidBase.cpp
+++ b/src/coreComponents/constitutive/fluid/MultiFluidBase.cpp
@@ -54,6 +54,7 @@ MultiFluidBase::MultiFluidBase( string const & name, Group * const parent )
registerExtrinsicData( extrinsicMeshData::multifluid::dPhaseFraction{}, &m_phaseFraction.derivs );
registerExtrinsicData( extrinsicMeshData::multifluid::phaseDensity{}, &m_phaseDensity.value );
+ registerExtrinsicData( extrinsicMeshData::multifluid::phaseDensityOld{}, &m_phaseDensityOld );
registerExtrinsicData( extrinsicMeshData::multifluid::dPhaseDensity{}, &m_phaseDensity.derivs );
registerExtrinsicData( extrinsicMeshData::multifluid::phaseMassDensity{}, &m_phaseMassDensity.value );
@@ -63,15 +64,19 @@ MultiFluidBase::MultiFluidBase( string const & name, Group * const parent )
registerExtrinsicData( extrinsicMeshData::multifluid::dPhaseViscosity{}, &m_phaseViscosity.derivs );
registerExtrinsicData( extrinsicMeshData::multifluid::phaseEnthalpy{}, &m_phaseEnthalpy.value );
+ registerExtrinsicData( extrinsicMeshData::multifluid::phaseEnthalpyOld{}, &m_phaseEnthalpyOld );
registerExtrinsicData( extrinsicMeshData::multifluid::dPhaseEnthalpy{}, &m_phaseEnthalpy.derivs );
registerExtrinsicData( extrinsicMeshData::multifluid::phaseInternalEnergy{}, &m_phaseInternalEnergy.value );
+ registerExtrinsicData( extrinsicMeshData::multifluid::phaseInternalEnergyOld{}, &m_phaseInternalEnergyOld );
registerExtrinsicData( extrinsicMeshData::multifluid::dPhaseInternalEnergy{}, &m_phaseInternalEnergy.derivs );
registerExtrinsicData( extrinsicMeshData::multifluid::phaseCompFraction{}, &m_phaseCompFraction.value );
+ registerExtrinsicData( extrinsicMeshData::multifluid::phaseCompFractionOld{}, &m_phaseCompFractionOld );
registerExtrinsicData( extrinsicMeshData::multifluid::dPhaseCompFraction{}, &m_phaseCompFraction.derivs );
registerExtrinsicData( extrinsicMeshData::multifluid::totalDensity{}, &m_totalDensity.value );
+ registerExtrinsicData( extrinsicMeshData::multifluid::totalDensityOld{}, &m_totalDensityOld );
registerExtrinsicData( extrinsicMeshData::multifluid::dTotalDensity{}, &m_totalDensity.derivs );
registerExtrinsicData( extrinsicMeshData::multifluid::initialTotalMassDensity{}, &m_initialTotalMassDensity );
@@ -88,6 +93,7 @@ void MultiFluidBase::resizeFields( localIndex const size, localIndex const numPt
m_phaseFraction.derivs.resize( size, numPts, numPhase, numDof );
m_phaseDensity.value.resize( size, numPts, numPhase );
+ m_phaseDensityOld.resize( size, numPts, numPhase );
m_phaseDensity.derivs.resize( size, numPts, numPhase, numDof );
m_phaseMassDensity.value.resize( size, numPts, numPhase );
@@ -97,15 +103,19 @@ void MultiFluidBase::resizeFields( localIndex const size, localIndex const numPt
m_phaseViscosity.derivs.resize( size, numPts, numPhase, numDof );
m_phaseEnthalpy.value.resize( size, numPts, numPhase );
+ m_phaseEnthalpyOld.resize( size, numPts, numPhase );
m_phaseEnthalpy.derivs.resize( size, numPts, numPhase, numDof );
m_phaseInternalEnergy.value.resize( size, numPts, numPhase );
+ m_phaseInternalEnergyOld.resize( size, numPts, numPhase );
m_phaseInternalEnergy.derivs.resize( size, numPts, numPhase, numDof );
m_phaseCompFraction.value.resize( size, numPts, numPhase, numComp );
+ m_phaseCompFractionOld.resize( size, numPts, numPhase, numComp );
m_phaseCompFraction.derivs.resize( size, numPts, numPhase, numComp, numDof );
m_totalDensity.value.resize( size, numPts );
+ m_totalDensityOld.resize( size, numPts );
m_totalDensity.derivs.resize( size, numPts, numDof );
m_initialTotalMassDensity.resize( size, numPts );
@@ -193,8 +203,52 @@ void MultiFluidBase::initializeState( arrayView2d< real64 const, compflow::USD_P
}
}
} );
+
+ // initialize the "old" variables
+ saveConvergedState();
+}
+
+void MultiFluidBase::saveConvergedState() const
+{
+ localIndex const numElem = m_initialTotalMassDensity.size( 0 );
+ localIndex const numGauss = m_initialTotalMassDensity.size( 1 );
+ integer const numPhase = m_phaseMassDensity.value.size( 2 );
+ integer const numComp = m_phaseCompFraction.value.size( 3 );
+
+ FluidProp::ViewTypeConst const totalDensity = m_totalDensity.toViewConst();
+ PhaseProp::ViewTypeConst const phaseDensity = m_phaseDensity.toViewConst();
+ PhaseProp::ViewTypeConst const phaseEnthalpy = m_phaseEnthalpy.toViewConst();
+ PhaseProp::ViewTypeConst const phaseInternalEnergy = m_phaseInternalEnergy.toViewConst();
+ PhaseComp::ViewTypeConst const phaseCompFraction = m_phaseCompFraction.toViewConst();
+
+ arrayView2d< real64, multifluid::USD_FLUID > const totalDensityOld = m_totalDensityOld.toView();
+ arrayView3d< real64, multifluid::USD_PHASE > const phaseDensityOld = m_phaseDensityOld.toView();
+ arrayView3d< real64, multifluid::USD_PHASE > const phaseEnthalpyOld = m_phaseEnthalpyOld.toView();
+ arrayView3d< real64, multifluid::USD_PHASE > const phaseInternalEnergyOld = m_phaseInternalEnergyOld.toView();
+ arrayView4d< real64, multifluid::USD_PHASE_COMP > const phaseCompFractionOld = m_phaseCompFractionOld.toView();
+
+ forAll< parallelDevicePolicy<> >( numElem, [=] GEOSX_HOST_DEVICE ( localIndex const k )
+ {
+ for( localIndex q = 0; q < numGauss; ++q )
+ {
+ totalDensityOld[k][q] = totalDensity.value[k][q];
+ for( integer ip = 0; ip < numPhase; ++ip )
+ {
+ phaseDensityOld[k][q][ip] = phaseDensity.value[k][q][ip];
+ phaseEnthalpyOld[k][q][ip] = phaseEnthalpy.value[k][q][ip];
+ phaseInternalEnergyOld[k][q][ip] = phaseInternalEnergy.value[k][q][ip];
+ for( integer ic = 0; ic < numComp; ++ic )
+ {
+ phaseCompFractionOld[k][q][ip][ic] = phaseCompFraction.value[k][q][ip][ic];
+ }
+ }
+ }
+ } );
+
+
}
+
} // namespace constitutive
} // namespace geosx
diff --git a/src/coreComponents/constitutive/fluid/MultiFluidBase.hpp b/src/coreComponents/constitutive/fluid/MultiFluidBase.hpp
index 3b1ed7b265a..73ca3d8b3d8 100644
--- a/src/coreComponents/constitutive/fluid/MultiFluidBase.hpp
+++ b/src/coreComponents/constitutive/fluid/MultiFluidBase.hpp
@@ -121,6 +121,9 @@ class MultiFluidBase : public ConstitutiveBase
arrayView3d< real64 const, multifluid::USD_PHASE > phaseDensity() const
{ return m_phaseDensity.value; }
+ arrayView3d< real64 const, multifluid::USD_PHASE > phaseDensityOld() const
+ { return m_phaseDensityOld; }
+
arrayView4d< real64 const, multifluid::USD_PHASE_DC > dPhaseDensity() const
{ return m_phaseDensity.derivs; }
@@ -139,12 +142,18 @@ class MultiFluidBase : public ConstitutiveBase
arrayView4d< real64 const, multifluid::USD_PHASE_COMP > phaseCompFraction() const
{ return m_phaseCompFraction.value; }
+ arrayView4d< real64 const, multifluid::USD_PHASE_COMP > phaseCompFractionOld() const
+ { return m_phaseCompFractionOld; }
+
arrayView5d< real64 const, multifluid::USD_PHASE_COMP_DC > dPhaseCompFraction() const
{ return m_phaseCompFraction.derivs; }
arrayView2d< real64 const, multifluid::USD_FLUID > totalDensity() const
{ return m_totalDensity.value; }
+ arrayView2d< real64 const, multifluid::USD_FLUID > totalDensityOld() const
+ { return m_totalDensityOld; }
+
arrayView3d< real64 const, multifluid::USD_FLUID_DC > dTotalDensity() const
{ return m_totalDensity.derivs; }
@@ -154,12 +163,18 @@ class MultiFluidBase : public ConstitutiveBase
arrayView3d< real64 const, multifluid::USD_PHASE > phaseEnthalpy() const
{ return m_phaseEnthalpy.value; }
+ arrayView3d< real64 const, multifluid::USD_PHASE > phaseEnthalpyOld() const
+ { return m_phaseEnthalpyOld; }
+
arrayView4d< real64 const, multifluid::USD_PHASE_DC > dPhaseEnthalpy() const
{ return m_phaseEnthalpy.derivs; }
arrayView3d< real64 const, multifluid::USD_PHASE > phaseInternalEnergy() const
{ return m_phaseInternalEnergy.value; }
+ arrayView3d< real64 const, multifluid::USD_PHASE > phaseInternalEnergyOld() const
+ { return m_phaseInternalEnergyOld; }
+
arrayView4d< real64 const, multifluid::USD_PHASE_DC > dPhaseInternalEnergy() const
{ return m_phaseInternalEnergy.derivs; }
@@ -169,6 +184,11 @@ class MultiFluidBase : public ConstitutiveBase
*/
virtual void initializeState( arrayView2d< real64 const, compflow::USD_PHASE > const & phaseVolFraction ) const;
+ /**
+ * @brief Save the phase densities, component fractions, enthalpies and internal energies (for accumulation)
+ */
+ virtual void saveConvergedState() const override;
+
struct viewKeyStruct : ConstitutiveBase::viewKeyStruct
{
static constexpr char const * componentNamesString() { return "componentNames"; }
@@ -537,6 +557,14 @@ class MultiFluidBase : public ConstitutiveBase
PhaseComp m_phaseCompFraction;
FluidProp m_totalDensity;
+ // backup data
+
+ array3d< real64, multifluid::LAYOUT_PHASE > m_phaseDensityOld;
+ array3d< real64, multifluid::LAYOUT_PHASE > m_phaseEnthalpyOld;
+ array3d< real64, multifluid::LAYOUT_PHASE > m_phaseInternalEnergyOld;
+ array4d< real64, multifluid::LAYOUT_PHASE_COMP > m_phaseCompFractionOld;
+ array2d< real64, multifluid::LAYOUT_FLUID > m_totalDensityOld;
+
// initial data (used to compute the body force in the poromechanics solver)
array2d< real64, multifluid::LAYOUT_FLUID > m_initialTotalMassDensity;
diff --git a/src/coreComponents/constitutive/fluid/MultiFluidExtrinsicData.hpp b/src/coreComponents/constitutive/fluid/MultiFluidExtrinsicData.hpp
index a8540501b5a..3ab287e1ec1 100644
--- a/src/coreComponents/constitutive/fluid/MultiFluidExtrinsicData.hpp
+++ b/src/coreComponents/constitutive/fluid/MultiFluidExtrinsicData.hpp
@@ -62,6 +62,14 @@ EXTRINSIC_MESH_DATA_TRAIT( phaseDensity,
WRITE_AND_READ,
"Phase density" );
+EXTRINSIC_MESH_DATA_TRAIT( phaseDensityOld,
+ "phaseDensityOld",
+ array3dLayoutPhase,
+ 0,
+ NOPLOT,
+ WRITE_AND_READ,
+ "Phase density at the previous converged time step" );
+
EXTRINSIC_MESH_DATA_TRAIT( dPhaseDensity,
"dPhaseDensity",
array4dLayoutPhase_dC,
@@ -110,6 +118,14 @@ EXTRINSIC_MESH_DATA_TRAIT( phaseEnthalpy,
NO_WRITE,
"Phase enthalpy" );
+EXTRINSIC_MESH_DATA_TRAIT( phaseEnthalpyOld,
+ "phaseEnthalpyOld",
+ array3dLayoutPhase,
+ 0,
+ NOPLOT,
+ WRITE_AND_READ,
+ "Phase enthalpy at the previous converged time step" );
+
EXTRINSIC_MESH_DATA_TRAIT( dPhaseEnthalpy,
"dPhaseEnthalpy",
array4dLayoutPhase_dC,
@@ -126,6 +142,14 @@ EXTRINSIC_MESH_DATA_TRAIT( phaseInternalEnergy,
NO_WRITE,
"Phase internal energy" );
+EXTRINSIC_MESH_DATA_TRAIT( phaseInternalEnergyOld,
+ "phaseInternalEnergyOld",
+ array3dLayoutPhase,
+ 0,
+ NOPLOT,
+ WRITE_AND_READ,
+ "Phase internal energy at the previous converged time step" );
+
EXTRINSIC_MESH_DATA_TRAIT( dPhaseInternalEnergy,
"dPhaseInternalEnergy",
array4dLayoutPhase_dC,
@@ -142,6 +166,14 @@ EXTRINSIC_MESH_DATA_TRAIT( phaseCompFraction,
WRITE_AND_READ,
"Phase component fraction" );
+EXTRINSIC_MESH_DATA_TRAIT( phaseCompFractionOld,
+ "phaseCompFractionOld",
+ array4dLayoutPhaseComp,
+ 0,
+ NOPLOT,
+ WRITE_AND_READ,
+ "Phase component fraction at the previous converged time step" );
+
EXTRINSIC_MESH_DATA_TRAIT( dPhaseCompFraction,
"dPhaseCompFraction",
array5dLayoutPhaseComp_dC,
@@ -158,6 +190,14 @@ EXTRINSIC_MESH_DATA_TRAIT( totalDensity,
WRITE_AND_READ,
"Total density" );
+EXTRINSIC_MESH_DATA_TRAIT( totalDensityOld,
+ "totalDensityOld",
+ array2dLayoutFluid,
+ 0,
+ NOPLOT,
+ WRITE_AND_READ,
+ "Total density at the previous converged time step" );
+
EXTRINSIC_MESH_DATA_TRAIT( initialTotalMassDensity,
"initialTotalMassDensity",
array2dLayoutFluid,
@@ -174,7 +214,6 @@ EXTRINSIC_MESH_DATA_TRAIT( dTotalDensity,
NO_WRITE,
"Derivative of total density with respect to pressure, temperature, and global component fractions" );
-
}
}
diff --git a/src/coreComponents/constitutive/solid/PorousSolid.hpp b/src/coreComponents/constitutive/solid/PorousSolid.hpp
index f8113017d8a..a3c7d535e26 100644
--- a/src/coreComponents/constitutive/solid/PorousSolid.hpp
+++ b/src/coreComponents/constitutive/solid/PorousSolid.hpp
@@ -148,10 +148,10 @@ class PorousSolidUpdates : public CoupledSolidUpdates< SOLID_TYPE, BiotPorosity,
real64 const & solidDensity,
real64 const & initialFluidTotalMassDensity,
arraySlice1d< real64 const, constitutive::multifluid::USD_PHASE - 2 > const & fluidPhaseDensity,
- arraySlice1d< real64 const, compflow::USD_PHASE - 1 > const & fluidPhaseDensityOld,
+ arraySlice1d< real64 const, constitutive::multifluid::USD_PHASE - 2 > const & fluidPhaseDensityOld,
arraySlice2d< real64 const, constitutive::multifluid::USD_PHASE_DC - 2 > const & dFluidPhaseDensity,
arraySlice2d< real64 const, constitutive::multifluid::USD_PHASE_COMP - 2 > const & fluidPhaseCompFrac,
- arraySlice2d< real64 const, compflow::USD_PHASE_COMP - 1 > const & fluidPhaseCompFracOld,
+ arraySlice2d< real64 const, constitutive::multifluid::USD_PHASE_COMP - 2 > const & fluidPhaseCompFracOld,
arraySlice3d< real64 const, constitutive::multifluid::USD_PHASE_COMP_DC -2 > const & dFluidPhaseCompFrac,
arraySlice1d< real64 const, constitutive::multifluid::USD_PHASE - 2 > const & fluidPhaseMassDensity,
arraySlice2d< real64 const, constitutive::multifluid::USD_PHASE_DC - 2 > const & dFluidPhaseMassDensity,
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp
index aed0130be17..d7d472a1cf3 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBase.cpp
@@ -226,13 +226,8 @@ void CompositionalMultiphaseBase::registerDataOnMesh( Group & meshBodies )
subRegion.registerExtrinsicData< phaseVolumeFractionOld >( getName() ).
reference().resizeDimension< 1 >( m_numPhases );
- subRegion.registerExtrinsicData< totalDensityOld >( getName() );
- subRegion.registerExtrinsicData< phaseDensityOld >( getName() ).
- reference().resizeDimension< 1 >( m_numPhases );
subRegion.registerExtrinsicData< phaseMobilityOld >( getName() ).
reference().resizeDimension< 1 >( m_numPhases );
- subRegion.registerExtrinsicData< phaseComponentFractionOld >( getName() ).
- reference().resizeDimension< 1, 2 >( m_numPhases, m_numComponents );
} );
@@ -1021,7 +1016,6 @@ void CompositionalMultiphaseBase::backupFields( MeshLevel & mesh,
{
GEOSX_MARK_FUNCTION;
- integer const numComp = m_numComponents;
integer const numPhase = m_numPhases;
// backup some fields used in time derivative approximation
@@ -1033,26 +1027,13 @@ void CompositionalMultiphaseBase::backupFields( MeshLevel & mesh,
arrayView2d< real64 const, compflow::USD_PHASE > const phaseVolFrac =
subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseVolumeFraction >();
- arrayView2d< real64 const, compflow::USD_PHASE > const & phaseMob =
+ arrayView2d< real64 const, compflow::USD_PHASE > const phaseMob =
subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseMobility >();
- string const & fluidName = subRegion.getReference< string >( viewKeyStruct::fluidNamesString() );
- MultiFluidBase const & fluid = getConstitutiveModel< MultiFluidBase >( subRegion, fluidName );
- arrayView2d< real64 const, multifluid::USD_FLUID > const totalDens = fluid.totalDensity();
- arrayView3d< real64 const, multifluid::USD_PHASE > const phaseDens = fluid.phaseDensity();
- arrayView4d< real64 const, multifluid::USD_PHASE_COMP > const phaseCompFrac = fluid.phaseCompFraction();
-
- arrayView1d< real64 > const totalDensOld =
- subRegion.getExtrinsicData< extrinsicMeshData::flow::totalDensityOld >();
-
- arrayView2d< real64, compflow::USD_PHASE > const phaseDensOld =
- subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseDensityOld >();
arrayView2d< real64, compflow::USD_PHASE > const phaseVolFracOld =
subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseVolumeFractionOld >();
arrayView2d< real64, compflow::USD_PHASE > const phaseMobOld =
subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseMobilityOld >();
- arrayView3d< real64, compflow::USD_PHASE_COMP > const phaseCompFracOld =
- subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseComponentFractionOld >();
forAll< parallelDevicePolicy<> >( subRegion.size(), [=] GEOSX_HOST_DEVICE ( localIndex const ei )
{
@@ -1061,16 +1042,9 @@ void CompositionalMultiphaseBase::backupFields( MeshLevel & mesh,
for( integer ip = 0; ip < numPhase; ++ip )
{
- phaseDensOld[ei][ip] = phaseDens[ei][0][ip];
phaseVolFracOld[ei][ip] = phaseVolFrac[ei][ip];
phaseMobOld[ei][ip] = phaseMob[ei][ip];
-
- for( integer ic = 0; ic < numComp; ++ic )
- {
- phaseCompFracOld[ei][ip][ic] = phaseCompFrac[ei][0][ip][ic];
- }
}
- totalDensOld[ei] = totalDens[ei][0];
} );
} );
}
@@ -1647,20 +1621,25 @@ void CompositionalMultiphaseBase::implicitStepComplete( real64 const & time,
}
} );
- // Step 3: save the converged solid state
+ // Step 3: save the converged fluid state
+ string const & fluidName = subRegion.getReference< string >( viewKeyStruct::fluidNamesString() );
+ MultiFluidBase const & fluidMaterial = getConstitutiveModel< MultiFluidBase >( subRegion, fluidName );
+ fluidMaterial.saveConvergedState();
+
+ // Step 4: save the converged solid state
string const & solidName = subRegion.getReference< string >( viewKeyStruct::solidNamesString() );
CoupledSolidBase const & porousMaterial = getConstitutiveModel< CoupledSolidBase >( subRegion, solidName );
porousMaterial.saveConvergedState();
- // Step 4: save converged state for the relperm model to handle hysteresis
+ // Step 5: save converged state for the relperm model to handle hysteresis
arrayView2d< real64 const, compflow::USD_PHASE > const phaseVolFrac =
subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseVolumeFraction >();
string const & relPermName = subRegion.getReference< string >( viewKeyStruct::relPermNamesString() );
- RelativePermeabilityBase & relPermMaterial =
+ RelativePermeabilityBase const & relPermMaterial =
getConstitutiveModel< RelativePermeabilityBase >( subRegion, relPermName );
relPermMaterial.saveConvergedPhaseVolFractionState( phaseVolFrac );
- // Step 5: if capillary pressure is supported, send the converged porosity and permeability to the capillary pressure model
+ // Step 6: if capillary pressure is supported, send the converged porosity and permeability to the capillary pressure model
// note: this is needed when the capillary pressure depends on porosity and permeability (Leverett J-function for instance)
if( m_hasCapPressure )
{
@@ -1677,7 +1656,7 @@ void CompositionalMultiphaseBase::implicitStepComplete( real64 const & time,
capPressureMaterial.saveConvergedRockState( porosity, permeability );
}
- // Step 6: if the thermal option is on, send the converged porosity and phase volume fraction to the thermal conductivity model
+ // Step 7: if the thermal option is on, send the converged porosity and phase volume fraction to the thermal conductivity model
// note: this is needed because the phaseVolFrac-weighted thermal conductivity treats phaseVolumeFraction explicitly for now
if( m_isThermal )
{
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBaseExtrinsicData.hpp b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBaseExtrinsicData.hpp
index bf9518930b4..363b6a818c3 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBaseExtrinsicData.hpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBaseExtrinsicData.hpp
@@ -159,22 +159,6 @@ EXTRINSIC_MESH_DATA_TRAIT( phaseVolumeFractionOld,
WRITE_AND_READ,
"Phase volume fraction at the previous converged time step" );
-EXTRINSIC_MESH_DATA_TRAIT( phaseDensityOld,
- "phaseDensityOld",
- array2dLayoutPhase,
- 0,
- NOPLOT,
- WRITE_AND_READ,
- "Phase density at the previous converged time step" );
-
-EXTRINSIC_MESH_DATA_TRAIT( totalDensityOld,
- "totalDensityOld",
- array1d< real64 >,
- 0,
- NOPLOT,
- WRITE_AND_READ,
- "Total density at the previous converged time step" );
-
EXTRINSIC_MESH_DATA_TRAIT( phaseMobilityOld,
"phaseMobilityOld",
array2dLayoutPhase,
@@ -183,14 +167,6 @@ EXTRINSIC_MESH_DATA_TRAIT( phaseMobilityOld,
WRITE_AND_READ,
"Phase mobility at the previous converged time step" );
-EXTRINSIC_MESH_DATA_TRAIT( phaseComponentFractionOld,
- "phaseComponentFractionOld",
- array3dLayoutPhaseComp,
- 0,
- NOPLOT,
- WRITE_AND_READ,
- "Phase component fraction at the previous converged time step" );
-
EXTRINSIC_MESH_DATA_TRAIT( phaseOutflux,
"phaseOutflux",
array2dLayoutPhase,
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBaseKernels.hpp b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBaseKernels.hpp
index 794069a7256..990d20f21fa 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBaseKernels.hpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseBaseKernels.hpp
@@ -641,10 +641,10 @@ class ElementBasedAssemblyKernel
m_phaseVolFrac( subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseVolumeFraction >() ),
m_dPhaseVolFrac_dPres( subRegion.getExtrinsicData< extrinsicMeshData::flow::dPhaseVolumeFraction_dPressure >() ),
m_dPhaseVolFrac_dCompDens( subRegion.getExtrinsicData< extrinsicMeshData::flow::dPhaseVolumeFraction_dGlobalCompDensity >() ),
- m_phaseDensOld( subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseDensityOld >() ),
+ m_phaseDensOld( fluid.phaseDensityOld() ),
m_phaseDens( fluid.phaseDensity() ),
m_dPhaseDens( fluid.dPhaseDensity() ),
- m_phaseCompFracOld( subRegion.getExtrinsicData< extrinsicMeshData::flow::phaseComponentFractionOld >() ),
+ m_phaseCompFracOld( fluid.phaseCompFractionOld() ),
m_phaseCompFrac( fluid.phaseCompFraction() ),
m_dPhaseCompFrac( fluid.dPhaseCompFraction() ),
m_localMatrix( localMatrix ),
@@ -741,13 +741,13 @@ class ElementBasedAssemblyKernel
arraySlice1d< real64 const, compflow::USD_PHASE - 1 > dPhaseVolFrac_dPres = m_dPhaseVolFrac_dPres[ei];
arraySlice2d< real64 const, compflow::USD_PHASE_DC - 1 > dPhaseVolFrac_dCompDens = m_dPhaseVolFrac_dCompDens[ei];
- arraySlice1d< real64 const, compflow::USD_PHASE - 1 > phaseDensOld = m_phaseDensOld[ei];
+ arraySlice1d< real64 const, multifluid::USD_PHASE - 2 > phaseDensOld = m_phaseDensOld[ei][0];
arraySlice1d< real64 const, multifluid::USD_PHASE - 2 > phaseDens = m_phaseDens[ei][0];
arraySlice2d< real64 const, multifluid::USD_PHASE_DC - 2 > dPhaseDens = m_dPhaseDens[ei][0];
- arraySlice2d< real64 const, compflow::USD_PHASE_COMP-1 > phaseCompFracOld = m_phaseCompFracOld[ei];
- arraySlice2d< real64 const, multifluid::USD_PHASE_COMP-2 > phaseCompFrac = m_phaseCompFrac[ei][0];
- arraySlice3d< real64 const, multifluid::USD_PHASE_COMP_DC-2 > dPhaseCompFrac = m_dPhaseCompFrac[ei][0];
+ arraySlice2d< real64 const, multifluid::USD_PHASE_COMP - 2 > phaseCompFracOld = m_phaseCompFracOld[ei][0];
+ arraySlice2d< real64 const, multifluid::USD_PHASE_COMP - 2 > phaseCompFrac = m_phaseCompFrac[ei][0];
+ arraySlice3d< real64 const, multifluid::USD_PHASE_COMP_DC - 2 > dPhaseCompFrac = m_dPhaseCompFrac[ei][0];
// temporary work arrays
real64 dPhaseAmount_dC[numComp]{};
@@ -940,12 +940,12 @@ class ElementBasedAssemblyKernel
arrayView3d< real64 const, compflow::USD_PHASE_DC > const m_dPhaseVolFrac_dCompDens;
/// Views on the phase densities
- arrayView2d< real64 const, compflow::USD_PHASE > const m_phaseDensOld;
+ arrayView3d< real64 const, multifluid::USD_PHASE > const m_phaseDensOld;
arrayView3d< real64 const, multifluid::USD_PHASE > const m_phaseDens;
arrayView4d< real64 const, multifluid::USD_PHASE_DC > const m_dPhaseDens;
/// Views on the phase component fraction
- arrayView3d< real64 const, compflow::USD_PHASE_COMP > const m_phaseCompFracOld;
+ arrayView4d< real64 const, multifluid::USD_PHASE_COMP > const m_phaseCompFracOld;
arrayView4d< real64 const, multifluid::USD_PHASE_COMP > const m_phaseCompFrac;
arrayView5d< real64 const, multifluid::USD_PHASE_COMP_DC > const m_dPhaseCompFrac;
@@ -1013,7 +1013,7 @@ struct ResidualNormKernel
arrayView1d< integer const > const & ghostRank,
arrayView1d< real64 const > const & refPoro,
arrayView1d< real64 const > const & volume,
- arrayView1d< real64 const > const & totalDensOld,
+ arrayView2d< real64 const, multifluid::USD_FLUID > const & totalDensOld,
real64 & localResidualNorm )
{
RAJA::ReduceSum< REDUCE_POLICY, real64 > localSum( 0.0 );
@@ -1023,7 +1023,7 @@ struct ResidualNormKernel
if( ghostRank[ei] < 0 )
{
localIndex const localRow = dofNumber[ei] - rankOffset;
- real64 const normalizer = totalDensOld[ei] * refPoro[ei] * volume[ei];
+ real64 const normalizer = totalDensOld[ei][0] * refPoro[ei] * volume[ei];
for( integer idof = 0; idof < numComponents + 1; ++idof )
{
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseFVM.cpp b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseFVM.cpp
index 78a21e8ca5f..84cb177754c 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseFVM.cpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseFVM.cpp
@@ -298,14 +298,16 @@ real64 CompositionalMultiphaseFVM::calculateResidualNorm( DomainPartition const
ElementSubRegionBase const & subRegion )
{
arrayView1d< globalIndex const > dofNumber = subRegion.getReference< array1d< globalIndex > >( dofKey );
- arrayView1d< integer const > const & elemGhostRank = subRegion.ghostRank();
- arrayView1d< real64 const > const & volume = subRegion.getElementVolume();
- arrayView1d< real64 const > const & totalDensOld = subRegion.getExtrinsicData< extrinsicMeshData::flow::totalDensityOld >();
+ arrayView1d< integer const > const elemGhostRank = subRegion.ghostRank();
+ arrayView1d< real64 const > const volume = subRegion.getElementVolume();
- string const & solidName = subRegion.getReference< string >( viewKeyStruct::solidNamesString() );
- CoupledSolidBase const & solidModel = getConstitutiveModel< CoupledSolidBase >( subRegion, solidName );
+ string const & fluidName = subRegion.getReference< string >( viewKeyStruct::fluidNamesString() );
+ MultiFluidBase const & fluid = getConstitutiveModel< MultiFluidBase >( subRegion, fluidName );
+ arrayView2d< real64 const, multifluid::USD_FLUID > const totalDensOld = fluid.totalDensityOld();
- arrayView1d< real64 const > const & referencePorosity = solidModel.getReferencePorosity();
+ string const & solidName = subRegion.getReference< string >( viewKeyStruct::solidNamesString() );
+ CoupledSolidBase const & solid = getConstitutiveModel< CoupledSolidBase >( subRegion, solidName );
+ arrayView1d< real64 const > const referencePorosity = solid.getReferencePorosity();
real64 subRegionResidualNorm = 0.0;
ResidualNormKernel::launch< parallelDevicePolicy<>,
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseHybridFVM.cpp b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseHybridFVM.cpp
index 9a06dc657fe..ed1fed23a12 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseHybridFVM.cpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/CompositionalMultiphaseHybridFVM.cpp
@@ -797,25 +797,27 @@ real64 CompositionalMultiphaseHybridFVM::calculateResidualNorm( DomainPartition
arrayView1d< globalIndex const > const & elemDofNumber = subRegion.getReference< array1d< globalIndex > >( elemDofKey );
arrayView1d< integer const > const & elemGhostRank = subRegion.ghostRank();
arrayView1d< real64 const > const & volume = subRegion.getElementVolume();
- arrayView1d< real64 const > const & totalDensOld = subRegion.getExtrinsicData< extrinsicMeshData::flow::totalDensityOld >();
- CoupledSolidBase const & solidModel =
- getConstitutiveModel< CoupledSolidBase >( subRegion,
- subRegion.getReference< string >( viewKeyStruct::solidNamesString() ) );
+ string const & fluidName = subRegion.getReference< string >( viewKeyStruct::fluidNamesString() );
+ MultiFluidBase const & fluid = getConstitutiveModel< MultiFluidBase >( subRegion, fluidName );
+ arrayView2d< real64 const, multifluid::USD_FLUID > const & totalDensOld = fluid.totalDensityOld();
- arrayView1d< real64 const > const & referencePorosity = solidModel.getReferencePorosity();
+ string const & solidName = subRegion.getReference< string >( viewKeyStruct::solidNamesString() );
+ CoupledSolidBase const & solid = getConstitutiveModel< CoupledSolidBase >( subRegion, solidName );
+ arrayView1d< real64 const > const & referencePorosity = solid.getReferencePorosity();
real64 subRegionResidualNorm = 0.0;
- compositionalMultiphaseBaseKernels::ResidualNormKernel::launch< parallelDevicePolicy<>,
- parallelDeviceReduce >( localRhs,
- rankOffset,
- numFluidComponents(),
- elemDofNumber,
- elemGhostRank,
- referencePorosity,
- volume,
- totalDensOld,
- subRegionResidualNorm );
+ compositionalMultiphaseBaseKernels::
+ ResidualNormKernel::launch< parallelDevicePolicy<>,
+ parallelDeviceReduce >( localRhs,
+ rankOffset,
+ numFluidComponents(),
+ elemDofNumber,
+ elemGhostRank,
+ referencePorosity,
+ volume,
+ totalDensOld,
+ subRegionResidualNorm );
localResidualNorm += subRegionResidualNorm;
} );
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWellKernels.cpp b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWellKernels.cpp
index 8d2565598d0..aca6bc358fa 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWellKernels.cpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/wells/CompositionalMultiphaseWellKernels.cpp
@@ -1675,11 +1675,23 @@ PresTempCompFracInitializationKernel::
"Invalid well initialization: negative pressure was found",
InputError );
+ RAJA::ReduceMax< parallelDeviceReduce, integer > foundNegativePressure( 0 );
+
// estimate the pressures in the well elements using this avgDens
forAll< parallelDevicePolicy<> >( subRegionSize, [=] GEOSX_HOST_DEVICE ( localIndex const iwelem )
{
wellElemPres[iwelem] = pressureControl + avgTotalMassDens * ( wellElemGravCoef[iwelem] - gravCoefControl );
+ if( wellElemPres[iwelem] <= 0 )
+ {
+ foundNegativePressure.max( 1 );
+ }
+
} );
+
+ GEOSX_THROW_IF( foundNegativePressure.get() == 1,
+ "Invalid well initialization: negative pressure was found",
+ InputError );
+
}
/******************************** CompDensInitializationKernel ********************************/
diff --git a/src/coreComponents/physicsSolvers/fluidFlow/wells/SinglePhaseWellKernels.cpp b/src/coreComponents/physicsSolvers/fluidFlow/wells/SinglePhaseWellKernels.cpp
index 3525c661337..7b2a8156cb4 100644
--- a/src/coreComponents/physicsSolvers/fluidFlow/wells/SinglePhaseWellKernels.cpp
+++ b/src/coreComponents/physicsSolvers/fluidFlow/wells/SinglePhaseWellKernels.cpp
@@ -614,14 +614,25 @@ PresInitializationKernel::
pressureControl = ( isProducer ) ? 0.5 * pres : 2.0 * pres;
}
- GEOSX_ERROR_IF( pressureControl <= 0, "Invalid well initialization: negative pressure was found" );
+ GEOSX_THROW_IF( pressureControl <= 0,
+ "Invalid well initialization: negative pressure was found",
+ InputError );
+
+ RAJA::ReduceMax< parallelDeviceReduce, integer > foundNegativePressure( 0 );
// estimate the pressures in the well elements using this avgDensity
forAll< parallelDevicePolicy<> >( subRegionSize, [=] GEOSX_HOST_DEVICE ( localIndex const iwelem )
{
- wellElemPressure[iwelem] = pressureControl
- + avgDensity * ( wellElemGravCoef[iwelem] - gravCoefControl );
+ wellElemPressure[iwelem] = pressureControl + avgDensity * ( wellElemGravCoef[iwelem] - gravCoefControl );
+ if( wellElemPressure[iwelem] <= 0 )
+ {
+ foundNegativePressure.max( 1 );
+ }
} );
+
+ GEOSX_THROW_IF( foundNegativePressure.get() == 1,
+ "Invalid well initialization: negative pressure was found",
+ InputError );
}
/******************************** RateInitializationKernel ********************************/
diff --git a/src/coreComponents/physicsSolvers/multiphysics/MultiphasePoromechanicsKernel.hpp b/src/coreComponents/physicsSolvers/multiphysics/MultiphasePoromechanicsKernel.hpp
index 1c30a14642c..d03e4b85572 100644
--- a/src/coreComponents/physicsSolvers/multiphysics/MultiphasePoromechanicsKernel.hpp
+++ b/src/coreComponents/physicsSolvers/multiphysics/MultiphasePoromechanicsKernel.hpp
@@ -133,9 +133,11 @@ class Multiphase :
elementSubRegion.template getConstitutiveModel< constitutive::MultiFluidBase >( fluidModelName );
m_fluidPhaseDensity = fluid.phaseDensity();
+ m_fluidPhaseDensityOld = fluid.phaseDensityOld();
m_dFluidPhaseDensity = fluid.dPhaseDensity();
m_fluidPhaseCompFrac = fluid.phaseCompFraction();
+ m_fluidPhaseCompFracOld = fluid.phaseCompFractionOld();
m_dFluidPhaseCompFrac = fluid.dPhaseCompFraction();
m_fluidPhaseMassDensity = fluid.phaseMassDensity();
@@ -152,8 +154,6 @@ class Multiphase :
m_fluidPressureOld = elementSubRegion.template getExtrinsicData< pressure >();
m_deltaFluidPressure = elementSubRegion.template getExtrinsicData< deltaPressure >();
- m_fluidPhaseDensityOld = elementSubRegion.template getExtrinsicData< phaseDensityOld >();
- m_fluidPhaseCompFracOld = elementSubRegion.template getExtrinsicData< phaseComponentFractionOld >();
m_fluidPhaseSaturationOld = elementSubRegion.template getExtrinsicData< phaseVolumeFractionOld >();
m_fluidPhaseSaturation = elementSubRegion.template getExtrinsicData< phaseVolumeFraction >();
@@ -328,10 +328,10 @@ class Multiphase :
m_solidDensity( k, q ),
m_initialFluidTotalMassDensity( k, q ),
m_fluidPhaseDensity[k][q],
- m_fluidPhaseDensityOld[k],
+ m_fluidPhaseDensityOld[k][q],
m_dFluidPhaseDensity[k][q],
m_fluidPhaseCompFrac[k][q],
- m_fluidPhaseCompFracOld[k],
+ m_fluidPhaseCompFracOld[k][q],
m_dFluidPhaseCompFrac[k][q],
m_fluidPhaseMassDensity[k][q],
m_dFluidPhaseMassDensity[k][q],
@@ -629,11 +629,11 @@ class Multiphase :
arrayView2d< real64 const > m_solidDensity;
arrayView3d< real64 const, constitutive::multifluid::USD_PHASE > m_fluidPhaseDensity;
- arrayView2d< real64 const, compflow::USD_PHASE > m_fluidPhaseDensityOld;
+ arrayView3d< real64 const, constitutive::multifluid::USD_PHASE > m_fluidPhaseDensityOld;
arrayView4d< real64 const, constitutive::multifluid::USD_PHASE_DC > m_dFluidPhaseDensity;
arrayView4d< real64 const, constitutive::multifluid::USD_PHASE_COMP > m_fluidPhaseCompFrac;
- arrayView3d< real64 const, compflow::USD_PHASE_COMP > m_fluidPhaseCompFracOld;
+ arrayView4d< real64 const, constitutive::multifluid::USD_PHASE_COMP > m_fluidPhaseCompFracOld;
arrayView5d< real64 const, constitutive::multifluid::USD_PHASE_COMP_DC > m_dFluidPhaseCompFrac;
arrayView3d< real64 const, constitutive::multifluid::USD_PHASE > m_fluidPhaseMassDensity;
diff --git a/src/coreComponents/schema/docs/AcousticSEM_other.rst b/src/coreComponents/schema/docs/AcousticSEM_other.rst
index 71642d4c7ae..edd823f6468 100644
--- a/src/coreComponents/schema/docs/AcousticSEM_other.rst
+++ b/src/coreComponents/schema/docs/AcousticSEM_other.rst
@@ -1,20 +1,20 @@
-========================= =============================================================================================================================================================================================================================================================================================== =======================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== =======================================================================
-indexSeismoTrace integer Count for output pressure at receivers
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-pressureNp1AtReceivers real64_array2d Pressure value at each receiver for each timestep
-receiverIsLocal integer_array Flag that indicates whether the receiver is local to this MPI rank
-receiverNodeIds integer_array2d Indices of the nodes (in the right order) for each receiver point
-sourceConstants real64_array2d Constant part of the receiver for the nodes listed in m_receiverNodeIds
-sourceIsLocal integer_array Flag that indicates whether the source is local to this MPI rank
-sourceNodeIds integer_array2d Indices of the nodes (in the right order) for each source point
-sourceValue real64_array2d Source Value of the sources
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== =======================================================================
+========================= =================================================================================================================================================== =======================================================================
+Name Type Description
+========================= =================================================================================================================================================== =======================================================================
+indexSeismoTrace integer Count for output pressure at receivers
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+pressureNp1AtReceivers real64_array2d Pressure value at each receiver for each timestep
+receiverIsLocal integer_array Flag that indicates whether the receiver is local to this MPI rank
+receiverNodeIds integer_array2d Indices of the nodes (in the right order) for each receiver point
+sourceConstants real64_array2d Constant part of the receiver for the nodes listed in m_receiverNodeIds
+sourceIsLocal integer_array Flag that indicates whether the source is local to this MPI rank
+sourceNodeIds integer_array2d Indices of the nodes (in the right order) for each source point
+sourceValue real64_array2d Source Value of the sources
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== =======================================================================
diff --git a/src/coreComponents/schema/docs/BlackOilFluid_other.rst b/src/coreComponents/schema/docs/BlackOilFluid_other.rst
index b8125b924a6..e6d3382d61a 100644
--- a/src/coreComponents/schema/docs/BlackOilFluid_other.rst
+++ b/src/coreComponents/schema/docs/BlackOilFluid_other.rst
@@ -16,15 +16,20 @@ formationVolFactorTableWrappers LvArray_Array< geosx_TableFunction_KernelWrapper
hydrocarbonPhaseOrder integer_array (no description available)
initialTotalMassDensity real64_array2d Initial total mass density
phaseCompFraction real64_array4d Phase component fraction
+phaseCompFractionOld real64_array4d Phase component fraction at the previous converged time step
phaseDensity real64_array3d Phase density
+phaseDensityOld real64_array3d Phase density at the previous converged time step
phaseEnthalpy real64_array3d Phase enthalpy
+phaseEnthalpyOld real64_array3d Phase enthalpy at the previous converged time step
phaseFraction real64_array3d Phase fraction
phaseInternalEnergy real64_array3d Phase internal energy
+phaseInternalEnergyOld real64_array3d Phase internal energy at the previous converged time step
phaseMassDensity real64_array3d Phase mass density
phaseOrder integer_array (no description available)
phaseTypes integer_array (no description available)
phaseViscosity real64_array3d Phase viscosity
totalDensity real64_array2d Total density
+totalDensityOld real64_array2d Total density at the previous converged time step
useMass integer (no description available)
viscosityTableWrappers LvArray_Array< geosx_TableFunction_KernelWrapper, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer > (no description available)
=============================== ======================================================================================================== ============================================================================================================
diff --git a/src/coreComponents/schema/docs/CO2BrineEzrokhiFluid_other.rst b/src/coreComponents/schema/docs/CO2BrineEzrokhiFluid_other.rst
index d8a16e91ac5..b7df809a8fc 100644
--- a/src/coreComponents/schema/docs/CO2BrineEzrokhiFluid_other.rst
+++ b/src/coreComponents/schema/docs/CO2BrineEzrokhiFluid_other.rst
@@ -13,13 +13,18 @@ dPhaseViscosity real64_array4d
dTotalDensity real64_array3d Derivative of total density with respect to pressure, temperature, and global component fractions
initialTotalMassDensity real64_array2d Initial total mass density
phaseCompFraction real64_array4d Phase component fraction
+phaseCompFractionOld real64_array4d Phase component fraction at the previous converged time step
phaseDensity real64_array3d Phase density
+phaseDensityOld real64_array3d Phase density at the previous converged time step
phaseEnthalpy real64_array3d Phase enthalpy
+phaseEnthalpyOld real64_array3d Phase enthalpy at the previous converged time step
phaseFraction real64_array3d Phase fraction
phaseInternalEnergy real64_array3d Phase internal energy
+phaseInternalEnergyOld real64_array3d Phase internal energy at the previous converged time step
phaseMassDensity real64_array3d Phase mass density
phaseViscosity real64_array3d Phase viscosity
totalDensity real64_array2d Total density
+totalDensityOld real64_array2d Total density at the previous converged time step
useMass integer (no description available)
======================= ============================================================================================= ============================================================================================================
diff --git a/src/coreComponents/schema/docs/CO2BrineEzrokhiThermalFluid_other.rst b/src/coreComponents/schema/docs/CO2BrineEzrokhiThermalFluid_other.rst
index d8a16e91ac5..b7df809a8fc 100644
--- a/src/coreComponents/schema/docs/CO2BrineEzrokhiThermalFluid_other.rst
+++ b/src/coreComponents/schema/docs/CO2BrineEzrokhiThermalFluid_other.rst
@@ -13,13 +13,18 @@ dPhaseViscosity real64_array4d
dTotalDensity real64_array3d Derivative of total density with respect to pressure, temperature, and global component fractions
initialTotalMassDensity real64_array2d Initial total mass density
phaseCompFraction real64_array4d Phase component fraction
+phaseCompFractionOld real64_array4d Phase component fraction at the previous converged time step
phaseDensity real64_array3d Phase density
+phaseDensityOld real64_array3d Phase density at the previous converged time step
phaseEnthalpy real64_array3d Phase enthalpy
+phaseEnthalpyOld real64_array3d Phase enthalpy at the previous converged time step
phaseFraction real64_array3d Phase fraction
phaseInternalEnergy real64_array3d Phase internal energy
+phaseInternalEnergyOld real64_array3d Phase internal energy at the previous converged time step
phaseMassDensity real64_array3d Phase mass density
phaseViscosity real64_array3d Phase viscosity
totalDensity real64_array2d Total density
+totalDensityOld real64_array2d Total density at the previous converged time step
useMass integer (no description available)
======================= ============================================================================================= ============================================================================================================
diff --git a/src/coreComponents/schema/docs/CO2BrinePhillipsFluid_other.rst b/src/coreComponents/schema/docs/CO2BrinePhillipsFluid_other.rst
index d8a16e91ac5..b7df809a8fc 100644
--- a/src/coreComponents/schema/docs/CO2BrinePhillipsFluid_other.rst
+++ b/src/coreComponents/schema/docs/CO2BrinePhillipsFluid_other.rst
@@ -13,13 +13,18 @@ dPhaseViscosity real64_array4d
dTotalDensity real64_array3d Derivative of total density with respect to pressure, temperature, and global component fractions
initialTotalMassDensity real64_array2d Initial total mass density
phaseCompFraction real64_array4d Phase component fraction
+phaseCompFractionOld real64_array4d Phase component fraction at the previous converged time step
phaseDensity real64_array3d Phase density
+phaseDensityOld real64_array3d Phase density at the previous converged time step
phaseEnthalpy real64_array3d Phase enthalpy
+phaseEnthalpyOld real64_array3d Phase enthalpy at the previous converged time step
phaseFraction real64_array3d Phase fraction
phaseInternalEnergy real64_array3d Phase internal energy
+phaseInternalEnergyOld real64_array3d Phase internal energy at the previous converged time step
phaseMassDensity real64_array3d Phase mass density
phaseViscosity real64_array3d Phase viscosity
totalDensity real64_array2d Total density
+totalDensityOld real64_array2d Total density at the previous converged time step
useMass integer (no description available)
======================= ============================================================================================= ============================================================================================================
diff --git a/src/coreComponents/schema/docs/CO2BrinePhillipsThermalFluid_other.rst b/src/coreComponents/schema/docs/CO2BrinePhillipsThermalFluid_other.rst
index d8a16e91ac5..b7df809a8fc 100644
--- a/src/coreComponents/schema/docs/CO2BrinePhillipsThermalFluid_other.rst
+++ b/src/coreComponents/schema/docs/CO2BrinePhillipsThermalFluid_other.rst
@@ -13,13 +13,18 @@ dPhaseViscosity real64_array4d
dTotalDensity real64_array3d Derivative of total density with respect to pressure, temperature, and global component fractions
initialTotalMassDensity real64_array2d Initial total mass density
phaseCompFraction real64_array4d Phase component fraction
+phaseCompFractionOld real64_array4d Phase component fraction at the previous converged time step
phaseDensity real64_array3d Phase density
+phaseDensityOld real64_array3d Phase density at the previous converged time step
phaseEnthalpy real64_array3d Phase enthalpy
+phaseEnthalpyOld real64_array3d Phase enthalpy at the previous converged time step
phaseFraction real64_array3d Phase fraction
phaseInternalEnergy real64_array3d Phase internal energy
+phaseInternalEnergyOld real64_array3d Phase internal energy at the previous converged time step
phaseMassDensity real64_array3d Phase mass density
phaseViscosity real64_array3d Phase viscosity
totalDensity real64_array2d Total density
+totalDensityOld real64_array2d Total density at the previous converged time step
useMass integer (no description available)
======================= ============================================================================================= ============================================================================================================
diff --git a/src/coreComponents/schema/docs/CompositionalMultiphaseFVM_other.rst b/src/coreComponents/schema/docs/CompositionalMultiphaseFVM_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/CompositionalMultiphaseFVM_other.rst
+++ b/src/coreComponents/schema/docs/CompositionalMultiphaseFVM_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/CompositionalMultiphaseFluid_other.rst b/src/coreComponents/schema/docs/CompositionalMultiphaseFluid_other.rst
index d8a16e91ac5..b7df809a8fc 100644
--- a/src/coreComponents/schema/docs/CompositionalMultiphaseFluid_other.rst
+++ b/src/coreComponents/schema/docs/CompositionalMultiphaseFluid_other.rst
@@ -13,13 +13,18 @@ dPhaseViscosity real64_array4d
dTotalDensity real64_array3d Derivative of total density with respect to pressure, temperature, and global component fractions
initialTotalMassDensity real64_array2d Initial total mass density
phaseCompFraction real64_array4d Phase component fraction
+phaseCompFractionOld real64_array4d Phase component fraction at the previous converged time step
phaseDensity real64_array3d Phase density
+phaseDensityOld real64_array3d Phase density at the previous converged time step
phaseEnthalpy real64_array3d Phase enthalpy
+phaseEnthalpyOld real64_array3d Phase enthalpy at the previous converged time step
phaseFraction real64_array3d Phase fraction
phaseInternalEnergy real64_array3d Phase internal energy
+phaseInternalEnergyOld real64_array3d Phase internal energy at the previous converged time step
phaseMassDensity real64_array3d Phase mass density
phaseViscosity real64_array3d Phase viscosity
totalDensity real64_array2d Total density
+totalDensityOld real64_array2d Total density at the previous converged time step
useMass integer (no description available)
======================= ============================================================================================= ============================================================================================================
diff --git a/src/coreComponents/schema/docs/CompositionalMultiphaseHybridFVM_other.rst b/src/coreComponents/schema/docs/CompositionalMultiphaseHybridFVM_other.rst
index bf32e9bac59..8e2f2eb6a85 100644
--- a/src/coreComponents/schema/docs/CompositionalMultiphaseHybridFVM_other.rst
+++ b/src/coreComponents/schema/docs/CompositionalMultiphaseHybridFVM_other.rst
@@ -1,14 +1,14 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================ ================================================================
-Name Type Registered On Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================ ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-deltaFacePressure real64_array :ref:`DATASTRUCTURE_FaceManager` Accumulated face pressure updates
-mimGravityCoefficient real64_array :ref:`DATASTRUCTURE_FaceManager` Mimetic gravity coefficient
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================ ================================================================
+========================= =================================================================================================================================================== ================================ ================================================================
+Name Type Registered On Description
+========================= =================================================================================================================================================== ================================ ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+deltaFacePressure real64_array :ref:`DATASTRUCTURE_FaceManager` Accumulated face pressure updates
+mimGravityCoefficient real64_array :ref:`DATASTRUCTURE_FaceManager` Mimetic gravity coefficient
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================ ================================================================
diff --git a/src/coreComponents/schema/docs/CompositionalMultiphaseReservoir_other.rst b/src/coreComponents/schema/docs/CompositionalMultiphaseReservoir_other.rst
index aa08bcefbb0..7acea5a6dbf 100644
--- a/src/coreComponents/schema/docs/CompositionalMultiphaseReservoir_other.rst
+++ b/src/coreComponents/schema/docs/CompositionalMultiphaseReservoir_other.rst
@@ -1,13 +1,13 @@
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+Name Type Description
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/CompositionalMultiphaseWell_other.rst b/src/coreComponents/schema/docs/CompositionalMultiphaseWell_other.rst
index b3804961a57..48a09333642 100644
--- a/src/coreComponents/schema/docs/CompositionalMultiphaseWell_other.rst
+++ b/src/coreComponents/schema/docs/CompositionalMultiphaseWell_other.rst
@@ -1,14 +1,14 @@
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-WellControls node :ref:`DATASTRUCTURE_WellControls`
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+Name Type Description
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+WellControls node :ref:`DATASTRUCTURE_WellControls`
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/DeadOilFluid_other.rst b/src/coreComponents/schema/docs/DeadOilFluid_other.rst
index cba0cb1f59b..2b44e2d2747 100644
--- a/src/coreComponents/schema/docs/DeadOilFluid_other.rst
+++ b/src/coreComponents/schema/docs/DeadOilFluid_other.rst
@@ -15,15 +15,20 @@ formationVolFactorTableWrappers LvArray_Array< geosx_TableFunction_KernelWrapper
hydrocarbonPhaseOrder integer_array (no description available)
initialTotalMassDensity real64_array2d Initial total mass density
phaseCompFraction real64_array4d Phase component fraction
+phaseCompFractionOld real64_array4d Phase component fraction at the previous converged time step
phaseDensity real64_array3d Phase density
+phaseDensityOld real64_array3d Phase density at the previous converged time step
phaseEnthalpy real64_array3d Phase enthalpy
+phaseEnthalpyOld real64_array3d Phase enthalpy at the previous converged time step
phaseFraction real64_array3d Phase fraction
phaseInternalEnergy real64_array3d Phase internal energy
+phaseInternalEnergyOld real64_array3d Phase internal energy at the previous converged time step
phaseMassDensity real64_array3d Phase mass density
phaseOrder integer_array (no description available)
phaseTypes integer_array (no description available)
phaseViscosity real64_array3d Phase viscosity
totalDensity real64_array2d Total density
+totalDensityOld real64_array2d Total density at the previous converged time step
useMass integer (no description available)
viscosityTableWrappers LvArray_Array< geosx_TableFunction_KernelWrapper, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer > (no description available)
=============================== ======================================================================================================== ============================================================================================================
diff --git a/src/coreComponents/schema/docs/EmbeddedSurfaceGenerator_other.rst b/src/coreComponents/schema/docs/EmbeddedSurfaceGenerator_other.rst
index 8bd71bf6b41..b53cb9d3cce 100644
--- a/src/coreComponents/schema/docs/EmbeddedSurfaceGenerator_other.rst
+++ b/src/coreComponents/schema/docs/EmbeddedSurfaceGenerator_other.rst
@@ -1,14 +1,14 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================ ========================================================================================================================================================================================================================================================================================================================
-Name Type Registered On Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================ ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-parentEdgeIndex integer_array :ref:`DATASTRUCTURE_embeddedSurfacesNodeManager` Index of parent edge within the mesh object it is registered on.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================ ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ================================================ ========================================================================================================================================================================================================================================================================================================================
+Name Type Registered On Description
+========================= =================================================================================================================================================== ================================================ ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+parentEdgeIndex integer_array :ref:`DATASTRUCTURE_embeddedSurfacesNodeManager` Index of parent edge within the mesh object it is registered on.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================ ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/FlowProppantTransport_other.rst b/src/coreComponents/schema/docs/FlowProppantTransport_other.rst
index aa08bcefbb0..7acea5a6dbf 100644
--- a/src/coreComponents/schema/docs/FlowProppantTransport_other.rst
+++ b/src/coreComponents/schema/docs/FlowProppantTransport_other.rst
@@ -1,13 +1,13 @@
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+Name Type Description
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/Hydrofracture_other.rst b/src/coreComponents/schema/docs/Hydrofracture_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/Hydrofracture_other.rst
+++ b/src/coreComponents/schema/docs/Hydrofracture_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/LagrangianContact_other.rst b/src/coreComponents/schema/docs/LagrangianContact_other.rst
index aa08bcefbb0..7acea5a6dbf 100644
--- a/src/coreComponents/schema/docs/LagrangianContact_other.rst
+++ b/src/coreComponents/schema/docs/LagrangianContact_other.rst
@@ -1,13 +1,13 @@
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+Name Type Description
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/LaplaceFEM_other.rst b/src/coreComponents/schema/docs/LaplaceFEM_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/LaplaceFEM_other.rst
+++ b/src/coreComponents/schema/docs/LaplaceFEM_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/MultiphasePoromechanics_other.rst b/src/coreComponents/schema/docs/MultiphasePoromechanics_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/MultiphasePoromechanics_other.rst
+++ b/src/coreComponents/schema/docs/MultiphasePoromechanics_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/PhaseFieldDamageFEM_other.rst b/src/coreComponents/schema/docs/PhaseFieldDamageFEM_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/PhaseFieldDamageFEM_other.rst
+++ b/src/coreComponents/schema/docs/PhaseFieldDamageFEM_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/PhaseFieldFracture_other.rst b/src/coreComponents/schema/docs/PhaseFieldFracture_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/PhaseFieldFracture_other.rst
+++ b/src/coreComponents/schema/docs/PhaseFieldFracture_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/ProppantTransport_other.rst b/src/coreComponents/schema/docs/ProppantTransport_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/ProppantTransport_other.rst
+++ b/src/coreComponents/schema/docs/ProppantTransport_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/SinglePhaseFVM_other.rst b/src/coreComponents/schema/docs/SinglePhaseFVM_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/SinglePhaseFVM_other.rst
+++ b/src/coreComponents/schema/docs/SinglePhaseFVM_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/SinglePhaseHybridFVM_other.rst b/src/coreComponents/schema/docs/SinglePhaseHybridFVM_other.rst
index 7cd3eeef08a..56309599fa0 100644
--- a/src/coreComponents/schema/docs/SinglePhaseHybridFVM_other.rst
+++ b/src/coreComponents/schema/docs/SinglePhaseHybridFVM_other.rst
@@ -1,13 +1,13 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================ ================================================================
-Name Type Registered On Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================ ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-deltaFacePressure real64_array :ref:`DATASTRUCTURE_FaceManager` Accumulated face pressure updates
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================ ================================================================
+========================= =================================================================================================================================================== ================================ ================================================================
+Name Type Registered On Description
+========================= =================================================================================================================================================== ================================ ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+deltaFacePressure real64_array :ref:`DATASTRUCTURE_FaceManager` Accumulated face pressure updates
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================ ================================================================
diff --git a/src/coreComponents/schema/docs/SinglePhasePoromechanicsEmbeddedFractures_other.rst b/src/coreComponents/schema/docs/SinglePhasePoromechanicsEmbeddedFractures_other.rst
index aa08bcefbb0..7acea5a6dbf 100644
--- a/src/coreComponents/schema/docs/SinglePhasePoromechanicsEmbeddedFractures_other.rst
+++ b/src/coreComponents/schema/docs/SinglePhasePoromechanicsEmbeddedFractures_other.rst
@@ -1,13 +1,13 @@
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+Name Type Description
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/SinglePhasePoromechanics_other.rst b/src/coreComponents/schema/docs/SinglePhasePoromechanics_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/SinglePhasePoromechanics_other.rst
+++ b/src/coreComponents/schema/docs/SinglePhasePoromechanics_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/SinglePhaseProppantFVM_other.rst b/src/coreComponents/schema/docs/SinglePhaseProppantFVM_other.rst
index c874c188464..5b4f62fa9a3 100644
--- a/src/coreComponents/schema/docs/SinglePhaseProppantFVM_other.rst
+++ b/src/coreComponents/schema/docs/SinglePhaseProppantFVM_other.rst
@@ -1,12 +1,12 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/SinglePhaseReservoir_other.rst b/src/coreComponents/schema/docs/SinglePhaseReservoir_other.rst
index aa08bcefbb0..7acea5a6dbf 100644
--- a/src/coreComponents/schema/docs/SinglePhaseReservoir_other.rst
+++ b/src/coreComponents/schema/docs/SinglePhaseReservoir_other.rst
@@ -1,13 +1,13 @@
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+Name Type Description
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/SinglePhaseWell_other.rst b/src/coreComponents/schema/docs/SinglePhaseWell_other.rst
index b3804961a57..48a09333642 100644
--- a/src/coreComponents/schema/docs/SinglePhaseWell_other.rst
+++ b/src/coreComponents/schema/docs/SinglePhaseWell_other.rst
@@ -1,14 +1,14 @@
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-WellControls node :ref:`DATASTRUCTURE_WellControls`
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+Name Type Description
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+WellControls node :ref:`DATASTRUCTURE_WellControls`
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/SolidMechanicsEmbeddedFractures_other.rst b/src/coreComponents/schema/docs/SolidMechanicsEmbeddedFractures_other.rst
index aa08bcefbb0..7acea5a6dbf 100644
--- a/src/coreComponents/schema/docs/SolidMechanicsEmbeddedFractures_other.rst
+++ b/src/coreComponents/schema/docs/SolidMechanicsEmbeddedFractures_other.rst
@@ -1,13 +1,13 @@
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+Name Type Description
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/SolidMechanicsLagrangianSSLE_other.rst b/src/coreComponents/schema/docs/SolidMechanicsLagrangianSSLE_other.rst
index d6506d6fedf..8ab18aa4617 100644
--- a/src/coreComponents/schema/docs/SolidMechanicsLagrangianSSLE_other.rst
+++ b/src/coreComponents/schema/docs/SolidMechanicsLagrangianSSLE_other.rst
@@ -1,13 +1,13 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxForce real64 The maximum force contribution in the problem domain.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxForce real64 The maximum force contribution in the problem domain.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/SolidMechanics_LagrangianFEM_other.rst b/src/coreComponents/schema/docs/SolidMechanics_LagrangianFEM_other.rst
index d6506d6fedf..8ab18aa4617 100644
--- a/src/coreComponents/schema/docs/SolidMechanics_LagrangianFEM_other.rst
+++ b/src/coreComponents/schema/docs/SolidMechanics_LagrangianFEM_other.rst
@@ -1,13 +1,13 @@
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
-maxForce real64 The maximum force contribution in the problem domain.
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ================================================================
+========================= =================================================================================================================================================== ================================================================
+Name Type Description
+========================= =================================================================================================================================================== ================================================================
+maxForce real64 The maximum force contribution in the problem domain.
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ================================================================
diff --git a/src/coreComponents/schema/docs/SurfaceGenerator_other.rst b/src/coreComponents/schema/docs/SurfaceGenerator_other.rst
index 37b9b97583d..96cfc6ecec7 100644
--- a/src/coreComponents/schema/docs/SurfaceGenerator_other.rst
+++ b/src/coreComponents/schema/docs/SurfaceGenerator_other.rst
@@ -1,18 +1,18 @@
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-Name Type Description
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
-discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
-failCriterion integer (no description available)
-maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
-meshTargets geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
-tipEdges LvArray_SortedArray< int, int, LvArray_ChaiBuffer > Set containing all the tip edges
-tipFaces LvArray_SortedArray< int, int, LvArray_ChaiBuffer > Set containing all the tip faces
-tipNodes LvArray_SortedArray< int, int, LvArray_ChaiBuffer > Set containing all the nodes at the fracture tip
-trailingFaces LvArray_SortedArray< int, int, LvArray_ChaiBuffer > Set containing all the trailing faces
-LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
-NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
-========================= =============================================================================================================================================================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+Name Type Description
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
+discretization string Name of discretization object (defined in the :ref:`NumericalMethodsManager`) to use for this solver. For instance, if this is a Finite Element Solver, the name of a :ref:`FiniteElement` should be specified. If this is a Finite Volume Method, the name of a :ref:`FiniteVolume` discretization should be specified.
+failCriterion integer (no description available)
+maxStableDt real64 Value of the Maximum Stable Timestep for this solver.
+meshTargets geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > MeshBody/Region combinations that the solver will be applied to.
+tipEdges LvArray_SortedArray< int, int, LvArray_ChaiBuffer > Set containing all the tip edges
+tipFaces LvArray_SortedArray< int, int, LvArray_ChaiBuffer > Set containing all the tip faces
+tipNodes LvArray_SortedArray< int, int, LvArray_ChaiBuffer > Set containing all the nodes at the fracture tip
+trailingFaces LvArray_SortedArray< int, int, LvArray_ChaiBuffer > Set containing all the trailing faces
+LinearSolverParameters node :ref:`DATASTRUCTURE_LinearSolverParameters`
+NonlinearSolverParameters node :ref:`DATASTRUCTURE_NonlinearSolverParameters`
+========================= =================================================================================================================================================== ========================================================================================================================================================================================================================================================================================================================
diff --git a/src/coreComponents/schema/docs/TwoPointFluxApproximation_other.rst b/src/coreComponents/schema/docs/TwoPointFluxApproximation_other.rst
index b1b2c45ed80..825f9d230d6 100644
--- a/src/coreComponents/schema/docs/TwoPointFluxApproximation_other.rst
+++ b/src/coreComponents/schema/docs/TwoPointFluxApproximation_other.rst
@@ -1,15 +1,15 @@
-======================== =============================================================================================================================================================================================================================================================================================== ========================================
-Name Type Description
-======================== =============================================================================================================================================================================================================================================================================================== ========================================
-cellStencil geosx_CellElementStencilTPFA (no description available)
-coefficientName string Name of coefficient field
-edfmStencil geosx_EmbeddedSurfaceToCellStencil (no description available)
-faceElementToCellStencil geosx_FaceElementToCellStencil (no description available)
-fieldName string Name of primary solution field
-fractureStencil geosx_SurfaceElementStencil (no description available)
-targetRegions geosx_mapBase< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, LvArray_Array< std___cxx11_basic_string< char, std_char_traits< char >, std_allocator< char > >, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > List of regions to build the stencil for
-======================== =============================================================================================================================================================================================================================================================================================== ========================================
+======================== =================================================================================================================================================== ========================================
+Name Type Description
+======================== =================================================================================================================================================== ========================================
+cellStencil geosx_CellElementStencilTPFA (no description available)
+coefficientName string Name of coefficient field
+edfmStencil geosx_EmbeddedSurfaceToCellStencil (no description available)
+faceElementToCellStencil geosx_FaceElementToCellStencil (no description available)
+fieldName string Name of primary solution field
+fractureStencil geosx_SurfaceElementStencil (no description available)
+targetRegions geosx_mapBase< std_string, LvArray_Array< std_string, 1, camp_int_seq< long, 0l >, int, LvArray_ChaiBuffer >, std_integral_constant< bool, true > > List of regions to build the stencil for
+======================== =================================================================================================================================================== ========================================
diff --git a/src/coreComponents/schema/schema.xsd.other b/src/coreComponents/schema/schema.xsd.other
index c73c61980f4..249e9afcbf0 100644
--- a/src/coreComponents/schema/schema.xsd.other
+++ b/src/coreComponents/schema/schema.xsd.other
@@ -412,7 +412,7 @@
-
+
@@ -480,7 +480,7 @@
-
+
@@ -504,7 +504,7 @@
-
+
@@ -514,7 +514,7 @@
-
+
@@ -526,7 +526,7 @@
-
+
@@ -539,7 +539,7 @@
-
+
@@ -552,7 +552,7 @@
-
+
@@ -564,7 +564,7 @@
-
+
@@ -574,7 +574,7 @@
-
+
@@ -586,7 +586,7 @@
-
+
@@ -596,7 +596,7 @@
-
+
@@ -606,7 +606,7 @@
-
+
@@ -616,7 +616,7 @@
-
+
@@ -626,7 +626,7 @@
-
+
@@ -636,7 +636,7 @@
-
+
@@ -646,7 +646,7 @@
-
+
@@ -656,7 +656,7 @@
-
+
@@ -666,7 +666,7 @@
-
+
@@ -678,7 +678,7 @@
-
+
@@ -688,7 +688,7 @@
-
+
@@ -700,7 +700,7 @@
-
+
@@ -713,7 +713,7 @@
-
+
@@ -725,7 +725,7 @@
-
+
@@ -737,7 +737,7 @@
-
+
@@ -749,7 +749,7 @@
-
+
@@ -763,7 +763,7 @@
-
+
@@ -918,14 +918,22 @@
+
+
+
+
+
+
+
+
@@ -936,6 +944,8 @@
+
+
@@ -998,20 +1008,30 @@
+
+
+
+
+
+
+
+
+
+
@@ -1036,20 +1056,30 @@
+
+
+
+
+
+
+
+
+
+
@@ -1074,20 +1104,30 @@
+
+
+
+
+
+
+
+
+
+
@@ -1112,20 +1152,30 @@
+
+
+
+
+
+
+
+
+
+
@@ -1158,20 +1208,30 @@
+
+
+
+
+
+
+
+
+
+
@@ -1280,14 +1340,22 @@
+
+
+
+
+
+
+
+
@@ -1298,6 +1366,8 @@
+
+