Implement Spycher-Pruess solubility tables

src/coreComponents/constitutive/CMakeLists.txt

@@ -47,6 +47,7 @@ set( constitutive_headers
      fluid/multifluid/CO2Brine/functions/CO2Enthalpy.hpp
      fluid/multifluid/CO2Brine/functions/CO2EOSSolver.hpp
      fluid/multifluid/CO2Brine/functions/CO2Solubility.hpp
+     fluid/multifluid/CO2Brine/functions/CO2SolubilityDuanSun.hpp
      fluid/multifluid/CO2Brine/functions/CO2SolubilitySpycherPruess.hpp
      fluid/multifluid/CO2Brine/functions/EzrokhiBrineDensity.hpp
      fluid/multifluid/CO2Brine/functions/EzrokhiBrineViscosity.hpp
@@ -203,6 +204,7 @@ set( constitutive_sources
      fluid/multifluid/CO2Brine/functions/EzrokhiBrineDensity.cpp
      fluid/multifluid/CO2Brine/functions/EzrokhiBrineViscosity.cpp
      fluid/multifluid/CO2Brine/functions/CO2Solubility.cpp
+     fluid/multifluid/CO2Brine/functions/CO2SolubilityDuanSun.cpp
      fluid/multifluid/CO2Brine/functions/CO2SolubilitySpycherPruess.cpp
      fluid/multifluid/CO2Brine/functions/FenghourCO2Viscosity.cpp
      fluid/multifluid/CO2Brine/functions/SpanWagnerCO2Density.cpp

src/coreComponents/constitutive/fluid/multifluid/CO2Brine/CO2BrineFluid.cpp

@@ -377,9 +377,10 @@ void CO2BrineFluid< PHASE1, PHASE2, FLASH >::createPVTModels()
     // If 1 table is provided, it is the CO2 solubility table and water vapourisation is zero
     // If 2 tables are provided, they are the CO2 solubility and water vapourisation tables depending
     // on how phaseNames is arranged
+    string const solubilityModel = EnumStrings< CO2Solubility::SolubilityModel >::toString( CO2Solubility::SolubilityModel::Tables );
     string_array strs;
     strs.emplace_back( "FlashModel" );
-    strs.emplace_back( "Tables" );   // Marker to indicate that tables are provided
+    strs.emplace_back( solubilityModel );   // Marker to indicate that tables are provided
     strs.emplace_back( "" );   // 2 empty strings for the 2 phase tables gas first, then water
     strs.emplace_back( "" );
     if( m_solubilityTables.size() == 2 )

src/coreComponents/constitutive/fluid/multifluid/CO2Brine/CO2BrineFluid.hpp

@@ -194,7 +194,6 @@ class CO2BrineFluid : public MultiFluidBase
 
   // Flash model
   std::unique_ptr< FLASH > m_flash;
-
 };
 
 // these aliases are useful in constitutive dispatch