1 files changed, 5 insertions, 14 deletions
diff --git a/src/WaveToy.F90 b/src/WaveToy.F90
index ae52391..12c3df7 100644
--- a/src/WaveToy.F90
+++ b/src/WaveToy.F90
@@ -44,7 +44,7 @@ subroutine WaveToyFreeF90_Evolution(CCTK_ARGUMENTS)
   CCTK_REAL :: dx2i,dy2i,dz2i
 
   CCTK_REAL :: factor
-    
+  
   ! Set up shorthands
   ! -----------------
   dx = CCTK_DELTA_SPACE(1)
@@ -114,15 +114,7 @@ subroutine WaveToyFreeF90_Boundaries(CCTK_ARGUMENTS)
   DECLARE_CCTK_FUNCTIONS
   CCTK_INT Boundary_SelectVarForBC
   
-  integer :: ierr
-  integer, dimension(3):: sw(3)=1
-  CCTK_REAL, parameter :: zero = 0.0
-  CCTK_REAL, parameter :: one = 1.0
-  CCTK_REAL :: finf
-  integer :: npow
-
-  finf = 1.0d0
-  npow = 1
+  CCTK_INT :: ierr=0
 
 ! Apply the symmetry boundary conditions on any coordinate axes
 ! -------------------------------------------------------------
@@ -150,13 +142,12 @@ subroutine WaveToyFreeF90_Boundaries(CCTK_ARGUMENTS)
     ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, &
       "wavetoy::phi", "Scalar");
   else if (CCTK_EQUALS(bound,"none")) then
-!     Do nothing
-  else
-    call CCTK_WARN(0,"Unrecognized boundary condition")
+    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, &
+      "wavetoy::phi", "None");
   end if
 
   if (ierr < 0)  then
-     call CCTK_WARN(0,"WaveToyFreeF90_Boundaries: Boundary conditions not applied")
+     call CCTK_WARN(0,"WaveToyFreeF90_Boundaries: Error selecting boundary condition")
   end if
   
 end subroutine WaveToyFreeF90_Boundaries