Use the new boundary api.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMAnalysis/trunk@18 80bd93c7-81bc-453a-9e3f-619c0b4f6fe4

3 files changed, 21 insertions, 6 deletions

diff --git a/interface.ccl b/interface.ccl
index dd40a3e..aeb7dba 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -46,6 +46,11 @@ void FUNCTION Trace(CCTK_INT IN ARRAY lsh, \
 PROVIDES FUNCTION CartToSphere WITH ADMAnalysis_CartToSphere LANGUAGE C
 PROVIDES FUNCTION Trace WITH ADMAnalysis_Trace LANGUAGE C
 
+CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER IN GH, \
+  CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, \
+  CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+USES FUNCTION Boundary_SelectGroupForBC
+
 # For evaltrK
 REAL trace_of_K TYPE = GF
 {
diff --git a/schedule.ccl b/schedule.ccl
index 9f119ce..52cadac 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -33,9 +33,17 @@ SCHEDULE ADMAnalysis_CurvCartToSphere AT CCTK_ANALYSIS
   TRIGGERS: spherical_curv
 } "Calculate the spherical ex. curvature in r, theta(q), phi(p)"
 
-SCHEDULE ADMAnalysis_Ricci AT CCTK_ANALYSIS
+schedule group RicciGroup at CCTK_ANALYSIS
 {
   STORAGE: ricci_tensor, ricci_scalar, detofg
-  LANG: C
   TRIGGERS: ricci_tensor, ricci_scalar
+} "Calculate Ricci tensor, with boundary conditions"
+
+SCHEDULE ADMAnalysis_Ricci in RicciGroup
+{
+  LANG: C
 } "Calculation of the Ricci tensor"
+
+schedule GROUP ApplyBCs as ADMAnalysis_ApplyBCs in RicciGroup after ADMAnalysis_Ricci
+{
+} "Apply boundary conditions"
diff --git a/src/Ricci.c b/src/Ricci.c
index bb3575c..368a12a 100644
--- a/src/Ricci.c
+++ b/src/Ricci.c
@@ -11,6 +11,7 @@
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Faces.h"
 
 #include "ADMAnalysis.h"
 #include "Symmetry.h"
@@ -69,7 +70,7 @@ void ADMAnalysis_Ricci(CCTK_ARGUMENTS)
 
   DECLARE_CCTK_ARGUMENTS;
 
-  CCTK_INT i,j,k, ijk, di, dj, dk, err, sw[3];
+  CCTK_INT i,j,k, ijk, di, dj, dk, err;
 
 #include "CactusEinstein/ADMMacros/src/macro/RICCI_declare.h"
 
@@ -105,9 +106,10 @@ void ADMAnalysis_Ricci(CCTK_ARGUMENTS)
   CartSymGN(cctkGH,"ADMAnalysis::ricci_tensor");
 
   /* Apply Flat Boundary Condition */
-  sw[0] = 1; sw[1] = 1; sw[2] = 1;
-  err = BndFlatGN(cctkGH,sw,"ADMAnalysis::ricci_scalar");
-  err = BndFlatGN(cctkGH,sw,"ADMAnalysis::ricci_tensor");
+  err = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
+				  "ADMAnalysis::ricci_scalar", "Flat");
+  err += Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, 1, -1, 
+				  "ADMAnalysis::ricci_tensor", "Flat");
   if (err < 0)
   {
     CCTK_WARN(2,"Error in applying flat boundary condition to Ricci tensor");