Mirror GeometryOrDomain internally

Author: mikeingold

ext/MeshIntegralsEnzymeExt.jl

@@ -18,7 +18,7 @@ end
 
 # Supports all geometries except for those that throw errors
 # See GitHub Issue #154 for more information
-MeshIntegrals.supports_autoenzyme(::Type{<:Meshes.GeometryOrDomain}) = true
+MeshIntegrals.supports_autoenzyme(::Type{<:GeometryOrDomain}) = true
 MeshIntegrals.supports_autoenzyme(::Type{<:Meshes.BezierCurve}) = false
 MeshIntegrals.supports_autoenzyme(::Type{<:Meshes.CylinderSurface}) = false
 MeshIntegrals.supports_autoenzyme(::Type{<:Meshes.Cylinder}) = false

src/MeshIntegrals.jl

@@ -1,14 +1,17 @@
 module MeshIntegrals
 using CliffordNumbers: CliffordNumbers, VGA, ∧
 using CoordRefSystems: CoordRefSystems, CRS
-using Meshes: Meshes, Geometry, GeometryOrDomain
+using Meshes: Meshes, Geometry
 
 import FastGaussQuadrature
 import HCubature
 import LinearAlgebra
 import QuadGK
 import Unitful
 
+# Same as the internal-only Meshes.GeometryOrDomain
+const GeometryOrDomain = Union{Meshes.Geometry, Meshes.Domain}
+
 include("differentiation.jl")
 export DifferentiationMethod, FiniteDifference, AutoEnzyme, jacobian
 

src/specializations/PolyArea.jl

@@ -34,7 +34,7 @@ function integral(
 ) where {I <: IntegrationRule}
     # Partition the PolyArea, sum the integrals over each of those areas
     subintegral(area) = integral(f, area, rule; kwargs...)
-    subgeometries = Meshes.elements(Meshes.discretize(area)) |> collect
+    subgeometries = collect(Meshes.elements(Meshes.discretize(area)))
     return sum(subintegral, subgeometries)
 end
 

src/utils.jl

@@ -25,7 +25,7 @@ function supports_autoenzyme end
 supports_autoenzyme(::Type{<:Any}) = false
 
 # If provided a geometry instance, re-run with the type as argument
-supports_autoenzyme(::G) where {G <: Meshes.GeometryOrDomain} = supports_autoenzyme(G)
+supports_autoenzyme(::G) where {G <: GeometryOrDomain} = supports_autoenzyme(G)
 
 """
     _check_diff_method_support(::Geometry, ::DifferentiationMethod) -> nothing

test/combinations.jl

@@ -17,7 +17,7 @@ This file includes tests for:
     using CoordRefSystems
     import LinearAlgebra: norm
     using Meshes
-    using MeshIntegrals
+    using MeshIntegrals: MeshIntegrals, GeometryOrDomain
     import Unitful: @u_str, Quantity, ustrip
     import Enzyme
 
@@ -28,7 +28,7 @@ This file includes tests for:
     (c::Callable)(p::Meshes.Point) = c.f(p)
 
     # Stores a testable combination
-    struct TestableGeometry{F <: Function, G <: Meshes.GeometryOrDomain, U <: Quantity}
+    struct TestableGeometry{F <: Function, G <: GeometryOrDomain, U <: Quantity}
         integrand::F
         geometry::G
         solution::U
@@ -49,7 +49,7 @@ This file includes tests for:
     end
 
     # Shortcut constructor for geometries with typical support structure
-    function SupportStatus(geometry::G) where {G <: Meshes.GeometryOrDomain}
+    function SupportStatus(geometry::G) where {G <: GeometryOrDomain}
         # Check whether AutoEnzyme should be supported, i.e. not on blacklist
         unsupported_Gs = Union{BezierCurve, Cylinder, CylinderSurface, ParametrizedCurve}
         autoenzyme = !(G <: unsupported_Gs)