updated integratedTests submodule

src/coreComponents/constitutive/relativePermeability/BrooksCoreyBakerRelativePermeability.hpp

@@ -44,10 +44,10 @@ class BrooksCoreyBakerRelativePermeabilityUpdate final : public RelativePermeabi
  arrayView3d< real64, relperm::USD_RELPERM > const & phaseTrappedVolFrac )
  : RelativePermeabilityBaseUpdate( phaseTypes,
  phaseOrder,
- phaseMinVolumeFraction,
  phaseRelPerm,
  dPhaseRelPerm_dPhaseVolFrac,
  phaseTrappedVolFrac ),
+ m_phaseMinVolumeFraction( phaseMinVolumeFraction ),
  m_waterOilRelPermExponent( waterOilRelPermExponent ),
  m_waterOilRelPermMaxValue( waterOilRelPermMaxValue ),
  m_gasOilRelPermExponent( gasOilRelPermExponent ),
@@ -97,6 +97,8 @@ class BrooksCoreyBakerRelativePermeabilityUpdate final : public RelativePermeabi
  real64 & relPerm,
  real64 & dRelPerm_dVolFrac );
 
+ arrayView1d< real64 const > m_phaseMinVolumeFraction;
+
  arrayView1d< real64 const > m_waterOilRelPermExponent;
  arrayView1d< real64 const > m_waterOilRelPermMaxValue;
 
@@ -127,6 +129,7 @@ class BrooksCoreyBakerRelativePermeability : public RelativePermeabilityBase
 
  struct viewKeyStruct : RelativePermeabilityBase::viewKeyStruct
  {
+ static constexpr char const * phaseMinVolumeFractionString() { return "phaseMinVolumeFraction"; }
  static constexpr char const * waterOilRelPermExponentString() { return "waterOilRelPermExponent"; }
  static constexpr char const * waterOilRelPermMaxValueString() { return "waterOilRelPermMaxValue"; }
  static constexpr char const * gasOilRelPermExponentString() { return "gasOilRelPermExponent"; }
@@ -138,6 +141,8 @@ class BrooksCoreyBakerRelativePermeability : public RelativePermeabilityBase
 
  virtual void postProcessInput() override;
 
+ array1d< real64 > m_phaseMinVolumeFraction;
+
  // water-oil data
  array1d< real64 > m_waterOilRelPermExponent;
  array1d< real64 > m_waterOilRelPermMaxValue;
@@ -266,14 +271,19 @@ BrooksCoreyBakerRelativePermeabilityUpdate::
  dPhaseRelPerm_dPhaseVolFrac[ipOil] );
  }
 
- //update trapped
+ // update trapped phase volume fraction
  if( ipWater >= 0 )
- phaseTrappedVolFrac[ipWater] = std::min( phaseVolFraction[ipWater], m_phaseMinVolumeFraction[ipWater] );
+ {
+ phaseTrappedVolFrac[ipWater] = LvArray::math::min( phaseVolFraction[ipWater], m_phaseMinVolumeFraction[ipWater] );
+ }
  if( ipGas >= 0 )
- phaseTrappedVolFrac[ipGas] = std::min( phaseVolFraction[ipGas], m_phaseMinVolumeFraction[ipGas] );
+ {
+ phaseTrappedVolFrac[ipGas] = LvArray::math::min( phaseVolFraction[ipGas], m_phaseMinVolumeFraction[ipGas] );
+ }
  if( ipOil >= 0 )
- phaseTrappedVolFrac[ipOil] = std::min( phaseVolFraction[ipOil], m_phaseMinVolumeFraction[ipOil] );
-
+ {
+ phaseTrappedVolFrac[ipOil] = LvArray::math::min( phaseVolFraction[ipOil], m_phaseMinVolumeFraction[ipOil] );
+ }
 
 }
 

src/coreComponents/constitutive/relativePermeability/BrooksCoreyRelativePermeability.hpp

@@ -41,10 +41,10 @@ class BrooksCoreyRelativePermeabilityUpdate final : public RelativePermeabilityB
  arrayView3d< real64, relperm::USD_RELPERM > const & phaseTrappedVolFrac )
  : RelativePermeabilityBaseUpdate( phaseTypes,
  phaseOrder,
- phaseMinVolumeFraction,
  phaseRelPerm,
  dPhaseRelPerm_dPhaseVolFrac,
  phaseTrappedVolFrac ),
+ m_phaseMinVolumeFraction( phaseMinVolumeFraction ),
  m_phaseRelPermExponent( phaseRelPermExponent ),
  m_phaseRelPermMaxValue( phaseRelPermMaxValue ),
  m_volFracScale( volFracScale )
@@ -69,6 +69,7 @@ class BrooksCoreyRelativePermeabilityUpdate final : public RelativePermeabilityB
 
 private:
 
+ arrayView1d< real64 const > m_phaseMinVolumeFraction;
  arrayView1d< real64 const > m_phaseRelPermExponent;
  arrayView1d< real64 const > m_phaseRelPermMaxValue;
  real64 m_volFracScale;
@@ -97,6 +98,7 @@ class BrooksCoreyRelativePermeability : public RelativePermeabilityBase
 //START_SPHINX_INCLUDE_01
  struct viewKeyStruct : RelativePermeabilityBase::viewKeyStruct
  {
+ static constexpr char const * phaseMinVolumeFractionString() { return "phaseMinVolumeFraction"; }
  static constexpr char const * phaseRelPermExponentString() { return "phaseRelPermExponent"; }
  static constexpr char const * phaseRelPermMaxValueString() { return "phaseRelPermMaxValue"; }
  static constexpr char const * volFracScaleString() { return "volFracScale"; }
@@ -108,6 +110,7 @@ class BrooksCoreyRelativePermeability : public RelativePermeabilityBase
  virtual void postProcessInput() override;
 
 //START_SPHINX_INCLUDE_02
+ array1d< real64 > m_phaseMinVolumeFraction;
  array1d< real64 > m_phaseRelPermExponent;
  array1d< real64 > m_phaseRelPermMaxValue;
 
@@ -146,7 +149,7 @@ BrooksCoreyRelativePermeabilityUpdate::
  phaseRelPerm[ip] = (satScaled <= 0.0) ? 0.0 : scale;
  }
 
- phaseTrappedVolFrac[ip] = std::min( phaseVolFraction[ip], m_phaseMinVolumeFraction[ip] );
+ phaseTrappedVolFrac[ip] = LvArray::math::min( phaseVolFraction[ip], m_phaseMinVolumeFraction[ip] );
 
  }
 }

src/coreComponents/constitutive/relativePermeability/RelativePermeabilityBase.cpp

@@ -44,7 +44,7 @@ RelativePermeabilityBase::RelativePermeabilityBase( string const & name, Group *
  registerExtrinsicData( extrinsicMeshData::relperm::dPhaseRelPerm_dPhaseVolFraction{},
  &m_dPhaseRelPerm_dPhaseVolFrac );
 
- registerExtrinsicData( extrinsicMeshData::relperm::phaseTrapped{}, &m_phaseTrappedVolFrac );
+ registerExtrinsicData( extrinsicMeshData::relperm::phaseTrappedVolFraction{}, &m_phaseTrappedVolFrac );
 
 }
 
@@ -103,8 +103,8 @@ void RelativePermeabilityBase::setLabels()
  getExtrinsicData< extrinsicMeshData::relperm::phaseRelPerm >().
  setDimLabels( 2, m_phaseNames );
 
-  getExtrinsicData< extrinsicMeshData::relperm::phaseTrapped>().
-  setDimLabels( 2, m_phaseNames );
+ getExtrinsicData< extrinsicMeshData::relperm::phaseTrappedVolFraction >().
+ setDimLabels( 2, m_phaseNames );
 }
 
 void RelativePermeabilityBase::allocateConstitutiveData( dataRepository::Group & parent,

src/coreComponents/constitutive/relativePermeability/RelativePermeabilityBase.hpp

@@ -59,22 +59,18 @@ class RelativePermeabilityBaseUpdate
 
  RelativePermeabilityBaseUpdate( arrayView1d< integer const > const & phaseTypes,
  arrayView1d< integer const > const & phaseOrder,
- arrayView1d< real64 const > const & phaseMinVolFrac,
  arrayView3d< real64, relperm::USD_RELPERM > const & phaseRelPerm,
  arrayView4d< real64, relperm::USD_RELPERM_DS > const & dPhaseRelPerm_dPhaseVolFrac,
  arrayView3d< real64, relperm::USD_RELPERM > const & phaseTrappedVolFrac )
  : m_phaseTypes( phaseTypes ),
  m_phaseOrder( phaseOrder ),
- m_phaseMinVolumeFraction( phaseMinVolFrac ),
  m_phaseRelPerm( phaseRelPerm ),
  m_dPhaseRelPerm_dPhaseVolFrac( dPhaseRelPerm_dPhaseVolFrac ),
  m_phaseTrappedVolFrac( phaseTrappedVolFrac ) {}
 
  arrayView1d< integer const > m_phaseTypes;
  arrayView1d< integer const > m_phaseOrder;
 
- arrayView1d< real64 const > m_phaseMinVolumeFraction;
-
  arrayView3d< real64, relperm::USD_RELPERM > m_phaseRelPerm;
  arrayView4d< real64, relperm::USD_RELPERM_DS > m_dPhaseRelPerm_dPhaseVolFrac;
 
@@ -132,8 +128,7 @@ class RelativePermeabilityBase : public ConstitutiveBase
 
  arrayView1d< string const > phaseNames() const { return m_phaseNames; }
 
- arrayView1d< real64 const > phaseMinVolumeFraction() const { return m_phaseMinVolumeFraction; }
- arrayView3d< real64 const, relperm::USD_RELPERM > phaseTrapped() const { return m_phaseTrappedVolFrac; }
+ arrayView3d< real64 const, relperm::USD_RELPERM > phaseTrappedVolFraction() const { return m_phaseTrappedVolFrac; }
 
  arrayView3d< real64 const, relperm::USD_RELPERM > phaseRelPerm() const { return m_phaseRelPerm; }
  arrayView4d< real64 const, relperm::USD_RELPERM_DS > dPhaseRelPerm_dPhaseVolFraction() const { return m_dPhaseRelPerm_dPhaseVolFrac; }
@@ -150,7 +145,6 @@ class RelativePermeabilityBase : public ConstitutiveBase
  static constexpr char const * phaseNamesString() { return "phaseNames"; }
  static constexpr char const * phaseTypesString() { return "phaseTypes"; }
  static constexpr char const * phaseOrderString() { return "phaseOrder"; }
- static constexpr char const * phaseMinVolumeFractionString() { return "phaseMinVolumeFraction"; }
  };
 
 private:
@@ -177,7 +171,6 @@ class RelativePermeabilityBase : public ConstitutiveBase
  // phase ordering info
  array1d< integer > m_phaseTypes;
  array1d< integer > m_phaseOrder;
- array1d< real64 > m_phaseMinVolumeFraction;
 
  // output quantities
  array3d< real64, relperm::LAYOUT_RELPERM > m_phaseRelPerm;

src/coreComponents/constitutive/relativePermeability/RelativePermeabilityExtrinsicData.hpp

@@ -51,13 +51,13 @@ EXTRINSIC_MESH_DATA_TRAIT( dPhaseRelPerm_dPhaseVolFraction,
  NO_WRITE,
  "Derivative of phase relative permeability with respect to phase volume fraction" );
 
-EXTRINSIC_MESH_DATA_TRAIT( phaseTrapped,
- "phaseTrapped",
+EXTRINSIC_MESH_DATA_TRAIT( phaseTrappedVolFraction,
+ "phaseTrappedVolFraction",
  array3dLayoutRelPerm,
  0,
  LEVEL_0,
  WRITE_AND_READ,
- "Phase trapped" );
+ "Phase trapped volume fraction" );
 
 EXTRINSIC_MESH_DATA_TRAIT( phaseMaxHistoricalVolFraction,
  "phaseMaxHistoricalVolFraction",

src/coreComponents/constitutive/relativePermeability/TableRelativePermeability.cpp

@@ -259,10 +259,10 @@ TableRelativePermeability::KernelWrapper::
  arrayView3d< real64, relperm::USD_RELPERM > const & phaseTrappedVolFrac )
  : RelativePermeabilityBaseUpdate( phaseTypes,
  phaseOrder,
- phaseMinVolumeFraction,
  phaseRelPerm,
  dPhaseRelPerm_dPhaseVolFrac,
  phaseTrappedVolFrac ),
+ m_phaseMinVolumeFraction( phaseMinVolumeFraction ),
  m_relPermKernelWrappers( relPermKernelWrappers )
 {}
 

src/coreComponents/constitutive/relativePermeability/TableRelativePermeability.hpp

@@ -102,6 +102,8 @@ class TableRelativePermeability : public RelativePermeabilityBase
 
 private:
 
+ arrayView1d< real64 const > m_phaseMinVolumeFraction;
+
  /// Kernel wrappers for relative permeabilities in the following order:
  /// Two-phase flow:
  /// 0- wetting-phase
@@ -113,8 +115,6 @@ class TableRelativePermeability : public RelativePermeabilityBase
  /// 3- intermediate phase (non-wetting-intermediate data)
  arrayView1d< TableFunction::KernelWrapper const > m_relPermKernelWrappers;
 
- /// Minimum volume fraction for each phase (deduced from the table)
- arrayView1d< real64 const > m_phaseMinVolumeFraction;
  };
 
  /**
@@ -126,6 +126,7 @@ class TableRelativePermeability : public RelativePermeabilityBase
  struct viewKeyStruct : RelativePermeabilityBase::viewKeyStruct
  {
  static constexpr char const * relPermKernelWrappersString() { return "relPermWrappers"; }
+ static constexpr char const * phaseMinVolumeFractionString() { return "phaseMinVolumeFraction"; }
  static constexpr char const * wettingNonWettingRelPermTableNamesString() { return "wettingNonWettingRelPermTableNames"; }
  static constexpr char const * wettingIntermediateRelPermTableNamesString() { return "wettingIntermediateRelPermTableNames"; }
  static constexpr char const * nonWettingIntermediateRelPermTableNamesString() { return "nonWettingIntermediateRelPermTableNames"; }
@@ -162,6 +163,9 @@ class TableRelativePermeability : public RelativePermeabilityBase
  /// 3- intermediate phase (non-wetting-intermediate data)
  array1d< TableFunction::KernelWrapper > m_relPermKernelWrappers;
 
+ /// Min phase volume fractions (deduced from the tables). With Baker, only the water phase entry is used
+ array1d< real64 > m_phaseMinVolumeFraction;
+
 };
 
 GEOSX_HOST_DEVICE
@@ -298,13 +302,20 @@ TableRelativePermeability::KernelWrapper::
  phaseRelPerm,
  dPhaseRelPerm_dPhaseVolFrac );
  }
- //update trapped
+
+ // update trapped phase volume fraction
  if( ipWater >= 0 )
- phaseTrappedVolFrac[ipWater] = std::min( phaseVolFraction[ipWater], m_phaseMinVolumeFraction[ipWater] );
+ {
+ phaseTrappedVolFrac[ipWater] = LvArray::math::min( phaseVolFraction[ipWater], m_phaseMinVolumeFraction[ipWater] );
+ }
  if( ipGas >= 0 )
- phaseTrappedVolFrac[ipGas] = std::min( phaseVolFraction[ipGas], m_phaseMinVolumeFraction[ipGas] );
+ {
+ phaseTrappedVolFrac[ipGas] = LvArray::math::min( phaseVolFraction[ipGas], m_phaseMinVolumeFraction[ipGas] );
+ }
  if( ipOil >= 0 )
- phaseTrappedVolFrac[ipOil] = std::min( phaseVolFraction[ipOil], m_phaseMinVolumeFraction[ipOil] );
+ {
+ phaseTrappedVolFrac[ipOil] = LvArray::math::min( phaseVolFraction[ipOil], m_phaseMinVolumeFraction[ipOil] );
+ }
 
 }
 

src/coreComponents/constitutive/relativePermeability/TableRelativePermeabilityHysteresis.cpp

@@ -645,7 +645,6 @@ TableRelativePermeabilityHysteresis::KernelWrapper::KernelWrapper( arrayView1d<
  arrayView4d< real64, relperm::USD_RELPERM_DS > const & dPhaseRelPerm_dPhaseVolFrac )
  : RelativePermeabilityBaseUpdate( phaseTypes,
  phaseOrder,
- drainagePhaseMinVolFraction,
  phaseRelPerm,
  dPhaseRelPerm_dPhaseVolFrac,
  phaseTrappedVolFrac ),