Give people more choice for what kind of Minkowski they want.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/NoExcision/trunk@3 4ec1db94-0e4f-0410-ada3-8bed251432c9

2 files changed, 24 insertions, 14 deletions

diff --git a/param.ccl b/param.ccl
index ce5c85d..3debb67 100644
--- a/param.ccl
+++ b/param.ccl
@@ -5,22 +5,32 @@ BOOLEAN verbose "Produce some screen output"
 {
 } "no"
 
-BOOLEAN overwrite_geometry "Set the geometry to Minkowski"
+INT num_regions "Number of no-excision regions"
 {
-} "yes"
+  0:10 :: ""
+} 0
 
-BOOLEAN overwrite_lapse "Set the lapse to one"
+BOOLEAN overwrite_geometry[10] "Set the geometry to Minkowski"
 {
 } "yes"
 
-BOOLEAN overwrite_shift "Set the shift to zero"
+REAL Minkowski_scale[10] "Scaling factor for Minkowski"
+{
+  (*:*) :: "Choose 1 for true Minkowski"
+} 1.0
+
+BOOLEAN overwrite_lapse[10] "Set the lapse to one"
 {
 } "yes"
 
-INT num_regions "Number of no-excision regions"
+REAL lapse_scale[10] "Scaling factor for lapse"
 {
-  0:10 :: ""
-} 0
+  (*:*) :: "Choose 1 for geodesic slicing, 0 to halt evolution"
+} 1.0
+
+BOOLEAN overwrite_shift[10] "Set the shift to zero"
+{
+} "yes"
 
 REAL centre_x[10] "X-coordinate of the centre of the region"
 {
diff --git a/src/overwrite.F90 b/src/overwrite.F90
index c7949ae..87cd534 100644
--- a/src/overwrite.F90
+++ b/src/overwrite.F90
@@ -21,7 +21,7 @@ subroutine NoExcision_Overwrite (CCTK_ARGUMENTS)
      cz = centre_z(n)
      rad = radius(n)
      
-     if (overwrite_geometry /= 0) then
+     if (overwrite_geometry(n) /= 0) then
         
         if (conformal_state >= 1) then
            where ((x - cx)**2 + (y - cy)**2 + (z - cz)**2 <= rad**2)
@@ -47,12 +47,12 @@ subroutine NoExcision_Overwrite (CCTK_ARGUMENTS)
         end if
         
         where ((x - cx)**2 + (y - cy)**2 + (z - cz)**2 <= rad**2)
-           gxx = 1
+           gxx = Minkowski_scale(n)
            gxy = 0
            gxz = 0
-           gyy = 1
+           gyy = Minkowski_scale(n)
            gyz = 0
-           gzz = 1
+           gzz = Minkowski_scale(n)
            kxx = 0
            kxy = 0
            kxz = 0
@@ -63,15 +63,15 @@ subroutine NoExcision_Overwrite (CCTK_ARGUMENTS)
         
      end if
      
-     if (overwrite_lapse /= 0) then
+     if (overwrite_lapse(n) /= 0) then
         
         where ((x - cx)**2 + (y - cy)**2 + (z - cz)**2 <= rad**2)
-           alp = 1
+           alp = lapse_scale(n)
         end where
         
      end if
         
-     if (overwrite_shift /= 0) then
+     if (overwrite_shift(n) /= 0) then
         
         if (shift_state /= 0) then
            where ((x - cx)**2 + (y - cy)**2 + (z - cz)**2 <= rad**2)