Re-instating "zero" as a boundary value, but changed C code to convert this

to "scalar" when calling the boundary routines.

Fixes PR 1676.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/WaveToyC/trunk@107 90eea020-d82d-4da5-bf6e-4ee79ff7632f

2 files changed, 16 insertions, 9 deletions

diff --git a/param.ccl b/param.ccl
index 4af8209..cbf39f1 100644
--- a/param.ccl
+++ b/param.ccl
@@ -10,7 +10,7 @@ KEYWORD bound "Type of boundary condition to use"
   "static"    :: "Static (Dirichlet, dphi/dt=0) boundary condition"
   "radiation" :: "Radiation boundary condition"
   "robin"     :: "Robin (phi(r) = C/r) boundary condition"
-  "scalar"    :: "Scalar (Dirichlet, phi=0) boundary condition"
+  "zero"      :: "Zero (Dirichlet, phi=0) boundary condition"
 } "none"
 
 
diff --git a/src/WaveToy.c b/src/WaveToy.c
index 1a90f36..beef228 100644
--- a/src/WaveToy.c
+++ b/src/WaveToy.c
@@ -115,20 +115,27 @@ void WaveToyC_Boundaries(CCTK_ARGUMENTS)
 
   int ierr;
 
+  ierr = 0;
+
   if (CCTK_EQUALS(bound,"flat") || CCTK_EQUALS(bound,"static") || 
       CCTK_EQUALS(bound,"radiation") || CCTK_EQUALS(bound,"robin") || 
-      CCTK_EQUALS(bound,"scalar") || CCTK_EQUALS(bound,"none"))
+      CCTK_EQUALS(bound,"none"))
+  {
+    /* Uses all default arguments, so invalid table handle -1 can be passed */
+    ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
+				   "wavetoy::phi", bound);
+  }
+  else if (CCTK_EQUALS(bound,"zero"))
   {
     /* Uses all default arguments, so invalid table handle -1 can be passed */
     ierr = Boundary_SelectVarForBC
-      (cctkGH, CCTK_ALL_FACES, 1, -1, "wavetoy::phi", bound);
+      (cctkGH, CCTK_ALL_FACES, 1, -1, "wavetoy::phi", "scalar");
 
-    if (ierr < 0) 
-    {
-      CCTK_VWarn(0,__LINE__,__FILE__,CCTK_THORNSTRING,
-                 "WaveToyC_Boundaries: Error selecting boundary "
-                 "condition %s",bound);
-    }
+  }
+
+  if (ierr < 0) 
+  {
+    CCTK_WARN(0,"WaveToyC_Boundaries: Error selecting boundary condition");
   }
 
   return;