diff options
| author | diener <diener@2a26948c-0e4f-0410-aee8-f1d3e353619c> | 2002-07-16 11:34:51 +0000 |
|---|---|---|
| committer | diener <diener@2a26948c-0e4f-0410-aee8-f1d3e353619c> | 2002-07-16 11:34:51 +0000 |
| commit | f3adc3d5aff47dc80faf51aa599cb39db551b4b1 (patch) | |
| tree | 9684cd553f13cad72e9d2f9dc6cb4cba1d9d30e1 /src/EHFinder_SetMask.F90 | |
| parent | 4d0eb05d70617777bbc3402021f662dfac1ba721 (diff) | |
Added checks to only modify the mask when reparametrization is actually done.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/EHFinder/trunk@35 2a26948c-0e4f-0410-aee8-f1d3e353619c
Diffstat (limited to 'src/EHFinder_SetMask.F90')
| -rw-r--r-- | src/EHFinder_SetMask.F90 | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/src/EHFinder_SetMask.F90 b/src/EHFinder_SetMask.F90 index 0f06e4d..cdba69c 100644 --- a/src/EHFinder_SetMask.F90 +++ b/src/EHFinder_SetMask.F90 @@ -79,11 +79,20 @@ subroutine EHFinder_SetMask1(CCTK_ARGUMENTS) active = .false. if ( mask_first ) active = .true. - if ( reparametrize_every_approx .gt. 0 ) then - if ( mod(cctk_iteration,reparametrize_every_approx) .eq. 0 ) active = .true. + + if ( CCTK_EQUALS(re_param_method,'approx') .or. & + CCTK_EQUALS(re_param_method,'mixed') ) then + if ( reparametrize_every_approx .gt. 0 ) then + if ( mod(cctk_iteration,reparametrize_every_approx) .eq. 0 ) then + active = .true. + end if + end if end if - if ( reparametrize_every_pde .gt. 0 ) then - if ( mod(cctk_iteration,reparametrize_every_pde) .eq. 0 ) active = .true. + if ( CCTK_EQUALS(re_param_method,'pde') .or. & + CCTK_EQUALS(re_param_method,'mixed') ) then + if ( reparametrize_every_pde .gt. 0 ) then + if ( mod(cctk_iteration,reparametrize_every_pde) .eq. 0 ) active = .true. + end if end if if ( active ) then @@ -156,7 +165,7 @@ subroutine EHFinder_SetMask1(CCTK_ARGUMENTS) where ( ( eh_mask(ixl:ixr,jyl:jyr,kzl:kzr) .ge. 0 ) .and. & ( f(ixl:ixr,jyl:jyr,kzl:kzr) .lt. -shell_width*delta ) ) eh_mask(ixl:ixr,jyl:jyr,kzl:kzr) = -1 - f(ixl:ixr,jyl:jyr,kzl:kzr) = zero + f(ixl:ixr,jyl:jyr,kzl:kzr) = ex_value end where ! where ( eh_mask(2:nx-1,2:ny-1,2:nz-1) .eq. -1 ) @@ -224,11 +233,19 @@ subroutine EHFinder_SetMask2(CCTK_ARGUMENTS) active = .false. if ( mask_first ) active = .true. - if ( reparametrize_every_approx .gt. 0 ) then - if ( mod(cctk_iteration,reparametrize_every_approx) .eq. 0 ) active = .true. + if ( CCTK_EQUALS(re_param_method,'approx') .or. & + CCTK_EQUALS(re_param_method,'mixed') ) then + if ( reparametrize_every_approx .gt. 0 ) then + if ( mod(cctk_iteration,reparametrize_every_approx) .eq. 0 ) then + active = .true. + end if + end if end if - if ( reparametrize_every_pde .gt. 0 ) then - if ( mod(cctk_iteration,reparametrize_every_pde) .eq. 0 ) active = .true. + if ( CCTK_EQUALS(re_param_method,'pde') .or. & + CCTK_EQUALS(re_param_method,'mixed') ) then + if ( reparametrize_every_pde .gt. 0 ) then + if ( mod(cctk_iteration,reparametrize_every_pde) .eq. 0 ) active = .true. + end if end if if ( active ) then |