Changed ShiftedGaugeWave to use PreSync

barrywardell · Feb 27, 2018 · 3153cc1 · 3153cc1
1 parent 86a616f
commit 3153cc1
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 23 deletions.
diff --git a/ShiftedGaugeWave/interface.ccl b/ShiftedGaugeWave/interface.ccl
@@ -2,7 +2,7 @@
 
 implements: ShiftedGaugeWave
 
-inherits:   admbase Boundary GenericFD Grid
+inherits:   admbase Boundary2 GenericFD Grid
 
 
 
@@ -31,11 +31,8 @@ USES FUNCTION MultiPatch_GetBoundarySpecification
 CCTK_INT FUNCTION SymmetryTableHandleForGrid(CCTK_POINTER_TO_CONST IN cctkGH)
 USES FUNCTION SymmetryTableHandleForGrid
 
-CCTK_INT FUNCTION Boundary_SelectGroupForBC(CCTK_POINTER_TO_CONST 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
-
-CCTK_INT FUNCTION Boundary_SelectVarForBC(CCTK_POINTER_TO_CONST IN GH, CCTK_INT IN faces, CCTK_INT IN boundary_width, CCTK_INT IN table_handle, CCTK_STRING IN var_name, CCTK_STRING IN bc_name)
-USES FUNCTION Boundary_SelectVarForBC
+CCTK_INT FUNCTION Carpet_SelectGroupForBC(CCTK_POINTER_TO_CONST 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 Carpet_SelectGroupForBC
 
 public:
 CCTK_REAL metric_exact type=GF timelevels=1 tags='tensortypealias="DD_sym" tensorweight=0'

diff --git a/ShiftedGaugeWave/schedule.ccl b/ShiftedGaugeWave/schedule.ccl
@@ -122,7 +122,7 @@ if (CCTK_EQUALS(exact_method, "ShiftedGaugeWave"))
   } "ShiftedGaugeWave_exact"
 }
 
-schedule ShiftedGaugeWave_SelectBoundConds in MoL_PostStep
+schedule ShiftedGaugeWave_SelectBoundConds in Boundary2_Selection
 {
   LANG: C
   OPTIONS: level
@@ -145,6 +145,3 @@ schedule ShiftedGaugeWave_ParamCheck at PARAMCHECK
   LANG: C
   OPTIONS: global
 } "Check parameter consistency"
-schedule group ApplyBCs as ShiftedGaugeWave_ApplyBCs in MoL_PostStep after ShiftedGaugeWave_SelectBoundConds
-{
-} "Apply boundary conditions controlled by thorn Boundary"
diff --git a/ShiftedGaugeWave/src/Boundaries.cc b/ShiftedGaugeWave/src/Boundaries.cc
@@ -2,6 +2,7 @@
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Arguments_ShiftedGaugeWave.h"
 #include "cctk_Parameters.h"
 #include "cctk_Faces.h"
 #include "util_Table.h"
@@ -19,15 +20,15 @@
 
 extern "C" void ShiftedGaugeWave_CheckBoundaries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_CheckBoundaries;
   DECLARE_CCTK_PARAMETERS;
 
   return;
 }
 
 extern "C" void ShiftedGaugeWave_SelectBoundConds(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_SelectBoundConds;
   DECLARE_CCTK_PARAMETERS;
 
   CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED = 0;

diff --git a/ShiftedGaugeWave/src/ParamCheck.cc b/ShiftedGaugeWave/src/ParamCheck.cc
@@ -1,9 +1,10 @@
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Arguments_ShiftedGaugeWave.h"
 #include "cctk_Parameters.h"
 extern "C" void ShiftedGaugeWave_ParamCheck(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_ParamCheck;
   DECLARE_CCTK_PARAMETERS;
 
   if (CCTK_MyProc(cctkGH) == 0)

diff --git a/ShiftedGaugeWave/src/RegisterMoL.cc b/ShiftedGaugeWave/src/RegisterMoL.cc
@@ -2,11 +2,12 @@
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Arguments_ShiftedGaugeWave.h"
 #include "cctk_Parameters.h"
 
 extern "C" void ShiftedGaugeWave_RegisterVars(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_RegisterVars;
   DECLARE_CCTK_PARAMETERS;
 
   CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED = 0;

diff --git a/ShiftedGaugeWave/src/RegisterSymmetries.cc b/ShiftedGaugeWave/src/RegisterSymmetries.cc
@@ -2,12 +2,13 @@
 
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Arguments_ShiftedGaugeWave.h"
 #include "cctk_Parameters.h"
 #include "Symmetry.h"
 
 extern "C" void ShiftedGaugeWave_RegisterSymmetries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_RegisterSymmetries;
   DECLARE_CCTK_PARAMETERS;
 
   /* array holding symmetry definitions */

diff --git a/ShiftedGaugeWave/src/ShiftedGaugeWave_always.cc b/ShiftedGaugeWave/src/ShiftedGaugeWave_always.cc
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Arguments_ShiftedGaugeWave.h"
 #include "cctk_Parameters.h"
 #include "Kranc.hh"
 #include "Differencing.h"
@@ -20,7 +21,7 @@ namespace ShiftedGaugeWave {
 
 static void ShiftedGaugeWave_always_Body(const cGH* restrict const cctkGH, const int dir, const int face, const CCTK_REAL normal[3], const CCTK_REAL tangentA[3], const CCTK_REAL tangentB[3], const int imin[3], const int imax[3], const int n_subblock_gfs, CCTK_REAL* restrict const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_always;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2023,7 +2024,7 @@ static void ShiftedGaugeWave_always_Body(const cGH* restrict const cctkGH, const
 }
 extern "C" void ShiftedGaugeWave_always(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_always;
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)

diff --git a/ShiftedGaugeWave/src/ShiftedGaugeWave_error.cc b/ShiftedGaugeWave/src/ShiftedGaugeWave_error.cc
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Arguments_ShiftedGaugeWave.h"
 #include "cctk_Parameters.h"
 #include "Kranc.hh"
 #include "Differencing.h"
@@ -27,7 +28,7 @@ namespace ShiftedGaugeWave {
 
 static void ShiftedGaugeWave_error_Body(const cGH* restrict const cctkGH, const int dir, const int face, const CCTK_REAL normal[3], const CCTK_REAL tangentA[3], const CCTK_REAL tangentB[3], const int imin[3], const int imax[3], const int n_subblock_gfs, CCTK_REAL* restrict const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_error;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2044,7 +2045,7 @@ static void ShiftedGaugeWave_error_Body(const cGH* restrict const cctkGH, const
 }
 extern "C" void ShiftedGaugeWave_error(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_error;
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)

diff --git a/ShiftedGaugeWave/src/ShiftedGaugeWave_exact.cc b/ShiftedGaugeWave/src/ShiftedGaugeWave_exact.cc
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Arguments_ShiftedGaugeWave.h"
 #include "cctk_Parameters.h"
 #include "Kranc.hh"
 #include "Differencing.h"
@@ -20,7 +21,7 @@ namespace ShiftedGaugeWave {
 
 static void ShiftedGaugeWave_exact_Body(const cGH* restrict const cctkGH, const int dir, const int face, const CCTK_REAL normal[3], const CCTK_REAL tangentA[3], const CCTK_REAL tangentB[3], const int imin[3], const int imax[3], const int n_subblock_gfs, CCTK_REAL* restrict const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_exact;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2069,7 +2070,7 @@ static void ShiftedGaugeWave_exact_Body(const cGH* restrict const cctkGH, const
 }
 extern "C" void ShiftedGaugeWave_exact(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_exact;
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)

diff --git a/ShiftedGaugeWave/src/ShiftedGaugeWave_initial.cc b/ShiftedGaugeWave/src/ShiftedGaugeWave_initial.cc
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "cctk.h"
 #include "cctk_Arguments.h"
+#include "cctk_Arguments_ShiftedGaugeWave.h"
 #include "cctk_Parameters.h"
 #include "Kranc.hh"
 #include "Differencing.h"
@@ -20,7 +21,7 @@ namespace ShiftedGaugeWave {
 
 static void ShiftedGaugeWave_initial_Body(const cGH* restrict const cctkGH, const int dir, const int face, const CCTK_REAL normal[3], const CCTK_REAL tangentA[3], const CCTK_REAL tangentB[3], const int imin[3], const int imax[3], const int n_subblock_gfs, CCTK_REAL* restrict const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_initial;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2023,7 +2024,7 @@ static void ShiftedGaugeWave_initial_Body(const cGH* restrict const cctkGH, cons
 }
 extern "C" void ShiftedGaugeWave_initial(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_ARGUMENTS_ShiftedGaugeWave_initial;
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)