aboutsummaryrefslogtreecommitdiff
path: root/src/AHFinder_flow.F
diff options
context:
space:
mode:
Diffstat (limited to 'src/AHFinder_flow.F')
-rw-r--r--src/AHFinder_flow.F38
1 files changed, 26 insertions, 12 deletions
diff --git a/src/AHFinder_flow.F b/src/AHFinder_flow.F
index ed26f42..0a862ed 100644
--- a/src/AHFinder_flow.F
+++ b/src/AHFinder_flow.F
@@ -168,26 +168,38 @@
if (interror.and.(j.eq.1)) then
-! We can be out of bounds for two reasons:
+! We can be out of bounds for three reasons:
-! a) We are out of the computational domain, pitty.
+! a) The radius is negative somewhere. This can mean
+! one of two things:
+!
+! * There is no horizon, and the flow has reached
+! the origin.
+!
+! * The origin for our expansion is outside the horizon.
+! This can happen if the black-hole is not centered,
+! or if we have more than one horizon.
- if (interror2.ne.0) then
+ if (interror1.ne.0) then
+
+ write(*,*)
+ write(*,*) 'AHFinder: Negative radius.'
+ return
+
+! b) We are out of the computational domain, pitty.
+
+ else if (interror2.ne.0) then
write(*,*)
write(*,*) 'AHFinder: Out of bounds, giving up.'
return
-! b) The radius is negative somewhere. This is a really
-! interesting case, since it probably means that the
-! origin of our expansion is outside the horizon.
-! This can happen is the black-hole is not centered,
-! or if we have more than one horizon.
+! c) We are inside the mask.
- else if (interror1.ne.0) then
+ else if (interror3.ne.0) then
write(*,*)
- write(*,*) 'AHFinder: Negative radius.'
+ write(*,*) 'AHFinder: Inside mask, giving up.'
return
! We should never get here!
@@ -209,10 +221,12 @@
else if (interror) then
interror = .false.
+
reldiff = one
- ahfsum = one
- ahfdiff = one
+ ahfsum = one
+ ahfdiff = one
intexp2 = one
+
goto 100
end if