CF Merger #3: Compositional Flow models

src/porepy/__init__.py

@@ -175,9 +175,11 @@
 from porepy import models
 from porepy.models.abstract_equations import (
     BalanceEquation,
+    LocalElimination,
     VariableMixin,
 )
 from porepy.models.boundary_condition import BoundaryConditionMixin
+from porepy.models.initial_condition import InitialConditionMixin
 from porepy.models.geometry import ModelGeometry
 from porepy.models.units import Units
 
@@ -196,23 +198,26 @@
     ReferenceVariableValues,
 )
 from porepy.compositional.base import Component, Phase, Fluid
-from porepy.compositional.compositional_mixins import CompositionalVariables, FluidMixin
+from porepy.compositional.compositional_mixins import *
 
 # "Primary" models
-from porepy.models import fluid_mass_balance, momentum_balance
+from porepy.models import energy_balance, fluid_mass_balance, momentum_balance
 
 # "Secondary" models inheriting from primary models
 from porepy.models import (
     poromechanics,
-    energy_balance,
     mass_and_energy_balance,
     thermoporomechanics,
+    compositional_flow,
 )
+
+# Full model classes.
 from porepy.models.fluid_mass_balance import SinglePhaseFlow
 from porepy.models.momentum_balance import MomentumBalance
 from porepy.models.poromechanics import Poromechanics
 from porepy.models.thermoporomechanics import Thermoporomechanics
 from porepy.models.mass_and_energy_balance import MassAndEnergyBalance
+from porepy.models.compositional_flow import ModelSetupCF, ModelSetupCFF
 
 
 # Visualization

src/porepy/applications/boundary_conditions/model_boundary_conditions.py

@@ -22,7 +22,7 @@ class BoundaryConditionsMassDirWestEast(pp.BoundaryConditionMixin):
     def bc_type_darcy_flux(self, sd: pp.Grid) -> pp.BoundaryCondition:
         """Boundary condition type for Darcy flux.
 
-        Dirichlet boundary conditions are defined on the north and south boundaries.
+        Dirichlet boundary conditions are defined on the west and east boundaries.
 
         Parameters:
             sd: Subdomain for which to define boundary conditions.

src/porepy/compositional/base.py

@@ -65,6 +65,8 @@
     "EquationOfState",
     "Phase",
     "Fluid",
+    "ComponentLike",
+    "PhaseLike",
 ]
 
 
@@ -540,7 +542,7 @@ def __init__(
 
         """
 
-        self.fugacity_coefficient_of: dict[ComponentLike, ExtendedDomainFunctionType]
+        self.fugacity_coefficient_of: dict[Component, ExtendedDomainFunctionType]
         """Fugacitiy coefficients per component in this phase.
 
         Dimensionless, scalar field.
@@ -579,7 +581,7 @@ def __init__(
 
         """
 
-        self.extended_fraction_of: dict[ComponentLike, DomainFunctionType]
+        self.extended_fraction_of: dict[Component, DomainFunctionType]
         """Extended molar fractions per component in a phase, used in the unified
         phase equilibrium formulation (see :attr:`partial_fraction_of`).
 
@@ -591,7 +593,7 @@ def __init__(
 
         """
 
-        self.partial_fraction_of: dict[ComponentLike, DomainFunctionType]
+        self.partial_fraction_of: dict[Component, DomainFunctionType]
         """Partial (physical) fraction of a component, relative to the phase fraction.
 
         Dimensionless, scalar field bound to the interval ``[0, 1]``.