fix: Add HU simplified 2-phase version, refactor IHU implementation and fix bugs where possible, change phase/component flux logic

inputFiles/compositionalMultiphaseFlow/co2_1d_base.xml

@@ -0,0 +1,149 @@
+<?xml version="1.0" ?>
+
+<Problem>
+  <Solvers gravityVector="{-1, 0, 0}">
+    <CompositionalMultiphaseFVM
+        name="compflow"
+        logLevel="1"
+        discretization="fluidTPFA"
+        targetRegions="{ Region1 }"
+        temperature="297.15">
+      <NonlinearSolverParameters
+          newtonTol="5e-4"
+          lineSearchAction="None"
+          newtonMaxIter="100"/>
+      <LinearSolverParameters
+          directParallel="0"/>
+    </CompositionalMultiphaseFVM>
+  </Solvers>
+
+  <Geometry>
+    <Box
+        name="source"
+        xMin="{ -0.01, -0.01, -0.01 }"
+        xMax="{ 1.01, 1.01, 1.01 }"/>
+  </Geometry>
+
+  <Events
+      maxTime="1.0368e8">
+    <PeriodicEvent
+        name="outputs"
+        cycleFrequency="1"
+        target="/Outputs/vtkOutput"/>
+
+    <PeriodicEvent
+        name="solverApplications1"
+        forceDt="1.728e6"
+        target="/Solvers/compflow"/>
+
+    <PeriodicEvent
+        name="restarts"
+        timeFrequency="3e7"
+        targetExactTimestep="0"
+        target="/Outputs/restartOutput"/>
+  </Events>
+
+  <ElementRegions>
+    <CellElementRegion
+        name="Region1"
+        cellBlocks="{ block1 }"
+        materialList="{ fluid, rock, relperm }"/>
+  </ElementRegions>
+
+  <Constitutive>
+    <CO2BrinePhillipsFluid
+      name="fluid"
+      logLevel="1"
+      phaseNames="{ gas, water }"
+      componentNames="{ co2, water }"
+      componentMolarWeight="{ 44e-3, 18e-3 }"
+      phasePVTParaFiles="{ pvtgas.txt, pvtliquid.txt }"
+      flashModelParaFile="co2flash.txt"/>
+
+    <CompressibleSolidConstantPermeability
+        name="rock"
+        solidModelName="nullSolid"
+        porosityModelName="rockPorosity"
+        permeabilityModelName="rockPerm"/>
+
+    <NullModel
+        name="nullSolid"/>
+
+    <PressurePorosity
+        name="rockPorosity"
+        defaultReferencePorosity="0.2"
+        referencePressure="0.0"
+        compressibility="1.0e-9"/>
+
+    <BrooksCoreyRelativePermeability
+        name="relperm"
+        phaseNames="{ gas, water }"
+        phaseMinVolumeFraction="{ 0.0, 0.0 }"
+        phaseRelPermExponent="{ 2.0, 2.5 }"
+        phaseRelPermMaxValue="{ 0.9, 0.9 }"/>
+
+    <ConstantPermeability
+        name="rockPerm"
+        permeabilityComponents="{ 5.0e-15, 5.0e-15, 5.0e-15 }"/>
+  </Constitutive>
+
+  <FieldSpecifications>
+    <!-- Initial pressure: ~5 bar -->
+    <FieldSpecification
+        name="initialPressure"
+        initialCondition="1"
+        setNames="{ all }"
+        objectPath="ElementRegions/Region1/block1"
+        fieldName="pressure"
+        scale="7.5e6"/>
+
+    <FieldSpecification
+        name="initialComposition_co2"
+        initialCondition="1"
+        setNames="{ all }"
+        objectPath="ElementRegions/Region1/block1"
+        fieldName="globalCompFraction"
+        component="0"
+        functionName="initial_co2"
+        scale="1"/>
+
+    <FieldSpecification
+        name="initialComposition_water"
+        initialCondition="1"
+        setNames="{ all }"
+        objectPath="ElementRegions/Region1/block1"
+        fieldName="globalCompFraction"
+        component="1"
+        functionName="initial_water"
+        scale="1"/>
+
+<!--
+    <SourceFlux
+        name="sourceTerm"
+        logLevel="10"
+        objectPath="ElementRegions/Region1/block1"
+        component="0"
+        scale="-1e-3"
+        setNames="{ source }"/>
+-->
+
+  </FieldSpecifications>
+
+  <Functions>
+    <TableFunction name="initial_co2"
+                   inputVarNames="{elementCenter}"
+                   coordinates="{0.0, 10.}"
+                   values="{1.0, 0.0}"
+    />
+    <TableFunction name="initial_water"
+                   inputVarNames="{elementCenter}"
+                   coordinates="{0.0, 10.}"
+                   values="{0.0, 1.0}"
+    />
+  </Functions>
+
+  <Outputs>
+    <Restart
+        name="restartOutput"/>
+  </Outputs>
+</Problem>

inputFiles/compositionalMultiphaseFlow/co2_grav_1d_base.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+
+<Problem>
+
+  <Mesh>
+    <InternalMesh
+        name="mesh1"
+        elementTypes="{ C3D8 }"
+        xCoords="{ 0, 10 }"
+        yCoords="{ 0, 1 }"
+        zCoords="{ 0, 1 }"
+        nx="{ 10 }"
+        ny="{ 1 }"
+        nz="{ 1 }"
+        cellBlockNames="{ block1 }"/>
+  </Mesh>
+
+</Problem>

inputFiles/compositionalMultiphaseFlow/co2_grav_visc_1d_hu2ph.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+
+<Problem>
+
+  <Included>
+    <File name="co2_1d_base.xml"/>
+  </Included>
+
+  <Included>
+    <File name="co2_grav_1d_base.xml"/>
+  </Included>
+
+  <NumericalMethods>
+    <FiniteVolume>
+      <TwoPointFluxApproximation
+          name="fluidTPFA"
+          upwindingScheme="HU2PH"
+      />
+    </FiniteVolume>
+  </NumericalMethods>
+
+  <Outputs>
+    <VTK
+        name="vtkOutput"
+        plotFileRoot="co2_grav_1d_hu2ph"/>
+  </Outputs>
+</Problem>

inputFiles/compositionalMultiphaseFlow/co2_grav_visc_1d_ppu2ph.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+
+<Problem>
+
+  <Included>
+    <File name="co2_1d_base.xml"/>
+  </Included>
+
+  <Included>
+    <File name="co2_grav_1d_base.xml"/>
+  </Included>
+
+  <NumericalMethods>
+    <FiniteVolume>
+      <TwoPointFluxApproximation
+          name="fluidTPFA"
+      />
+    </FiniteVolume>
+  </NumericalMethods>
+
+  <Outputs>
+    <VTK
+        name="vtkOutput"
+        plotFileRoot="co2_grav_1d_ppu2ph"/>
+  </Outputs>
+</Problem>

inputFiles/compositionalMultiphaseFlow/co2_visc_1d_base.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+
+<Problem>
+
+  <Mesh>
+    <InternalMesh
+        name="mesh1"
+        elementTypes="{ C3D8 }"
+        xCoords="{ 0, 10 }"
+        yCoords="{ 0, 1 }"
+        zCoords="{ 0, 1 }"
+        nx="{ 10 }"
+        ny="{ 1 }"
+        nz="{ 1 }"
+        cellBlockNames="{ block1 }"/>
+  </Mesh>
+
+</Problem>

inputFiles/compositionalMultiphaseFlow/co2_visc_1d_hu2ph.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+
+<Problem>
+
+  <Included>
+    <File name="co2_1d_base.xml"/>
+  </Included>
+
+  <Included>
+    <File name="co2_visc_1d_base.xml"/>
+  </Included>
+
+  <NumericalMethods>
+    <FiniteVolume>
+      <TwoPointFluxApproximation
+          name="fluidTPFA"
+          upwindingScheme="HU2PH"
+      />
+    </FiniteVolume>
+  </NumericalMethods>
+
+  <Outputs>
+    <VTK
+        name="vtkOutput"
+        plotFileRoot="co2_visc_1d_hu2ph"/>
+  </Outputs>
+</Problem>

inputFiles/compositionalMultiphaseFlow/co2_visc_1d_ppu2ph.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+
+<Problem>
+
+  <Included>
+    <File name="co2_1d_base.xml"/>
+  </Included>
+
+  <Included>
+    <File name="co2_visc_1d_base.xml"/>
+  </Included>
+
+  <NumericalMethods>
+    <FiniteVolume>
+      <TwoPointFluxApproximation
+          name="fluidTPFA"
+      />
+    </FiniteVolume>
+  </NumericalMethods>
+
+  <Outputs>
+    <VTK
+        name="vtkOutput"
+        plotFileRoot="co2_visc_1d_ppu2ph"/>
+  </Outputs>
+</Problem>

inputFiles/compositionalMultiphaseFlow/pvdg.txt

@@ -1,14 +1,14 @@
 # Pg(Pa) Bg(m3/sm3) Visc(Pa.s)
-3000000 0.04234 0.00005344
-6000000 0.02046 0.0000542
-9000000 0.01328 0.00005526
-12000000 0.00977 0.0000566
-15000000 0.00773 0.00005818
-18000000 0.006426 0.00005994
-21000000 0.005541 0.00006181
-24000000 0.004919 0.0000637
-27000000 0.004471 0.00006559
-29500000 0.004194 0.00006714
-31000000 0.004031 0.00006806
-33000000 0.00391 0.00006832
-53000000 0.003868 0.00006935
+3000000 0.04234 1
+6000000 0.02046 1
+9000000 0.01328 1
+12000000 0.00977 1
+15000000 0.00773 1
+18000000 0.006426 1
+21000000 0.005541 1
+24000000 0.004919 1
+27000000 0.004471 1
+29500000 0.004194 1
+31000000 0.004031 1
+33000000 0.00391 1
+53000000 0.003868 1

inputFiles/compositionalMultiphaseFlow/pvdo.txt

@@ -1,8 +1,8 @@
 # P[Pa]	Bo[m3/sm3] Visc(Pa.s)
-2000000	1.09	0.000449
-5000000	1.08	0.00051
-10000000	1.07	0.000594
-20000000	1.05	0.000695
-30000000	1.04	0.00083
-40000000	1.03	0.00091
-50000000.7	1.02	0.000975
+2000000	1.09	1
+5000000	1.08	1
+10000000	1.07	1
+20000000	1.05	1
+30000000	1.04	1
+40000000	1.03	1
+50000000.7	1.02	1

src/coreComponents/constitutive/CMakeLists.txt

@@ -171,7 +171,6 @@ set( constitutive_headers
      thermalConductivity/MultiPhaseVolumeWeightedThermalConductivity.hpp
      thermalConductivity/SinglePhaseThermalConductivity.hpp
      thermalConductivity/SinglePhaseThermalConductivityBase.hpp
-     thermalConductivity/SinglePhaseThermalConductivityFields.hpp
      thermalConductivity/SinglePhaseThermalConductivitySelector.hpp
      thermalConductivity/ThermalConductivityFields.hpp
    )

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

@@ -14,7 +14,7 @@
  */
 
 /**
- * @file multiFluidSelector.hpp
+ * @file MultiFluidSelector.hpp
  */
 #ifndef GEOS_CONSTITUTIVE_FLUID_MULTIFLUIDSELECTOR_HPP_
 #define GEOS_CONSTITUTIVE_FLUID_MULTIFLUIDSELECTOR_HPP_

src/coreComponents/constitutive/thermalConductivity/SinglePhaseThermalConductivityBase.cpp

@@ -19,7 +19,6 @@
 
 #include "SinglePhaseThermalConductivityBase.hpp"
 #include "ThermalConductivityFields.hpp"
-#include "SinglePhaseThermalConductivityFields.hpp"
 
 namespace geos
 {