Merge pull request #8 from CuberYyc808/generic_plunge

add kerr_geo_emri

Author: CuberYyc808

src/KerrGeoOrbit.jl

@@ -64,6 +64,8 @@ function kerr_geo_orbit_circular(a::Float64, p::Float64, e::Float64=0.0, x::Floa
         "Frequencies" => Dict("ϒt" => ϒt, "ϒr" => ϒr, "ϒθ" => ϒθ, "ϒϕ" => ϒϕ),
         "Trajectory" => [t, r, θ, ϕ],
         "FourVelocity" => velocity,
+        "CrossFunction" => nothing,
+        "DerivativesCrossFunction" => nothing,
         "a" => a,
         "p" => p,
         "e" => e,

src/KerrGeodesics.jl

@@ -63,7 +63,6 @@ Orbit_Type(a::Real, p::Real, e::Real, x::Real) = kerr_geo_orbit_type(a, p, e, x)
 
 Kerr_Geodesics(a::Real, p::Real, e::Real, x::Real; initPhases = (0.0, 0.0, 0.0, 0.0)) = kerr_geo_orbit(a, p, e, x; initPhases = initPhases)
 
-
 struct KerrGeoEMRI
     OrbitalType::Vector{String}
     OrbitalParameters::NamedTuple
@@ -79,13 +78,13 @@ end
 
 function Base.show(io::IO, ::MIME"text/plain", kg::KerrGeoEMRI)
     println(io, "KerrGeoEMRI(")
-    print(io, "    OrbitalType="); show(io, kg.OrbitalType); println(io, ",")
-    print(io, "    OrbitalParameters="); show(io, kg.OrbitalParameters); println(io, ",")
-    print(io, "    ConstantsOfMotion="); show(io, kg.ConstantsOfMotion); println(io, ",")
-    print(io, "    Parametrization="); show(io, kg.Parametrization); println(io, ",")
-    print(io, "    Trajectory="); show(io, kg.Trajectory); println(io, ",")
-    print(io, "    InitialPhases="); show(io, kg.InitialPhases); println(io, ",")
-    print(io, "    Frequencies="); show(io, kg.Frequencies); println(io, ",")
+    print(io, "    OrbitalParameters = "); show(io, kg.OrbitalParameters); println(io, ",")
+    print(io, "    ConstantsOfMotion = "); show(io, kg.ConstantsOfMotion); println(io, ",")
+    print(io, "    OrbitalType = "); show(io, kg.OrbitalType); println(io, ",")
+    print(io, "    Frequencies = "); show(io, kg.Frequencies); println(io, ",")
+    print(io, "    Parametrization = "); show(io, kg.Parametrization); println(io, ",")
+    print(io, "    Trajectory = (t = t(λ), r = r(λ), θ = θ(λ), ϕ = ϕ(λ))"); println(io, ",")
+    print(io, "    InitialPhases = "); show(io, kg.InitialPhases); println(io, ",")
     print(io, ")")
 end
 
@@ -109,32 +108,44 @@ function kerr_geo_emri(a::Real, p::Real, e::Real, x::Real; initPhases = (0.0, 0.
     ϒθ = freqs["ϒθ"]
     ϒϕ = freqs["ϒϕ"]
     # Cross functions
-    Δtr = KG["CrossFunction"][1]
-    Δtθ = KG["CrossFunction"][2]
-    Δϕr = KG["CrossFunction"][3]
-    Δϕθ = KG["CrossFunction"][4]
+    if KG["CrossFunction"] !== nothing
+        Δtr = KG["CrossFunction"][1]
+        Δtθ = KG["CrossFunction"][2]
+        Δϕr = KG["CrossFunction"][3]
+        Δϕθ = KG["CrossFunction"][4]
+    else
+        Δtr = nothing
+        Δtθ = nothing
+        Δϕr = nothing
+        Δϕθ = nothing
+    end
     # Derivatives of cross functions
-    dtr = KG["DerivativesCrossFunction"][1]
-    dtθ = KG["DerivativesCrossFunction"][2]
-    dϕr = KG["DerivativesCrossFunction"][3]
-    dϕθ = KG["DerivativesCrossFunction"][4]
+    if KG["DerivativesCrossFunction"] !== nothing
+        dtr = KG["DerivativesCrossFunction"][1]
+        dtθ = KG["DerivativesCrossFunction"][2]
+        dϕr = KG["DerivativesCrossFunction"][3]
+        dϕθ = KG["DerivativesCrossFunction"][4]
+    else
+        dtr = nothing
+        dtθ = nothing
+        dϕr = nothing
+        dϕθ = nothing
+    end
     # Four-velocity
-    velocity = Four_Velocity(a, p, e, x; initPhases=initPhases, Covariant=false, Parametrization="Mino")
+    ut, ur, uθ, uϕ = KG["FourVelocity"]
 
     return KerrGeoEMRI(
         otype,
         (a=a, p=p, e=e, x=x),
         (E=En, Lz=L, Q=Q),
         "Mino",
         (t=t, r=r, θ=θ, ϕ=ϕ),
-        (qr0=initPhases[1], qθ0=initPhases[2]),
-        (ut=velocity[1], ur=velocity[2], uθ=velocity[3], uϕ=velocity[4]),
+        (qt0 = initPhases[1], qr0=initPhases[2], qθ0=initPhases[3], qϕ0=initPhases[4]),
+        (ut=ut, ur=ur, uθ=uθ, uϕ=uϕ),
         (ϒt=ϒt, ϒr=ϒr, ϒθ=ϒθ, ϒϕ=ϒϕ),
         (Δtr=Δtr, Δtθ=Δtθ, Δϕr=Δϕr, Δϕθ=Δϕθ),
         (dtr=dtr, dtθ=dtθ, dϕr=dϕr, dϕθ=dϕθ)
     )
 end
 
-
-
 end