Converted to use new metric_type and conformal_storage variables.

The thorns calculate the appropriate number of derivatives and
set the conformal_state variable appropriately - note that currently
there is no code to do second derivatives of Schwarzschild, so this
sets the conformal_state to a maximum of 2 (i.e. factor and first derivatives).

Tom


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

1 files changed, 7 insertions, 10 deletions

diff --git a/src/Schwarzschild.c b/src/Schwarzschild.c
index 16e4c82..afc9972 100644
--- a/src/Schwarzschild.c
+++ b/src/Schwarzschild.c
@@ -8,15 +8,13 @@
    @version   $Id$
  @@*/
 
+#include "cctk.h"
+
 #include <string.h>
 
-#include "cctk.h"
 #include "cctk_Arguments.h"
 #include "cctk_Parameters.h"
 
-/* Need include file from Einstein */
-#include "CactusEinstein/Einstein/src/Einstein.h"
-
 static const char *rcsid = "$Header$";
 CCTK_FILEVERSION(CactusEinstein_IDAnalyticBH_Schwarzschild_c)
 
@@ -36,10 +34,11 @@ void Schwarzschild(CCTK_ARGUMENTS)
   npoints = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2];
 
   /*     conformal metric flag */
-  if(use_conformal == 1)
+  if(CCTK_EQUALS(metric_type, "static conformal") &&
+     (CCTK_EQUALS(conformal_storage,"factor+derivs") ||
+      CCTK_EQUALS(conformal_storage,"factor+derivs+2nd derivs")))
   {
-
-    *conformal_state = CONFORMAL_METRIC;
+    *conformal_state = 2;
 
     for (i = 0; i < npoints; i++)
     {
@@ -73,8 +72,6 @@ void Schwarzschild(CCTK_ARGUMENTS)
   }
   else
   {
-    *conformal_state = NOCONFORMAL_METRIC;
-
     for (i = 0; i < npoints; i++)
     {
       r_squared = r[i] * r[i];
@@ -86,7 +83,7 @@ void Schwarzschild(CCTK_ARGUMENTS)
       gyz[i] = zero;
     }
   }
-
+  
   /*     If the initial lapse is not one ... */
   if (CCTK_Equals(initial_lapse,"schwarz"))
   {