aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorallen <allen@b7a48df3-cbbf-4440-997f-b4b717c9f7fc>2002-05-04 08:29:43 +0000
committerallen <allen@b7a48df3-cbbf-4440-997f-b4b717c9f7fc>2002-05-04 08:29:43 +0000
commit1dac5afe40950029bf9602f90adf2b10814fe4fd (patch)
treeb675a72b0b1185eb60cba5a3586097a778e0e203
parent585a774f1c79de35f9906a70b6cf3a16528d7cd3 (diff)
ADMConstraints has to inherit from SpaceMask in case of excision
New arrangement names in ifdefs git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMConstraints/trunk@64 b7a48df3-cbbf-4440-997f-b4b717c9f7fc
-rw-r--r--interface.ccl2
-rw-r--r--src/ADMConstraints.F4
2 files changed, 3 insertions, 3 deletions
diff --git a/interface.ccl b/interface.ccl
index 3ad3737..0cb0b2d 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -1,7 +1,7 @@
# Interface definition for thorn ADMConstraints
implements: admconstraints
-inherits: ADMBase, StaticConformal
+inherits: ADMBase, StaticConformal, SpaceMask
USES INCLUDE: CalcTmunu.inc
USES INCLUDE: CalcTmunu_temps.inc
diff --git a/src/ADMConstraints.F b/src/ADMConstraints.F
index fa2da4e..e6a957b 100644
--- a/src/ADMConstraints.F
+++ b/src/ADMConstraints.F
@@ -37,7 +37,7 @@
integer :: i,j,k
integer :: nx,ny,nz
-#ifdef EXCISION_LEGOEXCISION
+#ifdef EXCISION2_LEGOEXCISION /* EINSTEIN REVAMP */
CCTK_REAL, allocatable, dimension (:,:,:) :: dirx,diry,dirz,aux
#endif
@@ -224,7 +224,7 @@ c LegoExcision (must be done before symmetries are applied).
if (excise==1) then
-#ifdef EXCISION_LEGOEXCISION
+#ifdef EXCISION2_LEGOEXCISION /* EINSTEIN REVAMP */
allocate(dirx(nx,ny,nz),diry(nx,ny,nz),dirz(nx,ny,nz))
allocate(aux(nx,ny,nz))