Change catalog entries

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

@@ -88,19 +88,10 @@ integer CompositionalMultiphaseFluid< FLASH, PHASE1, PHASE2, PHASE3 >::getWaterP
  return PVTProps::PVTFunctionHelpers::findName( m_phaseNames, expectedWaterPhaseNames, viewKeyStruct::phaseNamesString() );
 }
 
-// Naming conventions
-namespace compositional
-{
-template< int NP > struct PhaseName {};
-template<> struct PhaseName< 2 > { static constexpr char const * catalogName() { return "TwoPhase"; } };
-template<> struct PhaseName< 3 > { static constexpr char const * catalogName() { return "ThreePhase"; } };
-}
-
 template< typename FLASH, typename PHASE1, typename PHASE2, typename PHASE3 >
 string CompositionalMultiphaseFluid< FLASH, PHASE1, PHASE2, PHASE3 >::catalogName()
 {
- return GEOS_FMT( "Compositional{}Fluid{}{}",
- compositional::PhaseName< FLASH::KernelWrapper::getNumberOfPhases() >::catalogName(),
+ return GEOS_FMT( "Compositional{}Fluid{}",
  FLASH::catalogName(),
  PHASE1::Viscosity::catalogName() );
 }

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

@@ -27,6 +27,18 @@ namespace constitutive
 namespace compositional
 {
 
+CompositionalDensity::KernelWrapper
+CompositionalDensity::createKernelWrapper() const
+{
+ return KernelWrapper( m_componentDimensionalVolumeShift, m_equationOfState );
+}
+
+std::unique_ptr< ModelParameters >
+CompositionalDensity::createParameters( std::unique_ptr< ModelParameters > parameters )
+{
+ return EquationOfState::create( std::move( parameters ) );
+}
+
 void CompositionalDensity::calculateDimensionalVolumeShift( ComponentProperties const & componentProperties,
  EquationOfStateType const & equationOfState,
  arraySlice1d< real64 > componentDimensionalVolumeShift )

src/coreComponents/constitutive/fluid/multifluid/compositional/models/CompositionalDensity.hpp

@@ -106,10 +106,10 @@ class CompositionalDensity : public FunctionBase
  * @brief Create an update kernel wrapper.
  * @return the wrapper
  */
- KernelWrapper createKernelWrapper() const
- {
-  return KernelWrapper( m_componentDimensionalVolumeShift, m_equationOfState );
- }
+ KernelWrapper createKernelWrapper() const;
+
+ // Create parameters unique to this model
+ static std::unique_ptr< ModelParameters > createParameters( std::unique_ptr< ModelParameters > parameters );
 
 private:
  static void calculateDimensionalVolumeShift( ComponentProperties const & componentProperties,

src/coreComponents/constitutive/fluid/multifluid/compositional/models/ConstantViscosity.hpp

@@ -86,7 +86,7 @@ class ConstantViscosity : public FunctionBase
 
  array1d< real64 > m_constantPhaseViscosity;
 
-private:
+protected:
  void registerParametersImpl( MultiFluidBase * fluid ) override;
  void postProcessInputImpl( MultiFluidBase const * fluid, ComponentProperties const & componentProperties ) override;
 

src/coreComponents/constitutive/fluid/multifluid/compositional/models/EquationOfState.hpp

@@ -63,7 +63,7 @@ class EquationOfState : public ModelParameters
 
  string_array m_equationsOfStateNames;
 
-private:
+protected:
  void registerParametersImpl( MultiFluidBase * fluid ) override
  {
  fluid->registerWrapper( viewKeyStruct::equationsOfStateString(), &m_equationsOfStateNames ).

src/coreComponents/constitutive/fluid/multifluid/compositional/models/LohrenzBrayClarkViscosity.hpp

@@ -271,7 +271,7 @@ class LohrenzBrayClarkViscosity : public FunctionBase
  integer const phaseIndex,
  ModelParameters const & modelParameters );
 
- static string catalogName() { return "LBC"; }
+ static string catalogName() { return "LohrenzBrayClark"; }
 
  FunctionType functionType() const override
  {
@@ -297,7 +297,7 @@ class LohrenzBrayClarkViscosity : public FunctionBase
  string m_componentMixingType;
  array1d< real64 > m_componentCriticalVolume;
 
-private:
+protected:
  void registerParametersImpl( MultiFluidBase * fluid ) override;
  void postProcessInputImpl( MultiFluidBase const * fluid, ComponentProperties const & componentProperties ) override;
 

src/coreComponents/constitutive/fluid/multifluid/compositional/models/ModelParameters.hpp

@@ -67,7 +67,7 @@ class ModelParameters
  return parameters;
  }
 
-private:
+protected:
  virtual void registerParametersImpl( MultiFluidBase * fluid )
  {
  GEOS_UNUSED_VAR( fluid );

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

@@ -44,8 +44,8 @@ NegativeTwoPhaseFlashModel::NegativeTwoPhaseFlashModel( string const & name,
 NegativeTwoPhaseFlashModel::KernelWrapper
 NegativeTwoPhaseFlashModel::createKernelWrapper() const
 {
- static constexpr integer liquidIndex = 0;
- static constexpr integer vapourIndex = 1;
+ constexpr integer liquidIndex = 0;
+ constexpr integer vapourIndex = 1;
  EquationOfStateType const liquidEos = EnumStrings< EquationOfStateType >::fromString( m_parameters->m_equationsOfStateNames[liquidIndex] );
  EquationOfStateType const vapourEos = EnumStrings< EquationOfStateType >::fromString( m_parameters->m_equationsOfStateNames[vapourIndex] );
  return KernelWrapper( m_componentProperties.getNumberOfComponents(), liquidIndex, vapourIndex, liquidEos, vapourEos );