Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeingold committed Dec 5, 2024
2 parents dd7d156 + 301bcff commit f330bc3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/specializations/BezierCurve.jl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Like [`integral`](@ref) but integrates along the domain defined by `curve`.
- `diff_method::DifferentiationMethod = Analytical()`: the method to use for
calculating Jacobians that are used to calculate differential elements
- `FP = Float64`: the floating point precision desired
- `alg = Meshes.Horner()`: the method to use for parameterizing `curve`. Alternatively,
- `alg = Meshes.Horner()`: the method to use for parametrizing `curve`. Alternatively,
`alg=Meshes.DeCasteljau()` can be specified for increased accuracy, but comes with a
steep performance cost, especially for curves with a large number of control points.
"""
Expand Down
4 changes: 2 additions & 2 deletions src/specializations/ConeSurface.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Why Specialized?
# The parametric function that Meshes.jl currently implements for ConeSurface
# only parameterizes the rounded walls of the cone, but this Geometry surface is
# only parametrizes the rounded walls of the cone, but this Geometry surface is
# defined as including the circular base surface as well. These methods simply
# integrate both the base and walls and return the sum of the two integrals.
################################################################################
Expand All @@ -14,7 +14,7 @@ function integral(
rule::I;
kwargs...
) where {I <: IntegrationRule}
# The generic method only parameterizes the sides
# The generic method only parametrizes the sides
sides = _integral(f, cone, rule; kwargs...)

# Integrate the Disk at the base
Expand Down
4 changes: 2 additions & 2 deletions src/specializations/CylinderSurface.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Why Specialized?
# The parametric function that Meshes.jl currently implements for CylinderSurface
# only parameterizes the rounded walls, but this Geometry surface is defined as
# only parametrizes the rounded walls, but this Geometry surface is defined as
# including the top and bottom circular base surfaces as well. These methods
# simply integrate the base and walls and return the sum of the three integrals.
################################################################################
Expand All @@ -14,7 +14,7 @@ function integral(
rule::I;
kwargs...
) where {I <: IntegrationRule}
# The generic method only parameterizes the sides
# The generic method only parametrizes the sides
sides = _integral(f, cyl, rule; kwargs...)

# Integrate the Disk at the top
Expand Down
4 changes: 2 additions & 2 deletions src/specializations/FrustumSurface.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Why Specialized?
# The parametric function that Meshes.jl currently implements for FrustumSurface
# only parameterizes the rounded walls, but this Geometry surface is defined as
# only parametrizes the rounded walls, but this Geometry surface is defined as
# including the truncated top and bottom surfaces as well. These methods simply
# integrate both the walls and the ends and return the sum of the these integrals.
################################################################################
Expand All @@ -14,7 +14,7 @@ function integral(
rule::I;
kwargs...
) where {I <: IntegrationRule}
# The generic method only parameterizes the sides
# The generic method only parametrizes the sides
sides = _integral(f, frust, rule; kwargs...)

# Integrate the Disks at the top and bottom
Expand Down

0 comments on commit f330bc3

Please sign in to comment.