diff options
| author | miguel <miguel@89daf98e-ef62-4674-b946-b8ff9de2216c> | 2000-03-30 13:21:34 +0000 |
|---|---|---|
| committer | miguel <miguel@89daf98e-ef62-4674-b946-b8ff9de2216c> | 2000-03-30 13:21:34 +0000 |
| commit | dfe345f3390afd8c13d3b41751a121034a61a928 (patch) | |
| tree | 52458178ec7f450e910a5561587928d26d327ac4 /src/AHFinder_int.F | |
| parent | c7d6528c61ff2f174ee35628f407859d4b0fae4a (diff) | |
Changes to error having to do with being inside the mask, plus other small
changes.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinder/trunk@61 89daf98e-ef62-4674-b946-b8ff9de2216c
Diffstat (limited to 'src/AHFinder_int.F')
| -rw-r--r-- | src/AHFinder_int.F | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/AHFinder_int.F b/src/AHFinder_int.F index ac2ad42..ae278a9 100644 --- a/src/AHFinder_int.F +++ b/src/AHFinder_int.F @@ -561,10 +561,10 @@ interror = .false. if ((interror1.ne.0).or.(interror2.ne.0)) then - intexp = 1.0D+10 - intexp2 = 1.0D+10 - intexpdel2 = 1.0D+10 - intarea = 1.0D+10 + intexp = 1.0D10 + intexp2 = 1.0D10 + intarea = 1.0D10 + intexpdel2 = 1.0D10 interror = .true. goto 10 end if @@ -590,7 +590,7 @@ ! Check if we are either inside mask, or to close for comfort. - if ((ahf_mask.eq.1).or.(ahf_weakmask.eq.1)) then + if (.not.CCTK_EQUALS(ahf_mask,'off')) then interror3 = 0 @@ -609,11 +609,10 @@ interror3 = red_tmp if (interror3.ne.0) then - print *,'Inside mask' - intexp = 1.0D+10 - intexp2 = 1.0D+10 - intexpdel2 = 1.0D+10 - intarea = 1.0D+10 + intexp = 1.0D10 + intexp2 = 1.0D10 + intarea = 1.0D10 + intexpdel2 = 1.0D10 interror = .true. goto 10 end if @@ -743,8 +742,8 @@ ! at each cell centre by an average of the values at the ! four cell corners, and then add up all cells. - inside_min_count = 0.0d0 - inside_min_neg_count = 0.0d0 + inside_min_count = 0 + inside_min_neg_count = 0 do j=0,l_nphi-1 do i=0,l_ntheta-1 @@ -771,13 +770,13 @@ . + da(i ,j+1)*(exp(i ,j+1)+trapped_surface_delta)**2 . + da(i+1,j+1)*(exp(i+1,j+1)+trapped_surface_delta)**2) - inside_min_count = inside_min_count + 1.0d0 + inside_min_count = inside_min_count + 1 if ((exp(i ,j ) .le. 0.0d0) .and. . (exp(i+1,j ) .le. 0.0d0) .and. . (exp(i ,j+1) .le. 0.0d0) .and. . (exp(i+1,j+1) .le. 0.0d0)) then - inside_min_neg_count = inside_min_neg_count + 1.0d0 + inside_min_neg_count = inside_min_neg_count + 1 endif end do @@ -953,12 +952,12 @@ ! negative expansion elements on surface call CCTK_ReduceLocalScalar(ierror,cctkGH,-1,reduction_handle, - . inside_min_neg_count,aux,CCTK_VARIABLE_REAL) - inside_min_neg_count=aux + . inside_min_neg_count,auxi,CCTK_VARIABLE_INT) + inside_min_neg_count=auxi call CCTK_ReduceLocalScalar(ierror,cctkGH,-1,reduction_handle, - . inside_min_count,aux,CCTK_VARIABLE_REAL) - inside_min_count=aux + . inside_min_count,auxi,CCTK_VARIABLE_INT) + inside_min_count=auxi ! Spectral components for flow. |