Taking out ccthgh

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/LegoExcision/trunk@9 f75ba9e5-694f-0410-ac2c-87ea7ce7132b

2 files changed, 11 insertions, 14 deletions

diff --git a/src/extrapolate.F90 b/src/extrapolate.F90
index b9b0b99..3a2e238 100644
--- a/src/extrapolate.F90
+++ b/src/extrapolate.F90
@@ -9,8 +9,8 @@
 
 #include "maskvalues.h"
 
-subroutine excision_extrapolate (ierr, cctkgh, var, oldvar, &
-     mask, dirx, diry, dirz, ni, nj, nk)
+subroutine excision_extrapolate (ierr, var, oldvar, &
+     mask, dirx, diry, dirz, ni, nj, nk, var0)
   
   implicit none
   
@@ -21,10 +21,10 @@ subroutine excision_extrapolate (ierr, cctkgh, var, oldvar, &
   
   ! out: zero for success, nonzero for error
   integer      :: ierr
-  
-  ! in: pointer to Cactus GH
-  CCTK_POINTER :: cctkgh
-  
+
+  ! in: value of var inside mask.
+  CCTK_REAL    :: var0
+
   ! in: array sizes for grid functions
   !     (you can pass in cctk_lsh(:) for these)
   integer      :: ni,nj,nk
@@ -40,7 +40,7 @@ subroutine excision_extrapolate (ierr, cctkgh, var, oldvar, &
   
   ! in: normal directions to use for interpolation
   CCTK_REAL    :: dirx(ni,nj,nk), diry(ni,nj,nk), dirz(ni,nj,nk)
-  
+
   integer i,j,k
   integer ii,jj,kk
   
@@ -52,6 +52,8 @@ subroutine excision_extrapolate (ierr, cctkgh, var, oldvar, &
               jj = j + diry(i,j,k)
               kk = k + dirz(i,j,k)
               var(i,j,k) = oldvar(i,j,k) + var(ii,jj,kk) - oldvar(ii,jj,kk)
+           else if (mask(i,j,k)==MASK_EXCISED) then
+              var(i,j,k) = var0
            end if
         end do
      end do
diff --git a/src/findnormals.F90 b/src/findnormals.F90
index df0ae69..d34f25a 100644
--- a/src/findnormals.F90
+++ b/src/findnormals.F90
@@ -8,8 +8,7 @@
 
 #include "maskvalues.h"
 
-subroutine excision_findnormals (ierr, cctkgh, mask, &
-     dirx, diry, dirz, ni, nj, nk)
+subroutine excision_findnormals (ierr, mask, dirx, diry, dirz, ni, nj, nk)
 
   implicit none
 
@@ -21,9 +20,6 @@ subroutine excision_findnormals (ierr, cctkgh, mask, &
   ! out: zero for success, nonzero for error
   integer      :: ierr
   
-  ! in: pointer to Cactus GH
-  CCTK_POINTER :: cctkgh
-  
   ! in: array sizes for grid functions
   !     (you can pass in cctk_lsh(:) for these)
   integer      :: ni,nj,nk
@@ -34,8 +30,7 @@ subroutine excision_findnormals (ierr, cctkgh, mask, &
   ! out: normal directions to use for interpolation
   CCTK_REAL    :: dirx(ni,nj,nk), diry(ni,nj,nk), dirz(ni,nj,nk)
   
-  
-  
+
   ! distinguish between faces, edges, and corners.
   
   ! look at the excised points, and distinguish the following cases,