aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2008-08-04 11:52:07 -0500
committerErik Schnetter <schnetter@cct.lsu.edu>2008-08-04 11:52:07 -0500
commitecf86b57b550bee257906fc7407f602fbf47d7e1 (patch)
treee52398aae88c12e743fcaf9db2ea3885afb099ea
parent823afa433a88cb83b9a8124391a1c26d4d1726bd (diff)
Do not register the grid function symmetries in the helper thorns since
Kranc does this on its own. Correct instead an error in Kranc which registers the symmetries too late.
-rw-r--r--ML_BSSN_Helper/schedule.ccl8
-rw-r--r--ML_BSSN_Helper/src/RegisterSymmetries.c66
-rw-r--r--ML_BSSN_Helper/src/make.code.defn2
-rw-r--r--ML_BSSN_MP_Helper/schedule.ccl8
-rw-r--r--ML_BSSN_MP_Helper/src/RegisterSymmetries.c66
-rw-r--r--ML_BSSN_MP_Helper/src/make.code.defn2
-rw-r--r--ML_BSSN_M_Helper/schedule.ccl8
-rw-r--r--ML_BSSN_M_Helper/src/RegisterSymmetries.c66
-rw-r--r--ML_BSSN_M_Helper/src/make.code.defn2
9 files changed, 6 insertions, 222 deletions
diff --git a/ML_BSSN_Helper/schedule.ccl b/ML_BSSN_Helper/schedule.ccl
index 06cd875..b9d0262 100644
--- a/ML_BSSN_Helper/schedule.ccl
+++ b/ML_BSSN_Helper/schedule.ccl
@@ -29,12 +29,6 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN")) {
OPTIONS: meta
} "Register slicing"
- SCHEDULE ML_BSSN_RegisterSymmetries IN SymmetryRegister
- {
- LANG: C
- OPTIONS: meta
- } "Register grid function symmetries"
-
SCHEDULE ML_BSSN_UnsetCheckpointTags AT basegrid
{
LANG: C
@@ -64,7 +58,7 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN")) {
if (CCTK_EQUALS (calculate_ADMBase_variables_at, "MoL_PostStep"))
{
- SCHEDULE GROUP ML_BSSN_convertToADMBaseGroup IN MoL_PostStep AFTER (ML_BSSN_ApplyBCs ML_BSSN_enforce)
+ SCHEDULE GROUP ML_BSSN_convertToADMBaseGroup IN MoL_PostStep AFTER (ML_BSSN_ApplyBCs ML_BSSN_enforce) BEFORE Whisky_PostStep
{
} "Calculate ADM variables"
}
diff --git a/ML_BSSN_Helper/src/RegisterSymmetries.c b/ML_BSSN_Helper/src/RegisterSymmetries.c
deleted file mode 100644
index 6812079..0000000
--- a/ML_BSSN_Helper/src/RegisterSymmetries.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <assert.h>
-
-#include <cctk.h>
-#include <cctk_Arguments.h>
-
-#include <Symmetry.h>
-
-static void
-setcartsym (cGH const * restrict cctkGH, char const * restrict vn, int symdesc);
-
-void
-ML_BSSN_RegisterSymmetry (CCTK_ARGUMENTS)
-{
- DECLARE_CCTK_ARGUMENTS;
-
- setcartsym (cctkGH, "ML_BSSN::phi" , 0);
- setcartsym (cctkGH, "ML_BSSN::gt11" , 11);
- setcartsym (cctkGH, "ML_BSSN::gt12" , 12);
- setcartsym (cctkGH, "ML_BSSN::gt13" , 13);
- setcartsym (cctkGH, "ML_BSSN::gt22" , 22);
- setcartsym (cctkGH, "ML_BSSN::gt23" , 23);
- setcartsym (cctkGH, "ML_BSSN::gt33" , 33);
- setcartsym (cctkGH, "ML_BSSN::trK" , 0);
- setcartsym (cctkGH, "ML_BSSN::At11" , 11);
- setcartsym (cctkGH, "ML_BSSN::At12" , 12);
- setcartsym (cctkGH, "ML_BSSN::At13" , 13);
- setcartsym (cctkGH, "ML_BSSN::At22" , 22);
- setcartsym (cctkGH, "ML_BSSN::At23" , 23);
- setcartsym (cctkGH, "ML_BSSN::At33" , 33);
- setcartsym (cctkGH, "ML_BSSN::Xt1" , 1);
- setcartsym (cctkGH, "ML_BSSN::Xt2" , 2);
- setcartsym (cctkGH, "ML_BSSN::Xt3" , 3);
- setcartsym (cctkGH, "ML_BSSN::alpha", 0);
- setcartsym (cctkGH, "ML_BSSN::beta1", 1);
- setcartsym (cctkGH, "ML_BSSN::beta2", 2);
- setcartsym (cctkGH, "ML_BSSN::beta3", 3);
- setcartsym (cctkGH, "ML_BSSN::A" , 0);
- setcartsym (cctkGH, "ML_BSSN::B1" , 1);
- setcartsym (cctkGH, "ML_BSSN::B2" , 2);
- setcartsym (cctkGH, "ML_BSSN::B3" , 3);
-}
-
-void
-setcartsym (cGH const * restrict const cctkGH,
- char const * restrict const vn,
- int symdesc)
-{
- int sym[3];
-
- for (int d=0; d<3; ++d) {
- sym[d] = +1;
- }
-
- assert (symdesc >= 0);
- while (symdesc > 0) {
- int const d = symdesc % 10;
- assert (d>=1 && d<=3);
- sym[d-1] *= -1;
- symdesc /= 10;
- }
-
- int const ierr = SetCartSymVN (cctkGH, sym, vn);
- if (ierr != 0) {
- CCTK_WARN (CCTK_WARN_ABORT, "internal error");
- }
-}
diff --git a/ML_BSSN_Helper/src/make.code.defn b/ML_BSSN_Helper/src/make.code.defn
index 60cb539..7e30e05 100644
--- a/ML_BSSN_Helper/src/make.code.defn
+++ b/ML_BSSN_Helper/src/make.code.defn
@@ -1,2 +1,2 @@
# -*-Makefile-*-
-SRCS = RegisterSlicing.c RegisterSymmetries.c SelectBCsADMBase.c UnsetCheckpointTags.c
+SRCS = RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c
diff --git a/ML_BSSN_MP_Helper/schedule.ccl b/ML_BSSN_MP_Helper/schedule.ccl
index 173e973..bc985a8 100644
--- a/ML_BSSN_MP_Helper/schedule.ccl
+++ b/ML_BSSN_MP_Helper/schedule.ccl
@@ -29,12 +29,6 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN_MP")) {
OPTIONS: meta
} "Register slicing"
- SCHEDULE ML_BSSN_MP_RegisterSymmetries IN SymmetryRegister
- {
- LANG: C
- OPTIONS: meta
- } "Register grid function symmetries"
-
SCHEDULE ML_BSSN_MP_UnsetCheckpointTags AT basegrid
{
LANG: C
@@ -64,7 +58,7 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN_MP")) {
if (CCTK_EQUALS (calculate_ADMBase_variables_at, "MoL_PostStep"))
{
- SCHEDULE GROUP ML_BSSN_MP_convertToADMBaseGroup IN MoL_PostStep AFTER (ML_BSSN_MP_ApplyBCs ML_BSSN_MP_enforce)
+ SCHEDULE GROUP ML_BSSN_MP_convertToADMBaseGroup IN MoL_PostStep AFTER (ML_BSSN_MP_ApplyBCs ML_BSSN_MP_enforce) BEFORE Whisky_PostStep
{
} "Calculate ADM variables"
}
diff --git a/ML_BSSN_MP_Helper/src/RegisterSymmetries.c b/ML_BSSN_MP_Helper/src/RegisterSymmetries.c
deleted file mode 100644
index 88ccd72..0000000
--- a/ML_BSSN_MP_Helper/src/RegisterSymmetries.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <assert.h>
-
-#include <cctk.h>
-#include <cctk_Arguments.h>
-
-#include <Symmetry.h>
-
-static void
-setcartsym (cGH const * restrict cctkGH, char const * restrict vn, int symdesc);
-
-void
-ML_BSSN_MP_RegisterSymmetry (CCTK_ARGUMENTS)
-{
- DECLARE_CCTK_ARGUMENTS;
-
- setcartsym (cctkGH, "ML_BSSN_MP::phi" , 0);
- setcartsym (cctkGH, "ML_BSSN_MP::gt11" , 11);
- setcartsym (cctkGH, "ML_BSSN_MP::gt12" , 12);
- setcartsym (cctkGH, "ML_BSSN_MP::gt13" , 13);
- setcartsym (cctkGH, "ML_BSSN_MP::gt22" , 22);
- setcartsym (cctkGH, "ML_BSSN_MP::gt23" , 23);
- setcartsym (cctkGH, "ML_BSSN_MP::gt33" , 33);
- setcartsym (cctkGH, "ML_BSSN_MP::trK" , 0);
- setcartsym (cctkGH, "ML_BSSN_MP::At11" , 11);
- setcartsym (cctkGH, "ML_BSSN_MP::At12" , 12);
- setcartsym (cctkGH, "ML_BSSN_MP::At13" , 13);
- setcartsym (cctkGH, "ML_BSSN_MP::At22" , 22);
- setcartsym (cctkGH, "ML_BSSN_MP::At23" , 23);
- setcartsym (cctkGH, "ML_BSSN_MP::At33" , 33);
- setcartsym (cctkGH, "ML_BSSN_MP::Xt1" , 1);
- setcartsym (cctkGH, "ML_BSSN_MP::Xt2" , 2);
- setcartsym (cctkGH, "ML_BSSN_MP::Xt3" , 3);
- setcartsym (cctkGH, "ML_BSSN_MP::alpha", 0);
- setcartsym (cctkGH, "ML_BSSN_MP::beta1", 1);
- setcartsym (cctkGH, "ML_BSSN_MP::beta2", 2);
- setcartsym (cctkGH, "ML_BSSN_MP::beta3", 3);
- setcartsym (cctkGH, "ML_BSSN_MP::A" , 0);
- setcartsym (cctkGH, "ML_BSSN_MP::B1" , 1);
- setcartsym (cctkGH, "ML_BSSN_MP::B2" , 2);
- setcartsym (cctkGH, "ML_BSSN_MP::B3" , 3);
-}
-
-void
-setcartsym (cGH const * restrict const cctkGH,
- char const * restrict const vn,
- int symdesc)
-{
- int sym[3];
-
- for (int d=0; d<3; ++d) {
- sym[d] = +1;
- }
-
- assert (symdesc >= 0);
- while (symdesc > 0) {
- int const d = symdesc % 10;
- assert (d>=1 && d<=3);
- sym[d-1] *= -1;
- symdesc /= 10;
- }
-
- int const ierr = SetCartSymVN (cctkGH, sym, vn);
- if (ierr != 0) {
- CCTK_WARN (CCTK_WARN_ABORT, "internal error");
- }
-}
diff --git a/ML_BSSN_MP_Helper/src/make.code.defn b/ML_BSSN_MP_Helper/src/make.code.defn
index da5fe95..12fb65d 100644
--- a/ML_BSSN_MP_Helper/src/make.code.defn
+++ b/ML_BSSN_MP_Helper/src/make.code.defn
@@ -1,2 +1,2 @@
# -*-Makefile-*-
-SRCS = SelectBCsADMBase.c RegisterSlicing.c RegisterSymmetries.c UnsetCheckpointTags.c
+SRCS = SelectBCsADMBase.c RegisterSlicing.c UnsetCheckpointTags.c
diff --git a/ML_BSSN_M_Helper/schedule.ccl b/ML_BSSN_M_Helper/schedule.ccl
index bb14766..a9ebe80 100644
--- a/ML_BSSN_M_Helper/schedule.ccl
+++ b/ML_BSSN_M_Helper/schedule.ccl
@@ -29,12 +29,6 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN_M")) {
OPTIONS: meta
} "Register slicing"
- SCHEDULE ML_BSSN_M_RegisterSymmetries IN SymmetryRegister
- {
- LANG: C
- OPTIONS: meta
- } "Register grid function symmetries"
-
SCHEDULE ML_BSSN_M_UnsetCheckpointTags AT basegrid
{
LANG: C
@@ -64,7 +58,7 @@ if (CCTK_EQUALS (evolution_method, "ML_BSSN_M")) {
if (CCTK_EQUALS (calculate_ADMBase_variables_at, "MoL_PostStep"))
{
- SCHEDULE GROUP ML_BSSN_M_convertToADMBaseGroup IN MoL_PostStep AFTER (ML_BSSN_M_ApplyBCs ML_BSSN_M_enforce)
+ SCHEDULE GROUP ML_BSSN_M_convertToADMBaseGroup IN MoL_PostStep AFTER (ML_BSSN_M_ApplyBCs ML_BSSN_M_enforce) BEFORE Whisky_PostStep
{
} "Calculate ADM variables"
}
diff --git a/ML_BSSN_M_Helper/src/RegisterSymmetries.c b/ML_BSSN_M_Helper/src/RegisterSymmetries.c
deleted file mode 100644
index 88ee35f..0000000
--- a/ML_BSSN_M_Helper/src/RegisterSymmetries.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <assert.h>
-
-#include <cctk.h>
-#include <cctk_Arguments.h>
-
-#include <Symmetry.h>
-
-static void
-setcartsym (cGH const * restrict cctkGH, char const * restrict vn, int symdesc);
-
-void
-ML_BSSN_M_RegisterSymmetry (CCTK_ARGUMENTS)
-{
- DECLARE_CCTK_ARGUMENTS;
-
- setcartsym (cctkGH, "ML_BSSN_M::phi" , 0);
- setcartsym (cctkGH, "ML_BSSN_M::gt11" , 11);
- setcartsym (cctkGH, "ML_BSSN_M::gt12" , 12);
- setcartsym (cctkGH, "ML_BSSN_M::gt13" , 13);
- setcartsym (cctkGH, "ML_BSSN_M::gt22" , 22);
- setcartsym (cctkGH, "ML_BSSN_M::gt23" , 23);
- setcartsym (cctkGH, "ML_BSSN_M::gt33" , 33);
- setcartsym (cctkGH, "ML_BSSN_M::trK" , 0);
- setcartsym (cctkGH, "ML_BSSN_M::At11" , 11);
- setcartsym (cctkGH, "ML_BSSN_M::At12" , 12);
- setcartsym (cctkGH, "ML_BSSN_M::At13" , 13);
- setcartsym (cctkGH, "ML_BSSN_M::At22" , 22);
- setcartsym (cctkGH, "ML_BSSN_M::At23" , 23);
- setcartsym (cctkGH, "ML_BSSN_M::At33" , 33);
- setcartsym (cctkGH, "ML_BSSN_M::Xt1" , 1);
- setcartsym (cctkGH, "ML_BSSN_M::Xt2" , 2);
- setcartsym (cctkGH, "ML_BSSN_M::Xt3" , 3);
- setcartsym (cctkGH, "ML_BSSN_M::alpha", 0);
- setcartsym (cctkGH, "ML_BSSN_M::beta1", 1);
- setcartsym (cctkGH, "ML_BSSN_M::beta2", 2);
- setcartsym (cctkGH, "ML_BSSN_M::beta3", 3);
- setcartsym (cctkGH, "ML_BSSN_M::A" , 0);
- setcartsym (cctkGH, "ML_BSSN_M::B1" , 1);
- setcartsym (cctkGH, "ML_BSSN_M::B2" , 2);
- setcartsym (cctkGH, "ML_BSSN_M::B3" , 3);
-}
-
-void
-setcartsym (cGH const * restrict const cctkGH,
- char const * restrict const vn,
- int symdesc)
-{
- int sym[3];
-
- for (int d=0; d<3; ++d) {
- sym[d] = +1;
- }
-
- assert (symdesc >= 0);
- while (symdesc > 0) {
- int const d = symdesc % 10;
- assert (d>=1 && d<=3);
- sym[d-1] *= -1;
- symdesc /= 10;
- }
-
- int const ierr = SetCartSymVN (cctkGH, sym, vn);
- if (ierr != 0) {
- CCTK_WARN (CCTK_WARN_ABORT, "internal error");
- }
-}
diff --git a/ML_BSSN_M_Helper/src/make.code.defn b/ML_BSSN_M_Helper/src/make.code.defn
index da5fe95..12fb65d 100644
--- a/ML_BSSN_M_Helper/src/make.code.defn
+++ b/ML_BSSN_M_Helper/src/make.code.defn
@@ -1,2 +1,2 @@
# -*-Makefile-*-
-SRCS = SelectBCsADMBase.c RegisterSlicing.c RegisterSymmetries.c UnsetCheckpointTags.c
+SRCS = SelectBCsADMBase.c RegisterSlicing.c UnsetCheckpointTags.c