Re-running Kranc for ET_2020_05

barrywardell · May 14, 2020 · 3a323f6 · 3a323f6
1 parent f1619f3
commit 3a323f6
Show file tree

Hide file tree

Showing 60 changed files with 308 additions and 104 deletions.
diff --git a/GaugeWave/interface.ccl b/GaugeWave/interface.ccl
@@ -2,12 +2,13 @@
 
 implements: GaugeWave
 
-inherits:   admbase GenericFD Grid
+inherits:   admbase Boundary GenericFD Grid
 
 
 
 USES INCLUDE: loopcontrol.h
 USES INCLUDE: Symmetry.h
+USES INCLUDE: Boundary.h
 
 CCTK_INT FUNCTION MoLRegisterEvolved(CCTK_INT IN EvolvedIndex, CCTK_INT IN RHSIndex)
 USES FUNCTION MoLRegisterEvolved
@@ -30,10 +31,10 @@ 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 Carpet_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+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 Carpet_width, CCTK_INT IN table_handle, CCTK_STRING IN var_name, CCTK_STRING IN bc_name)
+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
 
 public:

diff --git a/GaugeWave/param.ccl b/GaugeWave/param.ccl
@@ -1,5 +1,6 @@
 # File produced by Kranc
 
+
 shares: ADMBase
 
 

diff --git a/GaugeWave/schedule.ccl b/GaugeWave/schedule.ccl
@@ -128,10 +128,6 @@ schedule GaugeWave_SelectBoundConds in MoL_PostStep
   OPTIONS: level
 } "select boundary conditions"
 
-schedule group ApplyBCs as GaugeWave_ApplyBCs in MoL_PostStep after GaugeWave_SelectBoundConds
-{
-} "Apply boundary conditions controlled by thorn Boundary"
-
 schedule GaugeWave_CheckBoundaries at BASEGRID
 {
   LANG: C
@@ -149,3 +145,6 @@ schedule GaugeWave_ParamCheck at PARAMCHECK
   LANG: C
   OPTIONS: global
 } "Check parameter consistency"
+schedule group ApplyBCs as GaugeWave_ApplyBCs in MoL_PostStep after GaugeWave_SelectBoundConds
+{
+} "Apply boundary conditions controlled by thorn Boundary"
diff --git a/GaugeWave/src/Boundaries.cc b/GaugeWave/src/Boundaries.cc
@@ -19,15 +19,23 @@
 
 extern "C" void GaugeWave_CheckBoundaries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_GaugeWave_CheckBoundaries;
+#ifdef DECLARE_CCTK_ARGUMENTS_GaugeWave_CheckBoundaries
+  DECLARE_CCTK_ARGUMENTS_CHECKED(GaugeWave_CheckBoundaries);
+#else
+  DECLARE_CCTK_ARGUMENTS;
+#endif
   DECLARE_CCTK_PARAMETERS;
 
   return;
 }
 
 extern "C" void GaugeWave_SelectBoundConds(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_GaugeWave_SelectBoundConds;
+#ifdef DECLARE_CCTK_ARGUMENTS_GaugeWave_SelectBoundConds
+  DECLARE_CCTK_ARGUMENTS_CHECKED(GaugeWave_SelectBoundConds);
+#else
+  DECLARE_CCTK_ARGUMENTS;
+#endif
   DECLARE_CCTK_PARAMETERS;
 
   CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED = 0;

diff --git a/GaugeWave/src/GaugeWave_always.cc b/GaugeWave/src/GaugeWave_always.cc
@@ -20,7 +20,7 @@ namespace GaugeWave {
 
 static void GaugeWave_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_GaugeWave_always;
+  DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2020,7 +2020,11 @@ static void GaugeWave_always_Body(const cGH* restrict const cctkGH, const int di
 }
 extern "C" void GaugeWave_always(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_GaugeWave_always;
+  #ifdef DECLARE_CCTK_ARGUMENTS_GaugeWave_always
+  DECLARE_CCTK_ARGUMENTS_CHECKED(GaugeWave_always);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)

diff --git a/GaugeWave/src/GaugeWave_exact.cc b/GaugeWave/src/GaugeWave_exact.cc
@@ -20,7 +20,7 @@ namespace GaugeWave {
 
 static void GaugeWave_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_GaugeWave_exact;
+  DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2066,7 +2066,11 @@ static void GaugeWave_exact_Body(const cGH* restrict const cctkGH, const int dir
 }
 extern "C" void GaugeWave_exact(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_GaugeWave_exact;
+  #ifdef DECLARE_CCTK_ARGUMENTS_GaugeWave_exact
+  DECLARE_CCTK_ARGUMENTS_CHECKED(GaugeWave_exact);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)

diff --git a/GaugeWave/src/GaugeWave_initial.cc b/GaugeWave/src/GaugeWave_initial.cc
@@ -20,7 +20,7 @@ namespace GaugeWave {
 
 static void GaugeWave_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_GaugeWave_initial;
+  DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2020,7 +2020,11 @@ static void GaugeWave_initial_Body(const cGH* restrict const cctkGH, const int d
 }
 extern "C" void GaugeWave_initial(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_GaugeWave_initial;
+  #ifdef DECLARE_CCTK_ARGUMENTS_GaugeWave_initial
+  DECLARE_CCTK_ARGUMENTS_CHECKED(GaugeWave_initial);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)

diff --git a/GaugeWave/src/ParamCheck.cc b/GaugeWave/src/ParamCheck.cc
@@ -3,7 +3,11 @@
 #include "cctk_Parameters.h"
 extern "C" void GaugeWave_ParamCheck(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_GaugeWave_ParamCheck;
+  #ifdef DECLARE_CCTK_ARGUMENTS_GaugeWave_ParamCheck
+  DECLARE_CCTK_ARGUMENTS_CHECKED(GaugeWave_ParamCheck);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   if (CCTK_MyProc(cctkGH) == 0)

diff --git a/GaugeWave/src/RegisterMoL.cc b/GaugeWave/src/RegisterMoL.cc
@@ -6,7 +6,11 @@
 
 extern "C" void GaugeWave_RegisterVars(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_GaugeWave_RegisterVars;
+  #ifdef DECLARE_CCTK_ARGUMENTS_GaugeWave_RegisterVars
+  DECLARE_CCTK_ARGUMENTS_CHECKED(GaugeWave_RegisterVars);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED = 0;

diff --git a/GaugeWave/src/RegisterSymmetries.cc b/GaugeWave/src/RegisterSymmetries.cc
@@ -7,7 +7,11 @@
 
 extern "C" void GaugeWave_RegisterSymmetries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_GaugeWave_RegisterSymmetries;
+  #ifdef DECLARE_CCTK_ARGUMENTS_GaugeWave_RegisterSymmetries
+  DECLARE_CCTK_ARGUMENTS_CHECKED(GaugeWave_RegisterSymmetries);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   /* array holding symmetry definitions */

diff --git a/KerrSchild/interface.ccl b/KerrSchild/interface.ccl
@@ -2,12 +2,13 @@
 
 implements: KerrSchild
 
-inherits:   admbase GenericFD Grid
+inherits:   admbase Boundary GenericFD Grid
 
 
 
 USES INCLUDE: loopcontrol.h
 USES INCLUDE: Symmetry.h
+USES INCLUDE: Boundary.h
 
 CCTK_INT FUNCTION MoLRegisterEvolved(CCTK_INT IN EvolvedIndex, CCTK_INT IN RHSIndex)
 USES FUNCTION MoLRegisterEvolved
@@ -30,10 +31,10 @@ 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 Carpet_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+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 Carpet_width, CCTK_INT IN table_handle, CCTK_STRING IN var_name, CCTK_STRING IN bc_name)
+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
 
 public:

diff --git a/KerrSchild/param.ccl b/KerrSchild/param.ccl
@@ -1,5 +1,6 @@
 # File produced by Kranc
 
+
 shares: ADMBase
 
 

diff --git a/KerrSchild/schedule.ccl b/KerrSchild/schedule.ccl
@@ -128,10 +128,6 @@ schedule KerrSchild_SelectBoundConds in MoL_PostStep
   OPTIONS: level
 } "select boundary conditions"
 
-schedule group ApplyBCs as KerrSchild_ApplyBCs in MoL_PostStep after KerrSchild_SelectBoundConds
-{
-} "Apply boundary conditions controlled by thorn Boundary"
-
 schedule KerrSchild_CheckBoundaries at BASEGRID
 {
   LANG: C
@@ -149,3 +145,6 @@ schedule KerrSchild_ParamCheck at PARAMCHECK
   LANG: C
   OPTIONS: global
 } "Check parameter consistency"
+schedule group ApplyBCs as KerrSchild_ApplyBCs in MoL_PostStep after KerrSchild_SelectBoundConds
+{
+} "Apply boundary conditions controlled by thorn Boundary"
diff --git a/KerrSchild/src/Boundaries.cc b/KerrSchild/src/Boundaries.cc
@@ -19,15 +19,23 @@
 
 extern "C" void KerrSchild_CheckBoundaries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_KerrSchild_CheckBoundaries;
+#ifdef DECLARE_CCTK_ARGUMENTS_KerrSchild_CheckBoundaries
+  DECLARE_CCTK_ARGUMENTS_CHECKED(KerrSchild_CheckBoundaries);
+#else
+  DECLARE_CCTK_ARGUMENTS;
+#endif
   DECLARE_CCTK_PARAMETERS;
 
   return;
 }
 
 extern "C" void KerrSchild_SelectBoundConds(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_KerrSchild_SelectBoundConds;
+#ifdef DECLARE_CCTK_ARGUMENTS_KerrSchild_SelectBoundConds
+  DECLARE_CCTK_ARGUMENTS_CHECKED(KerrSchild_SelectBoundConds);
+#else
+  DECLARE_CCTK_ARGUMENTS;
+#endif
   DECLARE_CCTK_PARAMETERS;
 
   CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED = 0;

diff --git a/KerrSchild/src/KerrSchild_always.cc b/KerrSchild/src/KerrSchild_always.cc
@@ -20,7 +20,7 @@ namespace KerrSchild {
 
 static void KerrSchild_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_KerrSchild_always;
+  DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2316,7 +2316,11 @@ static void KerrSchild_always_Body(const cGH* restrict const cctkGH, const int d
 }
 extern "C" void KerrSchild_always(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_KerrSchild_always;
+  #ifdef DECLARE_CCTK_ARGUMENTS_KerrSchild_always
+  DECLARE_CCTK_ARGUMENTS_CHECKED(KerrSchild_always);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)

diff --git a/KerrSchild/src/KerrSchild_exact.cc b/KerrSchild/src/KerrSchild_exact.cc
@@ -20,7 +20,7 @@ namespace KerrSchild {
 
 static void KerrSchild_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_KerrSchild_exact;
+  DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2362,7 +2362,11 @@ static void KerrSchild_exact_Body(const cGH* restrict const cctkGH, const int di
 }
 extern "C" void KerrSchild_exact(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_KerrSchild_exact;
+  #ifdef DECLARE_CCTK_ARGUMENTS_KerrSchild_exact
+  DECLARE_CCTK_ARGUMENTS_CHECKED(KerrSchild_exact);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)

diff --git a/KerrSchild/src/KerrSchild_initial.cc b/KerrSchild/src/KerrSchild_initial.cc
@@ -20,7 +20,7 @@ namespace KerrSchild {
 
 static void KerrSchild_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_KerrSchild_initial;
+  DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
   /* Include user-supplied include files */
@@ -2316,7 +2316,11 @@ static void KerrSchild_initial_Body(const cGH* restrict const cctkGH, const int
 }
 extern "C" void KerrSchild_initial(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_KerrSchild_initial;
+  #ifdef DECLARE_CCTK_ARGUMENTS_KerrSchild_initial
+  DECLARE_CCTK_ARGUMENTS_CHECKED(KerrSchild_initial);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   if (verbose > 1)

diff --git a/KerrSchild/src/ParamCheck.cc b/KerrSchild/src/ParamCheck.cc
@@ -3,7 +3,11 @@
 #include "cctk_Parameters.h"
 extern "C" void KerrSchild_ParamCheck(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_KerrSchild_ParamCheck;
+  #ifdef DECLARE_CCTK_ARGUMENTS_KerrSchild_ParamCheck
+  DECLARE_CCTK_ARGUMENTS_CHECKED(KerrSchild_ParamCheck);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   if (CCTK_MyProc(cctkGH) == 0)

diff --git a/KerrSchild/src/RegisterMoL.cc b/KerrSchild/src/RegisterMoL.cc
@@ -6,7 +6,11 @@
 
 extern "C" void KerrSchild_RegisterVars(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_KerrSchild_RegisterVars;
+  #ifdef DECLARE_CCTK_ARGUMENTS_KerrSchild_RegisterVars
+  DECLARE_CCTK_ARGUMENTS_CHECKED(KerrSchild_RegisterVars);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   CCTK_INT ierr CCTK_ATTRIBUTE_UNUSED = 0;

diff --git a/KerrSchild/src/RegisterSymmetries.cc b/KerrSchild/src/RegisterSymmetries.cc
@@ -7,7 +7,11 @@
 
 extern "C" void KerrSchild_RegisterSymmetries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS_KerrSchild_RegisterSymmetries;
+  #ifdef DECLARE_CCTK_ARGUMENTS_KerrSchild_RegisterSymmetries
+  DECLARE_CCTK_ARGUMENTS_CHECKED(KerrSchild_RegisterSymmetries);
+  #else
+  DECLARE_CCTK_ARGUMENTS;
+  #endif
   DECLARE_CCTK_PARAMETERS;
 
   /* array holding symmetry definitions */

diff --git a/Minkowski/interface.ccl b/Minkowski/interface.ccl
@@ -2,12 +2,13 @@
 
 implements: Minkowski
 
-inherits:   admbase GenericFD Grid
+inherits:   admbase Boundary GenericFD Grid
 
 
 
 USES INCLUDE: loopcontrol.h
 USES INCLUDE: Symmetry.h
+USES INCLUDE: Boundary.h
 
 CCTK_INT FUNCTION MoLRegisterEvolved(CCTK_INT IN EvolvedIndex, CCTK_INT IN RHSIndex)
 USES FUNCTION MoLRegisterEvolved
@@ -30,10 +31,10 @@ 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 Carpet_width, CCTK_INT IN table_handle, CCTK_STRING IN group_name, CCTK_STRING IN bc_name)
+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 Carpet_width, CCTK_INT IN table_handle, CCTK_STRING IN var_name, CCTK_STRING IN bc_name)
+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
 
 public: