Remove all references to the approximation reparametrization and changed

re_param to re_init.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/EHFinder/trunk@136 2a26948c-0e4f-0410-aee8-f1d3e353619c

1 files changed, 12 insertions, 45 deletions

diff --git a/src/EHFinder_SetMask.F90 b/src/EHFinder_SetMask.F90
index 40f057d..566f654 100644
--- a/src/EHFinder_SetMask.F90
+++ b/src/EHFinder_SetMask.F90
@@ -93,23 +93,12 @@ subroutine EHFinder_SetMask1(CCTK_ARGUMENTS)
 
 ! If re-parametrization has just been done, we should reset the mask so we
 ! set 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 ( 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
+  if ( re_initialize_every .gt. 0 ) then
+    if ( mod(cctk_iteration,re_initialize_every) .eq. 0 ) active = .true.
   end if
 
 ! If the reparametrization was not undone...
-  if ( active .and. .not. all(reparam_undone) ) then
+  if ( active .and. .not. all(re_initialize_undone) ) then
 
 !   Get the minimum and maximum index excluding ghost and symmetry cells.
 # include "include/physical_part.h"
@@ -120,7 +109,7 @@ subroutine EHFinder_SetMask1(CCTK_ARGUMENTS)
       tm_mask(ixl:ixr,jyl:jyr,kzl:kzr,l) = eh_mask(ixl:ixr,jyl:jyr,kzl:kzr,l)
       ftmp(ixl:ixr,jyl:jyr,kzl:kzr,l) = f(ixl:ixr,jyl:jyr,kzl:kzr,l)
 
-      not_undone: if ( .not. reparam_undone(l) ) then
+      not_undone: if ( .not. re_initialize_undone(l) ) then
 
 !     Next we try to locate the minimum and maximum of the global indeces of
 !     the currently active cells giving us the smallest rectangular box
@@ -765,23 +754,12 @@ subroutine EHFinder_SetMask2(CCTK_ARGUMENTS)
 ! If re-parametrization has just been done, we are in the process of
 ! resetting the mask so we set active=.true.
   if ( mask_first ) 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 ( 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
+  if ( re_initialize_every .gt. 0 ) then
+    if ( mod(cctk_iteration,re_initialize_every) .eq. 0 ) active = .true.
   end if
 
 ! If the reparametrization was not undone...
-  if ( active .and. .not. all(reparam_undone) ) then
+  if ( active .and. .not. all(re_initialize_undone) ) then
 
 ! Get the minimum and maximum index excluding ghost and symmetry cells.
 # include "include/physical_part.h"
@@ -798,7 +776,7 @@ subroutine EHFinder_SetMask2(CCTK_ARGUMENTS)
 !     Initialize the temporary mask to zero.
       tm_mask(ixl:ixr,jyl:jyr,kzl:kzr,l) = 0
 
-      if ( .not. reparam_undone(l) ) then
+      if ( .not. re_initialize_undone(l) ) then
 
 !       We loop over all points and adjust the mask if the point is
 !       on the excision boundary.
@@ -879,23 +857,12 @@ subroutine EHFinder_SetMask3(CCTK_ARGUMENTS)
 ! If re-parametrization has just been done, we are in the process of
 ! resetting the mask so we set active=.true.
   if ( mask_first ) 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 ( 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
+  if ( re_initialize_every .gt. 0 ) then
+    if ( mod(cctk_iteration,re_initialize_every) .eq. 0 ) active = .true.
   end if
 
 ! If the reparametrization was not undone...
-  if ( active .and. .not. all(reparam_undone) ) then
+  if ( active .and. .not. all(re_initialize_undone) ) then
 
     mask_modified = .false.
 # include "include/physical_part.h"
@@ -911,7 +878,7 @@ subroutine EHFinder_SetMask3(CCTK_ARGUMENTS)
     do l = 1, eh_number_level_sets
       tm_mask(:,:,:,l) = eh_mask(:,:,:,l)
 
-      if ( .not. reparam_undone(l) ) then
+      if ( .not. re_initialize_undone(l) ) then
 
         do k = kzl, kzr
           do j = jyl, jyr