Merge branch 'master' of ssh://relativity.phys.lsu.edu/home/perturbed/gitroot/McLachlan

Conflicts:
	m/Makefile
	m/McLachlan_BSSN.m

8 files changed, 0 insertions, 207 deletions

diff --git a/ML_BSSN_Helper/configuration.ccl b/ML_BSSN_Helper/configuration.ccl
deleted file mode 100644
index edaa5b7..0000000
--- a/ML_BSSN_Helper/configuration.ccl
+++ /dev/null
@@ -1 +0,0 @@
-REQUIRES THORNS: CartGrid3D CoordGauge
diff --git a/ML_BSSN_Helper/interface.ccl b/ML_BSSN_Helper/interface.ccl
deleted file mode 100644
index 8ad9ba2..0000000
--- a/ML_BSSN_Helper/interface.ccl
+++ /dev/null
@@ -1,10 +0,0 @@
-IMPLEMENTS: ML_BSSN_Helper
-
-INHERITS: ADMBase CoordGauge ML_BSSN
-
-USES INCLUDE: Symmetry.h
-
-
-
-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
diff --git a/ML_BSSN_Helper/param.ccl b/ML_BSSN_Helper/param.ccl
deleted file mode 100644
index 8669144..0000000
--- a/ML_BSSN_Helper/param.ccl
+++ /dev/null
@@ -1,12 +0,0 @@
-SHARES: ADMBase
-
-USES KEYWORD evolution_method
-
-SHARES: GenericFD
-
-USES CCTK_INT boundary_width
-
-SHARES: ML_BSSN
-
-USES CCTK_INT timelevels
-USES KEYWORD calculate_ADMBase_variables_at
diff --git a/ML_BSSN_Helper/schedule.ccl b/ML_BSSN_Helper/schedule.ccl
deleted file mode 100644
index b9d0262..0000000
--- a/ML_BSSN_Helper/schedule.ccl
+++ /dev/null
@@ -1,106 +0,0 @@
-if (CCTK_EQUALS (evolution_method, "ML_BSSN")) {
-  
-  if (timelevels == 1) {
-    STORAGE: ADMBase::metric[1]
-    STORAGE: ADMBase::curv[1]
-    STORAGE: ADMBase::lapse[1]
-    STORAGE: ADMBase::shift[1]
-    STORAGE: ADMBase::dtlapse[1]
-    STORAGE: ADMBase::dtshift[1]
-  } else if (timelevels == 2) {
-    STORAGE: ADMBase::metric[2]
-    STORAGE: ADMBase::curv[2]
-    STORAGE: ADMBase::lapse[2]
-    STORAGE: ADMBase::shift[2]
-    STORAGE: ADMBase::dtlapse[2]
-    STORAGE: ADMBase::dtshift[2]
-  } else if (timelevels == 3) {
-    STORAGE: ADMBase::metric[3]
-    STORAGE: ADMBase::curv[3]
-    STORAGE: ADMBase::lapse[3]
-    STORAGE: ADMBase::shift[3]
-    STORAGE: ADMBase::dtlapse[3]
-    STORAGE: ADMBase::dtshift[3]
-  }
-  
-  SCHEDULE ML_BSSN_RegisterSlicing AT startup
-  {
-    LANG: C
-    OPTIONS: meta
-  } "Register slicing"
-  
-  SCHEDULE ML_BSSN_UnsetCheckpointTags AT basegrid
-  {
-    LANG: C
-    OPTIONS: meta
-  } "Don't checkpoint ADMBase variables"
-  
-  
-  
-  SCHEDULE GROUP ML_BSSN_evolCalcGroup IN MoL_CalcRHS
-  {
-  } "Calculate BSSN RHS"
-  
-  SCHEDULE GROUP ML_BSSN_evolCalcGroup AT analysis
-  {
-    TRIGGERS: ML_BSSN::ML_log_confacrhs
-    TRIGGERS: ML_BSSN::ML_metricrhs
-    TRIGGERS: ML_BSSN::ML_Gammarhs
-    TRIGGERS: ML_BSSN::ML_trace_curvrhs
-    TRIGGERS: ML_BSSN::ML_curvrhs
-    TRIGGERS: ML_BSSN::ML_lapserhs
-    TRIGGERS: ML_BSSN::ML_dtlapserhs
-    TRIGGERS: ML_BSSN::ML_shiftrhs
-    TRIGGERS: ML_BSSN::ML_dtshiftrhs
-  } "Calculate BSSN RHS"
-  
-  
-  
-  if (CCTK_EQUALS (calculate_ADMBase_variables_at, "MoL_PostStep"))
-  {
-    SCHEDULE GROUP ML_BSSN_convertToADMBaseGroup IN MoL_PostStep AFTER (ML_BSSN_ApplyBCs ML_BSSN_enforce) BEFORE Whisky_PostStep
-    {
-    } "Calculate ADM variables"
-  }
-  else if  (CCTK_EQUALS (calculate_ADMBase_variables_at, "CCTK_EVOL"))
-  {
-    SCHEDULE GROUP ML_BSSN_convertToADMBaseGroup AT evol AFTER MoL_Evolution
-    {
-    } "Calculate ADM variables"
-  }
-  else if  (CCTK_EQUALS (calculate_ADMBase_variables_at, "CCTK_ANALYSIS"))
-  {
-    SCHEDULE GROUP ML_BSSN_convertToADMBaseGroup AT analysis
-    {
-      TRIGGERS: ML_BSSN::ML_Ham
-      TRIGGERS: ML_BSSN::ML_mom
-    } "Calculate ADM variables"
-  }
-  
-  
-  
-  SCHEDULE GROUP ML_BSSN_constraintsCalcGroup AT analysis
-  {
-    TRIGGERS: ML_BSSN::ML_Ham
-    TRIGGERS: ML_BSSN::ML_mom
-  } "Calculate BSSN constraints"
-  
-  
-  
-  SCHEDULE ML_BSSN_SelectBCsADMBase IN MoL_PostStep AFTER ML_BSSN_convertToADMBase
-  {
-    LANG: C
-    OPTIONS: level
-    SYNC: ADMBase::metric
-    SYNC: ADMBase::curv
-    SYNC: ADMBase::lapse
-    SYNC: ADMBase::shift
-    SYNC: ADMBase::dtlapse
-    SYNC: ADMBase::dtshift
-  } "Apply boundary conditions to ADMBase variables"
-  
-  SCHEDULE GROUP ApplyBCs AS ML_BSSN_ApplyBCsADMBase IN MoL_PostStep AFTER ML_BSSN_SelectBCsADMBase
-  {
-  } "Apply boundary conditions to ADMBase variables"
-  
-}
diff --git a/ML_BSSN_Helper/src/RegisterSlicing.c b/ML_BSSN_Helper/src/RegisterSlicing.c
deleted file mode 100644
index 313bf32..0000000
--- a/ML_BSSN_Helper/src/RegisterSlicing.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <cctk.h>
-
-#include "CactusEinstein/CoordGauge/src/Slicing.h"
-
-int
-ML_BSSN_RegisterSlicing (void)
-{
-  Einstein_RegisterSlicing ("ML_BSSN");
-  return 0;
-}
diff --git a/ML_BSSN_Helper/src/SelectBCsADMBase.c b/ML_BSSN_Helper/src/SelectBCsADMBase.c
deleted file mode 100644
index 2a10844..0000000
--- a/ML_BSSN_Helper/src/SelectBCsADMBase.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <cctk.h>
-#include <cctk_Arguments.h>
-#include <cctk_Parameters.h>
-
-static void
-select_bcs (cGH const * restrict cctkGH, char const * restrict gn);
-
-void
-ML_BSSN_SelectBCsADMBase (CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  
-  select_bcs (cctkGH, "ADMBase::metric");
-  select_bcs (cctkGH, "ADMBase::curv");
-  select_bcs (cctkGH, "ADMBase::lapse");
-  select_bcs (cctkGH, "ADMBase::shift");
-  select_bcs (cctkGH, "ADMBase::dtlapse");
-  select_bcs (cctkGH, "ADMBase::dtshift");
-}
-
-static void
-select_bcs (cGH const * restrict const cctkGH, char const * restrict const gn)
-{
-  DECLARE_CCTK_PARAMETERS;
-  
-  Boundary_SelectGroupForBC
-    (cctkGH, CCTK_ALL_FACES, boundary_width, -1, gn, "none");
-}
diff --git a/ML_BSSN_Helper/src/UnsetCheckpointTags.c b/ML_BSSN_Helper/src/UnsetCheckpointTags.c
deleted file mode 100644
index 0375846..0000000
--- a/ML_BSSN_Helper/src/UnsetCheckpointTags.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <cctk.h>
-#include <cctk_Arguments.h>
-#include <cctk_Parameters.h>
-#include <util_Table.h>
-
-#include <assert.h>
-
-static void
-unset_checkpoint_tag (char const * restrict gn);
-
-void
-ML_BSSN_UnsetCheckpointTags (CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  
-  unset_checkpoint_tag ("ADMBase::metric");
-  unset_checkpoint_tag ("ADMBase::curv");
-  unset_checkpoint_tag ("ADMBase::lapse");
-  unset_checkpoint_tag ("ADMBase::shift");
-  unset_checkpoint_tag ("ADMBase::dtlapse");
-  unset_checkpoint_tag ("ADMBase::dtshift");
-}
-
-static void
-unset_checkpoint_tag (char const * restrict const gn)
-{
-  assert (gn);
-  
-  int const gi = CCTK_GroupIndex (gn);
-  assert (gi >= 0);
-  
-  int const table = CCTK_GroupTagsTableI (gi);
-  assert (table >= 0);
-  
-  int const ierr = Util_TableSetString (table, "no", "Checkpoint");
-  assert (! ierr);
-}
diff --git a/ML_BSSN_Helper/src/make.code.defn b/ML_BSSN_Helper/src/make.code.defn
deleted file mode 100644
index 7e30e05..0000000
--- a/ML_BSSN_Helper/src/make.code.defn
+++ /dev/null
@@ -1,2 +0,0 @@
-# -*-Makefile-*-
-SRCS = RegisterSlicing.c SelectBCsADMBase.c UnsetCheckpointTags.c