Prevent extrapolation in solve

ProjectTorreyPines · Jan 29, 2024 · 376c480 · 376c480
1 parent 63fa0cf
commit 376c480
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/shot.jl b/src/shot.jl
@@ -285,8 +285,7 @@ end
 
 
 function (shot::Shot)(r, z; extrapolate::Bool=false)
-    ρ, θ = ρθ_RZ(shot, r, z)
-    !extrapolate && (ρ = min(ρ, 1.0))
+    ρ, θ = ρθ_RZ(shot, r, z; extrapolate)
     return psi_ρθ(shot, ρ, θ)
 end
 

diff --git a/src/surfaces.jl b/src/surfaces.jl
@@ -180,16 +180,14 @@ function Δ(shot, ρ, R, Z; tid = Threads.threadid())
     return Δ
 end
 
-function ρθ_RZ(shot, R, Z)
+function ρθ_RZ(shot, R, Z; extrapolate::Bool=false)
     f = x -> Δ(shot, x, R, Z)
     if f(1.0) >= 0.0
         ρ = Roots.find_zero(f, (0,1), Roots.A42())
     else
-        ρ = Roots.find_zero(f, 1.0)
+        ρ = extrapolate ? Roots.find_zero(f, 1.0) : 1.0
     end
-    #ρ = f(1.0) < 0.0 ? 1.0 : Roots.find_zero(f, 0.5)#(0,1), Roots.A42())
     θ, _ = (ρ == 0.0) ? (0.0, 0.0)  : θ_at_RZ(shot, ρ, R, Z)
-    #println((ρ, θ))
     return ρ, θ
 end