Thermal compositional fluid models

src/coreComponents/constitutive/fluid/multifluid/MultiFluidSelector.hpp

@@ -48,7 +48,10 @@ void constitutiveUpdatePassThru( constitutive::MultiFluidBase const & fluid,
                                CompositionalTwoPhasePhillipsBrine,
                                CompositionalKValuePhillipsBrine,
                                CompositionalKValueLohrenzBrayClarkViscosity,
-                               CompositionalTwoPhaseConstantViscosity
+                               CompositionalTwoPhaseConstantViscosity,
+                               CompositionalThermalTwoPhaseLohrenzBrayClarkViscosity,
+                               CompositionalThermalTwoPhasePhillipsBrine,
+                               CompositionalThermalKValuePhillipsBrine
                                >::execute( fluid, std::forward< LAMBDA >( lambda ) );
 }
 
@@ -68,7 +71,10 @@ void constitutiveUpdatePassThru( constitutive::MultiFluidBase & fluid,
                                CompositionalTwoPhasePhillipsBrine,
                                CompositionalKValuePhillipsBrine,
                                CompositionalKValueLohrenzBrayClarkViscosity,
-                               CompositionalTwoPhaseConstantViscosity
+                               CompositionalTwoPhaseConstantViscosity,
+                               CompositionalThermalTwoPhaseLohrenzBrayClarkViscosity,
+                               CompositionalThermalTwoPhasePhillipsBrine,
+                               CompositionalThermalKValuePhillipsBrine
                                >::execute( fluid, std::forward< LAMBDA >( lambda ) );
 }
 

src/coreComponents/constitutive/fluid/multifluid/compositional/CompositionalMultiphaseFluid.cpp

@@ -97,7 +97,9 @@ string CompositionalMultiphaseFluid< FLASH, PHASES... >::catalogName()
   // Use the first phase viscosity
   using FirstPhase = typename camp::at< camp::list< PHASES... >, camp::num< 0 > >::type;
   using ViscosityType = typename FirstPhase::Viscosity;
-  return GEOS_FMT( "Compositional{}Fluid{}", FLASH::catalogName(), ViscosityType::catalogName() );
+  return GEOS_FMT( "Compositional{}{}Fluid{}", FLASH::catalogName(),
+                   isThermalType() ? "Thermal": "",
+                   ViscosityType::catalogName() );
 }
 
 template< typename FLASH, typename ... PHASES >
@@ -328,6 +330,18 @@ template class CompositionalMultiphaseFluid<
     compositional::KValueFlashModel< 2 >,
     compositional::PhaseModel< compositional::PhillipsBrineDensity, compositional::PhillipsBrineViscosity >,
     compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity > >;
+template class CompositionalMultiphaseFluid<
+    compositional::NegativeTwoPhaseFlashModel,
+    compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity, compositional::CompositionalEnthalpy >,
+    compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity, compositional::CompositionalEnthalpy > >;
+template class CompositionalMultiphaseFluid<
+    compositional::NegativeTwoPhaseFlashModel,
+    compositional::PhaseModel< compositional::PhillipsBrineDensity, compositional::PhillipsBrineViscosity, compositional::CompositionalEnthalpy >,
+    compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity, compositional::CompositionalEnthalpy > >;
+template class CompositionalMultiphaseFluid<
+    compositional::KValueFlashModel< 2 >,
+    compositional::PhaseModel< compositional::PhillipsBrineDensity, compositional::PhillipsBrineViscosity, compositional::CompositionalEnthalpy >,
+    compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity, compositional::CompositionalEnthalpy > >;
 
 REGISTER_CATALOG_ENTRY( ConstitutiveBase,
                         CompositionalTwoPhaseConstantViscosity,
@@ -359,6 +373,21 @@ REGISTER_CATALOG_ENTRY( ConstitutiveBase,
                         string const &,
                         dataRepository::Group * const )
 
+REGISTER_CATALOG_ENTRY( ConstitutiveBase,
+                        CompositionalThermalTwoPhaseLohrenzBrayClarkViscosity,
+                        string const &,
+                        dataRepository::Group * const )
+
+REGISTER_CATALOG_ENTRY( ConstitutiveBase,
+                        CompositionalThermalTwoPhasePhillipsBrine,
+                        string const &,
+                        dataRepository::Group * const )
+
+REGISTER_CATALOG_ENTRY( ConstitutiveBase,
+                        CompositionalThermalKValuePhillipsBrine,
+                        string const &,
+                        dataRepository::Group * const )
+
 } // namespace constitutive
 
 } // namespace geos

src/coreComponents/constitutive/fluid/multifluid/compositional/CompositionalMultiphaseFluid.hpp

@@ -23,6 +23,7 @@
 #include "constitutive/fluid/multifluid/compositional/CompositionalMultiphaseFluidUpdates.hpp"
 #include "constitutive/fluid/multifluid/compositional/models/ConstantViscosity.hpp"
 #include "constitutive/fluid/multifluid/compositional/models/CompositionalDensity.hpp"
+#include "constitutive/fluid/multifluid/compositional/models/CompositionalEnthalpy.hpp"
 #include "constitutive/fluid/multifluid/compositional/models/ImmiscibleWaterDensity.hpp"
 #include "constitutive/fluid/multifluid/compositional/models/ImmiscibleWaterFlashModel.hpp"
 #include "constitutive/fluid/multifluid/compositional/models/ImmiscibleWaterViscosity.hpp"
@@ -186,6 +187,18 @@ using CompositionalKValuePhillipsBrine = CompositionalMultiphaseFluid<
   compositional::KValueFlashModel< 2 >,
   compositional::PhaseModel< compositional::PhillipsBrineDensity, compositional::PhillipsBrineViscosity >,
   compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity > >;
+using CompositionalThermalTwoPhaseLohrenzBrayClarkViscosity = CompositionalMultiphaseFluid<
+  compositional::NegativeTwoPhaseFlashModel,
+  compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity, compositional::CompositionalEnthalpy >,
+  compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity, compositional::CompositionalEnthalpy > >;
+using CompositionalThermalTwoPhasePhillipsBrine = CompositionalMultiphaseFluid<
+  compositional::NegativeTwoPhaseFlashModel,
+  compositional::PhaseModel< compositional::PhillipsBrineDensity, compositional::PhillipsBrineViscosity, compositional::CompositionalEnthalpy >,
+  compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity, compositional::CompositionalEnthalpy > >;
+using CompositionalThermalKValuePhillipsBrine = CompositionalMultiphaseFluid<
+  compositional::KValueFlashModel< 2 >,
+  compositional::PhaseModel< compositional::PhillipsBrineDensity, compositional::PhillipsBrineViscosity, compositional::CompositionalEnthalpy >,
+  compositional::PhaseModel< compositional::CompositionalDensity, compositional::LohrenzBrayClarkViscosity, compositional::CompositionalEnthalpy > >;
 
 } /* namespace constitutive */
 

src/coreComponents/constitutive/fluid/multifluid/compositional/models/CompositionalEnthalpy.cpp

@@ -58,10 +58,10 @@ CompositionalEnthalpy::CompositionalEnthalpy( string const & name,
 
   integer const numPhases = m_heatCapacityCoefficients->m_phaseTypes.size();
 
-  m_phaseType = m_heatCapacityCoefficients->m_phaseTypes[phaseIndex];
+  m_phaseType = static_cast< PhaseType >(m_heatCapacityCoefficients->m_phaseTypes[phaseIndex]);
   for( integer ip = 0; ip < numPhases; ip++ )
   {
-    if( m_heatCapacityCoefficients->m_phaseTypes[ip] == PhaseType::VAPOUR )
+    if( isPhaseType( m_heatCapacityCoefficients->m_phaseTypes[ip], PhaseType::VAPOUR ) )
     {
       m_vapourIndex = ip;
     }

src/coreComponents/constitutive/fluid/multifluid/compositional/parameters/HeatCapacityCoefficients.cpp

@@ -63,6 +63,11 @@ void HeatCapacityCoefficients::registerParametersImpl( MultiFluidBase * fluid )
   fluid->registerWrapper( viewKeyStruct::componentHeatCapacityCoefficientsString(), &m_coefficients ).
     setInputFlag( dataRepository::InputFlags::REQUIRED ).
     setDescription( "The polynomial coefficients for the specific heat capacity of each component." );
+
+  // Register extra wrappers to enable auto-cloning
+  fluid->registerWrapper( "heatCapacityPhaseTypes", &m_phaseTypes )
+    .setSizedFromParent( 0 )
+    .setRestartFlags( dataRepository::RestartFlags::NO_WRITE );
 }
 
 void HeatCapacityCoefficients::postInputInitializationImpl( MultiFluidBase const * fluid,
@@ -105,7 +110,7 @@ void HeatCapacityCoefficients::postInputInitializationImpl( MultiFluidBase const
   for( integer ip = 0; ip < numPhases; ip++ )
   {
     PhaseType const phaseType = getPhaseTypeFromName( phaseNames[ip] );
-    m_phaseTypes[ip] = phaseType;
+    m_phaseTypes[ip] = static_cast< integer >(phaseType);
     switch( phaseType )
     {
       case PhaseType::LIQUID:

src/coreComponents/constitutive/fluid/multifluid/compositional/parameters/HeatCapacityCoefficients.hpp

@@ -51,7 +51,7 @@ class HeatCapacityCoefficients : public ModelParameters
   real64 m_referenceTemperature{298.15};
   array2d< real64 > m_referenceEnthalpy;
   array2d< real64 > m_coefficients;
-  array1d< PhaseType > m_phaseTypes;
+  array1d< integer > m_phaseTypes;
 
 protected:
   void registerParametersImpl( MultiFluidBase * fluid ) override;

src/coreComponents/constitutive/unitTests/CMakeLists.txt

@@ -24,6 +24,7 @@ set( gtest_geosx_tests
      testModifiedCamClay.cpp
      testMultiFluidBlackOil.cpp
      testMultiFluidCO2Brine.cpp
+     testMultiFluidCompositionalThermalMultiphase.cpp
      testMultiFluidThreePhaseCompositionalMultiphase.cpp
      testMultiFluidTwoPhaseCompositionalMultiphase.cpp
      testMultiFluidDeadOil.cpp

src/coreComponents/constitutive/unitTests/testCompositionalEnthalpy.cpp

@@ -74,8 +74,11 @@ struct FluidData< 4 >
       }
     }
     coefficients->m_phaseTypes.resize( numPhases );
-    coefficients->m_phaseTypes[static_cast< integer >(PhaseType::LIQUID)] = PhaseType::LIQUID;
-    coefficients->m_phaseTypes[static_cast< integer >(PhaseType::VAPOUR)] = PhaseType::VAPOUR;
+    for( PhaseType const phaseType : {PhaseType::LIQUID, PhaseType::VAPOUR} )
+    {
+      integer const phase = static_cast< integer >(phaseType);
+      coefficients->m_phaseTypes[phase] = phase;
+    }
   }
 };