Merge pull request #224 from astro-group-bristol/fergus/cleanup

Remove Voronoi tessellation code

Author: fjebaker

Project.toml

@@ -27,7 +27,6 @@ SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 Tullio = "bc48ee85-29a4-5162-ae0b-a64e1601d4bc"
-VoronoiCells = "e3e34ffb-84e9-5012-9490-92c94d0c60a4"
 
 [weakdeps]
 DiffEqGPU = "071ae1c0-96b5-11e9-1965-c90190d839ea"

docs/src/emissivity.md

@@ -55,12 +55,6 @@ sample_position_velocity
 RadialDiscProfile
 ```
 
-## Voronoi disc profile
-
-```@docs
-VoronoiDiscProfile
-```
-
 ## Emissivity profile algorithms
 
 In this case, we must be careful to weight the emissivity accordingly:

src/Gradus.jl

@@ -14,7 +14,6 @@ using DiffEqCallbacks
 using StaticArrays
 using Optim
 using DataInterpolations
-using VoronoiCells
 using Roots
 import SimpleNonlinearSolve
 using ProgressMeter
@@ -338,10 +337,23 @@ end
 """
     AbstractDiscProfile
 
-Abstract type for binning structures over discs (e.g., radial bins, voronoi).
+Abstract type for binning structures over discs.
 """
 abstract type AbstractDiscProfile end
 
+emissivity_at(prof::AbstractDiscProfile, ::AbstractGeodesicPoint) =
+    error("Not implemented for $(typeof(prof))")
+
+coordtime_at(prof::AbstractDiscProfile, ::AbstractGeodesicPoint) =
+    error("Not implemented for $(typeof(prof))")
+
+emissivity_at(prof::AbstractDiscProfile, v::AbstractArray) =
+    map(i -> emissivity_at(prof, i), v)
+coordtime_at(prof::AbstractDiscProfile, v::AbstractArray) =
+    map(i -> coordtime_at(prof, i), v)
+
+export emissivity_at, coordtime_at
+
 """
     abstract type AbstractCoronaModel{T}
 
@@ -494,7 +506,8 @@ include("transfer-functions/integration.jl")
 
 include("corona/samplers.jl")
 include("corona/corona-models.jl")
-include("corona/disc-profiles.jl")
+include("corona/radial.jl")
+include("corona/analytic.jl")
 # needs the types from disc profiles so defer include
 include("transfer-functions/transfer-functions-2d.jl")
 include("corona/flux-calculations.jl")

src/corona/profiles/analytic.jl src/corona/analytic.jlsrc/corona/profiles/analytic.jl renamed to src/corona/analytic.jl

@@ -128,7 +128,7 @@ local to global coordinates.
 This function assumes axis symmetry, and therefore always interpolates the
 emissivity as a function of the radial coordinate on the disc. If non-symmetric
 profiles are desired, consider using [`tracecorona`](@ref) with a profile
-constructor, e.g. [`VoronoiDiscProfile`](@ref).
+constructor.
 """
 function emissivity_profile(
     m::AbstractMetric{T},

src/corona/disc-profiles.jl

@@ -111,14 +111,4 @@ function energy_ratio(m::AbstractMetric, gp::GeodesicPoint, v_src, v_disc)
     e_src / e_disc
 end
 
-function flux_source_to_disc(
-    m::AbstractMetric,
-    model::AbstractCoronaModel,
-    vdp::VoronoiDiscProfile;
-    kwargs...,
-)
-    areas = getareas(vdp)
-    flux_source_to_disc(m, model, vdp.geodesic_points, areas; kwargs...)
-end
-
 export flux_source_to_disc