FIX: Issue introduced by merger with develop

pmgbergen · Jan 21, 2025 · 1489a27 · 1489a27
1 parent 2392b26
commit 1489a27
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/porepy/models/compositional_flow.py b/src/porepy/models/compositional_flow.py
@@ -798,14 +798,14 @@ def component_source(
             self.mdg, well_subdomains, well_interfaces
         )
         subdomain_projection = pp.ad.SubdomainProjections(self.mdg.subdomains())
-        source = projection.mortar_to_secondary_int @ self.interface_component_flux(
+        source = projection.mortar_to_secondary_int() @ self.interface_component_flux(
             component, interfaces
         )
         source.set_name(f"interface_component_flux_source_{component.name}")
         well_fluxes = (
-            well_projection.mortar_to_secondary_int
+            well_projection.mortar_to_secondary_int()
             @ self.well_component_flux(component, well_interfaces)
-            - well_projection.mortar_to_primary_int
+            - well_projection.mortar_to_primary_int()
             @ self.well_component_flux(component, well_interfaces)
         )
         well_fluxes.set_name(f"well_component_flux_source_{component.name}")
@@ -955,7 +955,8 @@ def normal_permeability(self, interfaces: list[pp.MortarGrid]) -> pp.ad.Operator
         projection = pp.ad.MortarProjections(self.mdg, subdomains, interfaces, dim=1)
 
         normal_permeability = (
-            projection.secondary_to_mortar_avg @ self.diffusive_permeability(subdomains)
+            projection.secondary_to_mortar_avg()
+            @ self.diffusive_permeability(subdomains)
         )
         normal_permeability.set_name("normal_permeability")
         return normal_permeability

diff --git a/src/porepy/models/constitutive_laws.py b/src/porepy/models/constitutive_laws.py
@@ -2027,7 +2027,7 @@ class ThermalConductivityCF(ThermalConductivityLTE):
 
     def normal_thermal_conductivity(
         self, interfaces: list[pp.MortarGrid]
-    ) -> pp.ad.Scalar:
+    ) -> pp.ad.Operator:
         """Normal thermal conductivity of the fluid.
 
         This is a constitutive law choosing the thermal conductivity of the fluid in the
@@ -2045,7 +2045,7 @@ def normal_thermal_conductivity(
         projection = pp.ad.MortarProjections(self.mdg, subdomains, interfaces, dim=1)
 
         # This is a constitutive law based on Banshoya 2023.
-        normal_conductivity = projection.secondary_to_mortar_avg @ (
+        normal_conductivity = projection.secondary_to_mortar_avg() @ (
             self.fluid.thermal_conductivity(subdomains)
         )
         normal_conductivity.set_name("norma_thermal_conductivity")
@@ -2070,7 +2070,7 @@ class FouriersLaw(pp.PorePyModel):
    :class:`~porepy.models.energy_balance.VariablesEnergyBalance`.
 
     """
-    normal_thermal_conductivity: Callable[[list[pp.MortarGrid]], pp.ad.Scalar]
+    normal_thermal_conductivity: Callable[[list[pp.MortarGrid]], pp.ad.Operator]
     """Conductivity on a mortar grid. Normally defined in a mixin instance of
     :class:`~porepy.models.constitutive_laws.ThermalConductivityLTE` or a subclass.
 

diff --git a/src/porepy/models/fluid_property_library.py b/src/porepy/models/fluid_property_library.py
@@ -506,7 +506,7 @@ def kappa(domains: pp.SubdomainsOrBoundaries) -> pp.ad.Operator:
 
     def normal_thermal_conductivity(
         self, interfaces: list[pp.MortarGrid]
-    ) -> pp.ad.Scalar:
+    ) -> pp.ad.Operator:
         """Constant normal thermal conductivity of the fluid given by the fluid
         constants stored in the fluid's reference component.