Tidied up and finished (hopefully) black hole initial data

Needs latex documentation now.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDAnalyticBH/trunk@7 6a3ddf76-46e1-4315-99d9-bc56cac1ef84

1 files changed, 13 insertions, 10 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 6812c02..a2b38fe 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -4,10 +4,6 @@
 
 if (CCTK_Equals(initial_data,"schwarzschild")) 
 { 
-   if (use_conformal)
-   {
-     STORAGE: confac, confac_1derivs, confac_2derivs
-   }
 	
    schedule Schwarzschild at CACTUS_INITIAL
    {
@@ -18,8 +14,7 @@ if (CCTK_Equals(initial_data,"schwarzschild"))
 
 if (CCTK_Equals(initial_data,"bl_bh")) 
 { 
-   STORAGE: confac, confac_1derivs, confac_2derivs
-
+   STORAGE: confac
    schedule BrillLindquist at CACTUS_INITIAL
    {
      LANG: Fortran
@@ -29,12 +24,20 @@ if (CCTK_Equals(initial_data,"bl_bh"))
 
 if (CCTK_Equals(initial_data,"misner_bh")) 
 { 
-   STORAGE: confac, confac_1derivs, confac_2derivs
-
-   schedule Misner at CACTUS_INITIAL
+   STORAGE: confac
+   schedule Misner_standard at CACTUS_INITIAL
    {
      LANG: Fortran
-   } "Construct initial data for Misner black holes"
+   } "Construct initial data for multiple Misner black holes"
 
 }
  
+if (CCTK_Equals(initial_data,"multiple_misner_bh")) 
+{ 
+   STORAGE: confac
+   schedule Misner_multiple at CACTUS_INITIAL
+   {
+     LANG: Fortran
+   } "Construct initial data for two Misner black holes"
+
+}