diff options
| author | diener <diener@2a26948c-0e4f-0410-aee8-f1d3e353619c> | 2004-06-22 13:23:06 +0000 |
|---|---|---|
| committer | diener <diener@2a26948c-0e4f-0410-aee8-f1d3e353619c> | 2004-06-22 13:23:06 +0000 |
| commit | 3651083015d1ac75c649a3606af9741e89744ba5 (patch) | |
| tree | b1d6b481a20e0410ad28d15c0daeb031d5aba646 | |
| parent | ce3d4f6c28b7a9f4ff1596bcb998815dc685e0d6 (diff) | |
Changed from cctk_delta_space to CCTK_DELTA_SPACE. To work with Carpet.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/EHFinder/trunk@175 2a26948c-0e4f-0410-aee8-f1d3e353619c
| -rw-r--r-- | src/EHFinder_Check.F90 | 4 | ||||
| -rw-r--r-- | src/EHFinder_Init.F90 | 8 | ||||
| -rw-r--r-- | src/EHFinder_Sources.F90 | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/EHFinder_Check.F90 b/src/EHFinder_Check.F90 index 81d3413..0d391fe 100644 --- a/src/EHFinder_Check.F90 +++ b/src/EHFinder_Check.F90 @@ -83,7 +83,9 @@ subroutine EHFinder_ReInitialize_Check(CCTK_ARGUMENTS) ! If the local extremum indicate and imminent pinch off undo the ! re-initialization if this is requested by the user. if ( re_init_undo .gt. 0 ) then - if ( fmin_extremum .gt. -two * minval(cctk_delta_space) ) then + if ( fmin_extremum .gt. -two * min ( CCTK_DELTA_SPACE(1), & + CCTK_DELTA_SPACE(2), & + CCTK_DELTA_SPACE(3) ) ) then write(info_message,'(a45,i3,a33)') & 'Re-initialization of level set ', l, & ' undone due to imminent pinch-off' diff --git a/src/EHFinder_Init.F90 b/src/EHFinder_Init.F90 index 478839f..10888d8 100644 --- a/src/EHFinder_Init.F90 +++ b/src/EHFinder_Init.F90 @@ -278,11 +278,11 @@ subroutine EHFinder_Init(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_FUNCTIONS -! Set up the value used in interiour inactive cells. - ex_value = - ( one + shell_width ) * maxval(cctk_delta_space) - ! Find the maximal grid spacing. - delta = maxval ( cctk_delta_space ) + delta = max ( CCTK_DELTA_SPACE(1), CCTK_DELTA_SPACE(2), CCTK_DELTA_SPACE(3) ) + +! Set up the value used in interiour inactive cells. + ex_value = - ( one + shell_width ) * delta ! Get handles for various reduction operations. call CCTK_ReductionArrayHandle ( max_handle, 'maximum' ) diff --git a/src/EHFinder_Sources.F90 b/src/EHFinder_Sources.F90 index 86a77ed..c59bf39 100644 --- a/src/EHFinder_Sources.F90 +++ b/src/EHFinder_Sources.F90 @@ -17,7 +17,7 @@ subroutine EHFinder_Sources(CCTK_ARGUMENTS) DECLARE_CCTK_FUNCTIONS CCTK_INT :: i, j, k, l - CCTK_REAL :: idx, idy, idz, mdelta + CCTK_REAL :: idx, idy, idz CCTK_REAL :: a, b, c CCTK_REAL :: gxxc, gxyc, gxzc, gyyc, gyzc, gzzc, psito4 CCTK_REAL :: idetg, alp2, tmp1, tmp2, tmp3 @@ -30,11 +30,9 @@ subroutine EHFinder_Sources(CCTK_ARGUMENTS) #include "include/physical_part.h" ! calculate 1/(2*delta) in each direction - idx = half / cctk_delta_space(1) - idy = half / cctk_delta_space(2) - idz = half / cctk_delta_space(3) - - mdelta = maxval ( cctk_delta_space ) + idx = half / CCTK_DELTA_SPACE(1) + idy = half / CCTK_DELTA_SPACE(2) + idz = half / CCTK_DELTA_SPACE(3) ! Set the sign depending on the surface direction. if ( CCTK_EQUALS ( surface_direction, 'outward' ) ) ssign = one |