Fix typo in comment

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMConstraints/trunk@95 b7a48df3-cbbf-4440-997f-b4b717c9f7fc

3 files changed, 37 insertions, 4 deletions

diff --git a/interface.ccl b/interface.ccl
index 2a81a01..cd778ac 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -29,7 +29,7 @@ real hamiltonian type=GF tags='tensortypealias="Scalar"'
 real normalized_hamiltonian type=GF  tags='tensortypealias="Scalar"'
 {
   hamnormalized
-} "Normalized hamiltonian constraint""
+} "Normalized hamiltonian constraint"
 
 real momentum type=GF tags='tensortypealias="U"'
 {
diff --git a/schedule.ccl b/schedule.ccl
index 30e5fdf..aede05b 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -23,12 +23,24 @@ if (constraints_persist)
   schedule ADMConstraints at CCTK_POSTSTEP
   {
     LANG: Fortran
+    SYNC: hamiltonian, normalized_hamiltonian, momentum
   } "Evaluate ADM constraints for use in other routines"
 
   schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs at CCTK_POSTSTEP after ADMConstraints
   {
     SYNC: hamiltonian, normalized_hamiltonian, momentum
   } "Apply (symmetry) boundary conditions"
+
+  STORAGE: hamiltonian, normalized_hamiltonian, momentum
+  schedule ADMConstraints at POSTRESTRICT
+  {
+    LANG: Fortran
+    SYNC: hamiltonian, normalized_hamiltonian, momentum
+  } "Evaluate ADM constraints for use in other routines"
+
+  schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs at POSTRESTRICT after ADMConstraints
+  {
+  } "Apply (symmetry) boundary conditions"
 }
 else
 {
@@ -42,6 +54,7 @@ else
   schedule ADMConstraints in ADMConstraintsGroup
   {		
     LANG: Fortran
+    SYNC: hamiltonian, normalized_hamiltonian, momentum
   } "Evaluate ADM constraints"
 
   schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs in ADMConstraintsGroup after ADMConstraints
diff --git a/src/ADMConstraints.F b/src/ADMConstraints.F
index 8bf3116..87a27a5 100644
--- a/src/ADMConstraints.F
+++ b/src/ADMConstraints.F
@@ -118,7 +118,7 @@ c     Calculate constraints.
                docalc = .TRUE.
 
                if (use_mask .eq. 1) then
-                  if (emask(i,j,k) .ne. 1) then
+                  if (abs(emask(i,j,k) - 1) < 0.001) then
                      docalc = .FALSE.
                   end if
                end if
@@ -261,13 +261,33 @@ c                     = - (T_{i0} - beta^j T_{ij})/alpha
 c     Apply symmetry boundary conditions.
 
       call CartSymGN(ierr,cctkGH,"admconstraints::hamiltonian")
+      call CartSymGN(ierr,cctkGH,"admconstraints::normalized_hamiltonian")
       call CartSymGN(ierr,cctkGH,"admconstraints::momentum")
 
 c     Apply flat boundary conditions at outer boundaries.
 
       if (CCTK_Equals(bound,"flat") == 1) then
-         call BndFlatGN(ierr,cctkGH,sw,"admconstraints::hamiltonian")
-         call BndFlatGN(ierr,cctkGH,sw,"admconstraints::momentum")
+         ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 0, -1,
+     $        "admconstraints::hamiltonian", "Flat")
+         ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 0, -1,
+     $        "admconstraints::normalized_hamiltonian", "Flat")
+         ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 0, -1,
+     $        "admconstraints::momentum", "Flat")
+      else
+         ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 0, -1,
+     $        "admconstraints::hamiltonian", "None")
+         ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 0, -1,
+     $        "admconstraints::normalized_hamiltonian", "None")
+         ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 0, -1,
+     $        "admconstraints::momentum", "None")
+      end if
+
+c     Synchronize.
+
+      if (constraint_communication.eq.1) then
+         call CCTK_SyncGroup(ierr,cctkGH,"admconstraints::hamiltonian")
+         call CCTK_SyncGroup(ierr,cctkGH,"admconstraints::normalized_hamiltonian")
+         call CCTK_SyncGroup(ierr,cctkGH,"admconstraints::momentum")
       end if
 
 c     Cartoon.