Skip to content

Commit

Permalink
Merge pull request #42 from byuflowlab/remove-interpolations.jl
Browse files Browse the repository at this point in the history
Remove interpolations.jl
  • Loading branch information
BTV25 authored Sep 18, 2024
2 parents 88d6a1f + 92d3be7 commit 6c29939
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
5 changes: 2 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ authors = ["Taylor McDonnell <[email protected]", "Andrew Ning <[email protected]>"]
version = "0.1.6"

[deps]
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
FLOWMath = "6cb5d3fb-0fe8-4cc2-bd89-9fe0b19a99d3"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
VSPGeom = "9b3f6a95-fce2-4bc5-94a2-f99b39986ea6"
WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"

[compat]
Interpolations = "0.13, 0.14"
StaticArrays = "0.12, 1.0"
WriteVTK = "1.8"
VSPGeom = "0.6"
WriteVTK = "1.8"
julia = "1.5"
2 changes: 1 addition & 1 deletion src/VortexLattice.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module VortexLattice

using LinearAlgebra
using StaticArrays
using Interpolations
using FLOWMath
using WriteVTK
using VSPGeom

Expand Down
12 changes: 6 additions & 6 deletions src/geometry.jl
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,8 @@ end
fcore = (c, Δs) -> 1e-3,
spacing_s = Cosine(),
spacing_c = Uniform(),
interp_s = (x, y, xpt) -> linear_interpolation(x, y)(xpt),
interp_c = (x, y, xpt) -> linear_interpolation(x, y)(xpt))
interp_s = (x, y, xpt) -> FLOWMath.linear(x, y, xpt),
interp_c = (x, y, xpt) -> FLOWMath.linear(x, y, xpt))
Discretize a potentially curved lifting surface defined by a grid with dimensions
(3, i, j) where `i` corresponds to the chordwise direction (ordered from leading
Expand Down Expand Up @@ -392,8 +392,8 @@ function grid_to_surface_panels(xyz, ns, nc;
fcore = (c, Δs) -> 1e-3,
spacing_s = Cosine(),
spacing_c = Uniform(),
interp_s = (x, y, xpt) -> linear_interpolation(x, y)(xpt),
interp_c = (x, y, xpt) -> linear_interpolation(x, y)(xpt))
interp_s = (x, y, xpt) -> FLOWMath.linear(x, y, xpt),
interp_c = (x, y, xpt) -> FLOWMath.linear(x, y, xpt))

TF = eltype(xyz)

Expand Down Expand Up @@ -494,7 +494,7 @@ end
fcore = (c, Δs) -> 1e-3,
spacing_s = Cosine(),
spacing_c = Uniform(),
interp_s = (x, y, xpt) -> linear_interpolation(x, y)(xpt))
interp_s = (x, y, xpt) -> FLOWMath.linear(x, y, xpt))
Discretize a wing into `ns` spanwise and `nc` chordwise panels with associated
vortex rings according to the spanwise discretization scheme `spacing_s` and
Expand Down Expand Up @@ -530,7 +530,7 @@ function wing_to_surface_panels(xle, yle, zle, chord, theta, phi, ns, nc;
fcore = (c, Δs) -> 1e-3,
spacing_s = Cosine(),
spacing_c = Uniform(),
interp_s = (x, y, xpt) -> linear_interpolation(x, y)(xpt))
interp_s = (x, y, xpt) -> FLOWMath.linear(x, y, xpt))

TF = promote_type(eltype(xle), eltype(yle), eltype(zle), eltype(chord), eltype(theta), eltype(phi))

Expand Down

0 comments on commit 6c29939

Please sign in to comment.