diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/AHFinder.F | 7 | ||||
| -rw-r--r-- | src/AHFinder_dat.F | 1 | ||||
| -rw-r--r-- | src/AHFinder_flow.F | 38 |
3 files changed, 33 insertions, 13 deletions
diff --git a/src/AHFinder.F b/src/AHFinder.F index ffa4d25..ff65faf 100644 --- a/src/AHFinder.F +++ b/src/AHFinder.F @@ -1334,7 +1334,9 @@ open(1,file=areaf,form='formatted', . status='old',position='append') end if + if (status) write(1,"(2ES14.6)") cctk_time,intarea_h + close(1) ! Mass. @@ -1347,7 +1349,10 @@ open(1,file=massf,form='formatted', . status='old',position='append') end if - if (status) write(1,"(2ES14.6)") cctk_time,0.141047396D0*dsqrt(intarea_h) + + if (status) write(1,"(2ES14.6)") cctk_time, + . 0.141047396D0*dsqrt(intarea_h) + close(1) ! Circumferences. diff --git a/src/AHFinder_dat.F b/src/AHFinder_dat.F index da24e65..d43996e 100644 --- a/src/AHFinder_dat.F +++ b/src/AHFinder_dat.F @@ -126,6 +126,7 @@ ! interror1 Different from zero if radius is negative. ! interror2 Different from zero if outside computational domain. ! interror3 Different from zero if inside mask +! ! interror True if any of the 3 errors above are non-zero. ! ! find3 Look for 3 horizons? 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 |