reflect thorn name change, also change implementation name, file, parameter and function names, make testsuites work by also applying the necessary name changes

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Hydro_InitExcision/trunk@106 55d78c69-0c5c-4738-8e60-d8a2776539f3

25 files changed, 482 insertions, 477 deletions

diff --git a/README b/README
index 57bb5e3..6650e3f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Cactus Code Thorn Whisky_InitExcision
+Cactus Code Thorn Hydro_InitExcision
 Author(s)    : Andrea Nerozzi
                Frank Löffler
 Maintainer(s): Frank Löffler
@@ -8,3 +8,12 @@ Licence      : GPLv2+
 1. Purpose
 
 Setup initial excision masks specified by parameters for testing.
+
+2. History
+
+This thorn was developed within the Whisky code under the name
+Whisky_InitExcision, was made public by the group of Whisky
+developers and was then included in the EinsteinToolkit using it's
+present name, because it is independend of any hydro evolution code,
+as long as that uses HydroBase.
+
diff --git a/interface.ccl b/interface.ccl
index 6e49b60..03b978e 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -1,5 +1,5 @@
-# Interface definition for thorn Whisky_InitExcision
+# Interface definition for thorn Hydro_InitExcision
 
-implements: Whisky_InitExcision
-inherits: Whisky
+implements: Hydro_InitExcision
+inherits: HydroBase, Grid, SpaceMask
 
diff --git a/param.ccl b/param.ccl
index 9f0283b..30da1d6 100644
--- a/param.ccl
+++ b/param.ccl
@@ -1,4 +1,4 @@
-# Parameter definitions for thorn Whisky_Excision
+# Parameter definitions for thorn Hydro_InitExcision
 
 shares: grid
 
@@ -6,20 +6,20 @@ USES keyword domain
 
 restricted:
 
-boolean whisky_initexcision "Sets up an excision zone"
+boolean hydro_initexcision "Sets up an excision zone"
 {
 } "no"
 
-boolean whisky_initexcision_poststep "Schedule also at poststep" STEERABLE=always
+boolean hydro_initexcision_poststep "Schedule also at poststep" STEERABLE=always
 {
 } "no"
 
-CCTK_INT whisky_initexcision_old_mask "Also set the old 'emask'?"
+CCTK_INT hydro_initexcision_old_mask "Also set the old 'emask'?"
 {
   0:1 :: "0 (default) for no, 1 for yes"
 } 0
 
-keyword whisky_initexcision_type "Type of excision to apply"
+keyword hydro_initexcision_type "Type of excision to apply"
 {
   "box"	     :: "Box excised region"
   "x-axis"   :: "X axis excision"
@@ -29,37 +29,37 @@ keyword whisky_initexcision_type "Type of excision to apply"
   "sphere"   :: "sphere excision"
 } "x-axis"
 
-CCTK_INT whisky_initexcision_flip "Exchange excised and normal region"
+CCTK_INT hydro_initexcision_flip "Exchange excised and normal region"
 {
   0:1 :: "0 (default) for no, 1 for yes"
 } 0
 
-CCTK_REAL whisky_initexcision_fraction "Fraction of excised region"
+CCTK_REAL hydro_initexcision_fraction "Fraction of excised region"
 {
   0:1      :: "Represents the fraction of excised region (0..1)"
 } 0.25
 
-CCTK_REAL whisky_initexcision_coordinate_length "Length of excised region" STEERABLE=always
+CCTK_REAL hydro_initexcision_coordinate_length "Length of excised region" STEERABLE=always
 {
   0:  :: "Length of excised region, has different meanings for the types"
 } 0
 
-CCTK_REAL whisky_initexcision_position_x "x-coordinate"
+CCTK_REAL hydro_initexcision_position_x "x-coordinate"
 {
   : :: "anything real is ok"
 } 0.0
 
-CCTK_REAL whisky_initexcision_position_y "y-coordinate"
+CCTK_REAL hydro_initexcision_position_y "y-coordinate"
 {
   : :: "anything real is ok"
 } 0.0
 
-CCTK_REAL whisky_initexcision_position_z "z-coordinate"
+CCTK_REAL hydro_initexcision_position_z "z-coordinate"
 {
   : :: "anything real is ok"
 } 0.0
 
-CCTK_INT whisky_initexcision_min_points "minimal number of points of excision"
+CCTK_INT hydro_initexcision_min_points "minimal number of points of excision"
 {
  0: :: "minimal number of points of excision, currently only partly implemented"
 } 0
diff --git a/schedule.ccl b/schedule.ccl
index 0433ad2..d4ae110 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,24 +1,24 @@
-# Schedule definitions for thorn Whisky_InitExcision
+# Schedule definitions for thorn Hydro_InitExcision
 
 #########################################
 ### Sets up the excision mask         ###
 #########################################
-schedule Whisky_InitExcisionMask AT CCTK_Initial AFTER MaskOne
+schedule Hydro_InitExcisionMask AT CCTK_Initial AFTER MaskOne
 {
    LANG: C
 } "Sets up the excision mask"
 
-schedule Whisky_InitExcisionMask AT CCTK_POST_RECOVER_VARIABLES AFTER MaskOne
+schedule Hydro_InitExcisionMask AT CCTK_POST_RECOVER_VARIABLES AFTER MaskOne
 {
    LANG: C
 } "Sets up the excision mask"
 
-schedule Whisky_InitExcisionMask AT POSTREGRID AFTER MaskOne
+schedule Hydro_InitExcisionMask AT POSTREGRID AFTER MaskOne
 {
    LANG: C
 } "Sets up the excision mask"
 
-schedule Whisky_InitExcisionMask_poststep AT POSTSTEP BEFORE setup_epsdis
+schedule Hydro_InitExcisionMask_poststep AT POSTSTEP BEFORE setup_epsdis
 {
    LANG: C
 } "Sets up the excision mask"
diff --git a/src/Hydro_InitExcision.c b/src/Hydro_InitExcision.c
new file mode 100644
index 0000000..c9e7b08
--- /dev/null
+++ b/src/Hydro_InitExcision.c
@@ -0,0 +1,253 @@
+ /*@@
+   @file      Hydro_InitExcisionMask.c
+   @date      Wed Mar 13 14:18:38 2002
+   @author    Andrea Nerozzi, Frank Loeffler
+   @desc 
+   Creates the mask for an excision region 
+   @enddesc 
+ @@*/
+
+#include "cctk.h"
+#include "cctk_Parameters.h"
+#include "cctk_Arguments.h"
+#include <stdio.h>
+#include <math.h>
+
+ /*@@
+   @routine    Excision Mask 
+   @date       Mon Apr 7 14:18:38 2003
+   @author     Andrea Nerozzi
+   @desc 
+   Sets up the excision region
+   @enddesc 
+   @calls     
+   @calledby   
+   @history    added 'sphere' and rewrote to be multi-processor-safe
+ 
+   @endhistory 
+
+@@*/
+
+void Hydro_InitExcisionMask(CCTK_ARGUMENTS)
+{
+
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+
+  CCTK_INT  i,j,k, nx, ny, nz, point;
+  CCTK_INT excised, normal;
+  CCTK_REAL emask_excised, emask_normal;
+  CCTK_REAL x_min, x_max, y_min, y_max, z_min, z_max;
+  CCTK_REAL x_size, y_size, z_size;
+  CCTK_REAL x_frac, y_frac, z_frac;
+
+  if (hydro_initexcision)
+  {
+    CCTK_INFO("Setting up Hydro Initial Excision region.");
+  }
+
+  nx = cctk_lsh[0];
+  ny = cctk_lsh[1];
+  nz = cctk_lsh[2];
+
+  CCTK_CoordRange(cctkGH, &x_min, &x_max, 1, NULL, "cart3d");
+  CCTK_CoordRange(cctkGH, &y_min, &y_max, 2, NULL, "cart3d");
+  CCTK_CoordRange(cctkGH, &z_min, &z_max, 3, NULL, "cart3d");
+  x_size = x_max - x_min;
+  y_size = y_max - y_min;
+  z_size = z_max - z_min;
+
+  excised=1;
+  normal =0;
+  emask_excised=0.0;
+  emask_normal=1.0;
+  if (hydro_initexcision_flip)
+  {
+    excised=0;
+    normal =1;
+    emask_excised=1.0;
+    emask_normal=0.0;
+  }
+
+  for (k=0 ; k<nz ; k++)
+  {
+    for (j=0 ; j<ny ; j++)
+    {
+      for (i=0 ; i<nx; i++)
+      { 
+        point = CCTK_GFINDEX3D(cctkGH,i,j,k);
+        x_frac = (x[point]-x_min) / x_size + 1.e-10;
+        y_frac = (y[point]-y_min) / y_size + 1.e-10;
+        z_frac = (z[point]-z_min) / z_size + 1.e-10;
+
+        if (hydro_initexcision)
+        {
+          if (hydro_initexcision_old_mask)
+            emask[point]=emask_normal;
+          if (CCTK_Equals(hydro_initexcision_type,"box"))
+          {
+              if (CCTK_Equals(domain,"full"))
+              {
+                 if ( (hydro_initexcision_coordinate_length <= 0.0) &&
+                      ( ( x_frac > 0.5 - hydro_initexcision_fraction) &&
+                        ( x_frac < 0.5 + hydro_initexcision_fraction) &&
+                        ( y_frac > 0.5 - hydro_initexcision_fraction) &&
+                        ( y_frac < 0.5 + hydro_initexcision_fraction) &&
+                        ( z_frac > 0.5 - hydro_initexcision_fraction) &&
+                        ( z_frac < 0.5 + hydro_initexcision_fraction)
+                      ) ||
+                      ( (hydro_initexcision_coordinate_length > 0.0) &&
+                        ( fabs(x[point]-hydro_initexcision_position_x) <=
+                          hydro_initexcision_coordinate_length*0.5) &&
+                        ( fabs(y[point]-hydro_initexcision_position_y) <=
+                          hydro_initexcision_coordinate_length*0.5) &&
+                        ( fabs(z[point]-hydro_initexcision_position_z) <=
+                          hydro_initexcision_coordinate_length*0.5)
+                      )
+                    )
+                 {
+                    hydro_excision_mask[point] = excised;
+                    if (hydro_initexcision_old_mask)
+                      emask[point]=emask_excised;
+                 }
+                 else
+                 {
+                    hydro_excision_mask[point] = normal;
+                 }
+              }
+              else if (CCTK_Equals(domain,"octant"))
+              {
+                 if ( ( (hydro_initexcision_coordinate_length <= 0.0) &&
+                        ( x_frac < hydro_initexcision_fraction) &&
+                        ( y_frac < hydro_initexcision_fraction) &&
+                        ( z_frac < hydro_initexcision_fraction)
+                      ) || 
+                      ( (hydro_initexcision_coordinate_length > 0.0) &&
+                        ( fabs(x[point]-hydro_initexcision_position_x) <=
+                          hydro_initexcision_coordinate_length*0.5) &&
+                        ( fabs(y[point]-hydro_initexcision_position_y) <=
+                          hydro_initexcision_coordinate_length*0.5) &&
+                        ( fabs(z[point]-hydro_initexcision_position_z) <=
+                          hydro_initexcision_coordinate_length*0.5)
+                      )
+                    )
+                 {
+                    hydro_excision_mask[point] = excised;
+                    if (hydro_initexcision_old_mask)
+                      emask[point]=emask_excised;
+                 }
+                 else
+                 {
+                    hydro_excision_mask[point] = normal;
+                 }
+              }
+          }
+          else if (CCTK_Equals(hydro_initexcision_type,"x-axis"))
+          {
+            if ( x_frac < 1.0-hydro_initexcision_fraction )
+            {
+              hydro_excision_mask[point] = normal;
+            }
+            else 
+            {
+              hydro_excision_mask[point] = excised;
+              if (hydro_initexcision_old_mask)
+                emask[point]=emask_excised;
+            }
+          }
+          else if (CCTK_Equals(hydro_initexcision_type,"y-axis"))
+          {
+            if ( y_frac < 1.0-hydro_initexcision_fraction )
+            {
+              hydro_excision_mask[point] = normal;
+            }
+            else 
+            {
+              hydro_excision_mask[point] = excised;
+              if (hydro_initexcision_old_mask)
+                emask[point]=emask_excised;
+            }
+          }
+          else if (CCTK_Equals(hydro_initexcision_type,"z-axis"))
+          {
+            if ( z_frac < 1.0-hydro_initexcision_fraction )
+            {
+              hydro_excision_mask[point] = normal;
+            }
+            else 
+            {
+              hydro_excision_mask[point] = excised;
+              if (hydro_initexcision_old_mask)
+                emask[point]=emask_excised;
+            }
+          }
+          else if (CCTK_Equals(hydro_initexcision_type,"diagonal"))
+          {
+            if ( x_frac + y_frac + z_frac <
+                 3.0*(1.0-hydro_initexcision_fraction) )
+            {
+              hydro_excision_mask[point] = normal;
+            }
+            else 
+            {
+              hydro_excision_mask[point] = excised;
+              if (hydro_initexcision_old_mask)
+                emask[point]=emask_excised;
+            }
+          }
+          else if (CCTK_Equals(hydro_initexcision_type,"sphere"))
+          {
+            if ( (hydro_initexcision_coordinate_length <= 0.0) &&
+                 ( ( (x[point]-hydro_initexcision_position_x) *
+                     (x[point]-hydro_initexcision_position_x) +
+                     (y[point]-hydro_initexcision_position_y) *
+                     (y[point]-hydro_initexcision_position_y) +
+                     (z[point]-hydro_initexcision_position_z) *
+                     (z[point]-hydro_initexcision_position_z) ) * 4.0
+                   > (hydro_initexcision_fraction * x_size *
+                      hydro_initexcision_fraction * x_size) ) ||
+                 ( (hydro_initexcision_coordinate_length > 0) &&
+                   ( (hydro_initexcision_coordinate_length < 
+                      cctkGH->cctk_delta_space[0]*
+                      hydro_initexcision_min_points) ||
+                       ( (x[point]-hydro_initexcision_position_x) *
+                         (x[point]-hydro_initexcision_position_x) +
+                         (y[point]-hydro_initexcision_position_y) *
+                         (y[point]-hydro_initexcision_position_y) +
+                         (z[point]-hydro_initexcision_position_z) *
+                         (z[point]-hydro_initexcision_position_z)
+                     > hydro_initexcision_coordinate_length*
+                       hydro_initexcision_coordinate_length) ) ) )
+            {
+              hydro_excision_mask[point] = normal;
+            }
+            else 
+            {
+              hydro_excision_mask[point] = excised;
+              if (hydro_initexcision_old_mask)
+              {
+                emask[point]=emask_excised;
+              }
+            }
+          }
+        }
+        else
+        {
+          hydro_excision_mask[point] = normal;
+          if (hydro_initexcision_old_mask)
+            emask[point]=emask_normal;
+        }
+      }
+    }
+  }
+  return;
+}
+
+void Hydro_InitExcisionMask_poststep(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  if (hydro_initexcision_poststep)
+      Hydro_InitExcisionMask(CCTK_PASS_CTOC);
+}
+
diff --git a/src/Whisky_InitExcision.c b/src/Whisky_InitExcision.c
deleted file mode 100644
index 787fade..0000000
--- a/src/Whisky_InitExcision.c
+++ /dev/null
@@ -1,253 +0,0 @@
- /*@@
-   @file      Whisky_ExcisionMask.c
-   @date      Wed Mar 13 14:18:38 2002
-   @author    Andrea Nerozzi, Frank Loeffler
-   @desc 
-   Creates the mask for an excision region 
-   @enddesc 
- @@*/
-
-#include "cctk.h"
-#include "cctk_Parameters.h"
-#include "cctk_Arguments.h"
-#include <stdio.h>
-#include <math.h>
-
- /*@@
-   @routine    Excision Mask 
-   @date       Mon Apr 7 14:18:38 2003
-   @author     Andrea Nerozzi
-   @desc 
-   Sets up the excision region
-   @enddesc 
-   @calls     
-   @calledby   
-   @history    added 'sphere' and rewrote to be multi-processor-safe
- 
-   @endhistory 
-
-@@*/
-
-void Whisky_InitExcisionMask(CCTK_ARGUMENTS)
-{
-
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-
-  CCTK_INT  i,j,k, nx, ny, nz, point;
-  CCTK_INT excised, normal;
-  CCTK_REAL emask_excised, emask_normal;
-  CCTK_REAL x_min, x_max, y_min, y_max, z_min, z_max;
-  CCTK_REAL x_size, y_size, z_size;
-  CCTK_REAL x_frac, y_frac, z_frac;
-
-  if (whisky_initexcision)
-  {
-    CCTK_INFO("Setting up Whisky Initial Excision region.");
-  }
-
-  nx = cctk_lsh[0];
-  ny = cctk_lsh[1];
-  nz = cctk_lsh[2];
-
-  CCTK_CoordRange(cctkGH, &x_min, &x_max, 1, NULL, "cart3d");
-  CCTK_CoordRange(cctkGH, &y_min, &y_max, 2, NULL, "cart3d");
-  CCTK_CoordRange(cctkGH, &z_min, &z_max, 3, NULL, "cart3d");
-  x_size = x_max - x_min;
-  y_size = y_max - y_min;
-  z_size = z_max - z_min;
-
-  excised=1;
-  normal =0;
-  emask_excised=0.0;
-  emask_normal=1.0;
-  if (whisky_initexcision_flip)
-  {
-    excised=0;
-    normal =1;
-    emask_excised=1.0;
-    emask_normal=0.0;
-  }
-
-  for (k=0 ; k<nz ; k++)
-  {
-    for (j=0 ; j<ny ; j++)
-    {
-      for (i=0 ; i<nx; i++)
-      { 
-        point = CCTK_GFINDEX3D(cctkGH,i,j,k);
-        x_frac = (x[point]-x_min) / x_size + 1.e-10;
-        y_frac = (y[point]-y_min) / y_size + 1.e-10;
-        z_frac = (z[point]-z_min) / z_size + 1.e-10;
-
-        if (whisky_initexcision)
-        {
-          if (whisky_initexcision_old_mask)
-            emask[point]=emask_normal;
-          if (CCTK_Equals(whisky_initexcision_type,"box"))
-          {
-              if (CCTK_Equals(domain,"full"))
-              {
-                 if ( (whisky_initexcision_coordinate_length <= 0.0) &&
-                      ( ( x_frac > 0.5 - whisky_initexcision_fraction) &&
-                        ( x_frac < 0.5 + whisky_initexcision_fraction) &&
-                        ( y_frac > 0.5 - whisky_initexcision_fraction) &&
-                        ( y_frac < 0.5 + whisky_initexcision_fraction) &&
-                        ( z_frac > 0.5 - whisky_initexcision_fraction) &&
-                        ( z_frac < 0.5 + whisky_initexcision_fraction)
-                      ) ||
-                      ( (whisky_initexcision_coordinate_length > 0.0) &&
-                        ( fabs(x[point]-whisky_initexcision_position_x) <=
-                          whisky_initexcision_coordinate_length*0.5) &&
-                        ( fabs(y[point]-whisky_initexcision_position_y) <=
-                          whisky_initexcision_coordinate_length*0.5) &&
-                        ( fabs(z[point]-whisky_initexcision_position_z) <=
-                          whisky_initexcision_coordinate_length*0.5)
-                      )
-                    )
-                 {
-                    hydro_excision_mask[point] = excised;
-                    if (whisky_initexcision_old_mask)
-                      emask[point]=emask_excised;
-                 }
-                 else
-                 {
-                    hydro_excision_mask[point] = normal;
-                 }
-              }
-              else if (CCTK_Equals(domain,"octant"))
-              {
-                 if ( ( (whisky_initexcision_coordinate_length <= 0.0) &&
-                        ( x_frac < whisky_initexcision_fraction) &&
-                        ( y_frac < whisky_initexcision_fraction) &&
-                        ( z_frac < whisky_initexcision_fraction)
-                      ) || 
-                      ( (whisky_initexcision_coordinate_length > 0.0) &&
-                        ( fabs(x[point]-whisky_initexcision_position_x) <=
-                          whisky_initexcision_coordinate_length*0.5) &&
-                        ( fabs(y[point]-whisky_initexcision_position_y) <=
-                          whisky_initexcision_coordinate_length*0.5) &&
-                        ( fabs(z[point]-whisky_initexcision_position_z) <=
-                          whisky_initexcision_coordinate_length*0.5)
-                      )
-                    )
-                 {
-                    hydro_excision_mask[point] = excised;
-                    if (whisky_initexcision_old_mask)
-                      emask[point]=emask_excised;
-                 }
-                 else
-                 {
-                    hydro_excision_mask[point] = normal;
-                 }
-              }
-          }
-          else if (CCTK_Equals(whisky_initexcision_type,"x-axis"))
-          {
-            if ( x_frac < 1.0-whisky_initexcision_fraction )
-            {
-              hydro_excision_mask[point] = normal;
-            }
-            else 
-            {
-              hydro_excision_mask[point] = excised;
-              if (whisky_initexcision_old_mask)
-                emask[point]=emask_excised;
-            }
-          }
-          else if (CCTK_Equals(whisky_initexcision_type,"y-axis"))
-          {
-            if ( y_frac < 1.0-whisky_initexcision_fraction )
-            {
-              hydro_excision_mask[point] = normal;
-            }
-            else 
-            {
-              hydro_excision_mask[point] = excised;
-              if (whisky_initexcision_old_mask)
-                emask[point]=emask_excised;
-            }
-          }
-          else if (CCTK_Equals(whisky_initexcision_type,"z-axis"))
-          {
-            if ( z_frac < 1.0-whisky_initexcision_fraction )
-            {
-              hydro_excision_mask[point] = normal;
-            }
-            else 
-            {
-              hydro_excision_mask[point] = excised;
-              if (whisky_initexcision_old_mask)
-                emask[point]=emask_excised;
-            }
-          }
-          else if (CCTK_Equals(whisky_initexcision_type,"diagonal"))
-          {
-            if ( x_frac + y_frac + z_frac <
-                 3.0*(1.0-whisky_initexcision_fraction) )
-            {
-              hydro_excision_mask[point] = normal;
-            }
-            else 
-            {
-              hydro_excision_mask[point] = excised;
-              if (whisky_initexcision_old_mask)
-                emask[point]=emask_excised;
-            }
-          }
-          else if (CCTK_Equals(whisky_initexcision_type,"sphere"))
-          {
-            if ( (whisky_initexcision_coordinate_length <= 0.0) &&
-                 ( ( (x[point]-whisky_initexcision_position_x) *
-                     (x[point]-whisky_initexcision_position_x) +
-                     (y[point]-whisky_initexcision_position_y) *
-                     (y[point]-whisky_initexcision_position_y) +
-                     (z[point]-whisky_initexcision_position_z) *
-                     (z[point]-whisky_initexcision_position_z) ) * 4.0
-                   > (whisky_initexcision_fraction * x_size *
-                      whisky_initexcision_fraction * x_size) ) ||
-                 ( (whisky_initexcision_coordinate_length > 0) &&
-                   ( (whisky_initexcision_coordinate_length < 
-                      cctkGH->cctk_delta_space[0]*
-                      whisky_initexcision_min_points) ||
-                       ( (x[point]-whisky_initexcision_position_x) *
-                         (x[point]-whisky_initexcision_position_x) +
-                         (y[point]-whisky_initexcision_position_y) *
-                         (y[point]-whisky_initexcision_position_y) +
-                         (z[point]-whisky_initexcision_position_z) *
-                         (z[point]-whisky_initexcision_position_z)
-                     > whisky_initexcision_coordinate_length*
-                       whisky_initexcision_coordinate_length) ) ) )
-            {
-              hydro_excision_mask[point] = normal;
-            }
-            else 
-            {
-              hydro_excision_mask[point] = excised;
-              if (whisky_initexcision_old_mask)
-              {
-                emask[point]=emask_excised;
-              }
-            }
-          }
-        }
-        else
-        {
-          hydro_excision_mask[point] = normal;
-          if (whisky_initexcision_old_mask)
-            emask[point]=emask_normal;
-        }
-      }
-    }
-  }
-  return;
-}
-
-void Whisky_InitExcisionMask_poststep(CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  DECLARE_CCTK_PARAMETERS;
-  if (whisky_initexcision_poststep)
-      Whisky_InitExcisionMask(CCTK_PASS_CTOC);
-}
-
diff --git a/src/make.code.defn b/src/make.code.defn
index df9cf14..0c9bcc5 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -1,9 +1,5 @@
-# Main make.code.defn file for thorn Hydra
-# $Header$
-
 # Source files in this directory
-
-SRCS = 	Whisky_InitExcision.c
+SRCS = 	Hydro_InitExcision.c
 
 # Subdirectories containing source files
 SUBDIRS = 
diff --git a/test/diag_flip_pugh_eno.par b/test/diag_flip_pugh_eno.par
index 39694b4..c602eda 100644
--- a/test/diag_flip_pugh_eno.par
+++ b/test/diag_flip_pugh_eno.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,16 +70,16 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip = 1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip = 1
diff --git a/test/diag_flip_pugh_ppm.par b/test/diag_flip_pugh_ppm.par
index 1128a7d..71fabcf 100644
--- a/test/diag_flip_pugh_ppm.par
+++ b/test/diag_flip_pugh_ppm.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,16 +70,16 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip = 1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip = 1
diff --git a/test/diag_flip_pugh_tvd.par b/test/diag_flip_pugh_tvd.par
index 280096c..7ebb09b 100644
--- a/test/diag_flip_pugh_tvd.par
+++ b/test/diag_flip_pugh_tvd.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -71,16 +71,16 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip = 1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip = 1
diff --git a/test/diag_pugh_eno.par b/test/diag_pugh_eno.par
index b2eb83a..58f16f5 100644
--- a/test/diag_pugh_eno.par
+++ b/test/diag_pugh_eno.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,14 +70,14 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/diag_pugh_ppm.par b/test/diag_pugh_ppm.par
index 7a0ef2c..8cc419f 100644
--- a/test/diag_pugh_ppm.par
+++ b/test/diag_pugh_ppm.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,14 +70,14 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/diag_pugh_tvd.par b/test/diag_pugh_tvd.par
index 18ca257..a2c2a81 100644
--- a/test/diag_pugh_tvd.par
+++ b/test/diag_pugh_tvd.par
@@ -54,11 +54,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -71,14 +71,14 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"diagshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"diagshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="diagonal"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="diagonal"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/halfsphere_pugh_eno.par b/test/halfsphere_pugh_eno.par
index 228b8a7..8cfac12 100644
--- a/test/halfsphere_pugh_eno.par
+++ b/test/halfsphere_pugh_eno.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -74,15 +74,15 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.5
-whisky_initexcision::whisky_initexcision_position_x=9.5
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.5
+hydro_initexcision::hydro_initexcision_position_x=9.5
diff --git a/test/halfsphere_pugh_ppm.par b/test/halfsphere_pugh_ppm.par
index 2313e06..04d114c 100644
--- a/test/halfsphere_pugh_ppm.par
+++ b/test/halfsphere_pugh_ppm.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -74,15 +74,15 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.5
-whisky_initexcision::whisky_initexcision_position_x=9.5
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.5
+hydro_initexcision::hydro_initexcision_position_x=9.5
diff --git a/test/halfsphere_pugh_tvd.par b/test/halfsphere_pugh_tvd.par
index 64627f6..b7d2ef0 100644
--- a/test/halfsphere_pugh_tvd.par
+++ b/test/halfsphere_pugh_tvd.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -75,15 +75,15 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.5
-whisky_initexcision::whisky_initexcision_position_x=9.5
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.5
+hydro_initexcision::hydro_initexcision_position_x=9.5
diff --git a/test/sphere_pugh_eno.par b/test/sphere_pugh_eno.par
index badb53c..c596513 100644
--- a/test/sphere_pugh_eno.par
+++ b/test/sphere_pugh_eno.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -74,15 +74,15 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::shock_xpos          = -5.
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::shock_xpos          = -5.
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/sphere_pugh_ppm.par b/test/sphere_pugh_ppm.par
index e3732b1..98e7e15 100644
--- a/test/sphere_pugh_ppm.par
+++ b/test/sphere_pugh_ppm.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -74,15 +74,15 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::shock_xpos          = -5.
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::shock_xpos          = -5.
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/sphere_pugh_tvd.par b/test/sphere_pugh_tvd.par
index 98b4e98..7dafbae 100644
--- a/test/sphere_pugh_tvd.par
+++ b/test/sphere_pugh_tvd.par
@@ -58,11 +58,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -75,15 +75,15 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::shock_xpos          = -5.
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::shock_xpos          = -5.
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="sphere"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="sphere"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/x_flip_pugh_eno.par b/test/x_flip_pugh_eno.par
index 2c2ecfc..d942f0d 100644
--- a/test/x_flip_pugh_eno.par
+++ b/test/x_flip_pugh_eno.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -69,16 +69,16 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip    =1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip    =1
diff --git a/test/x_flip_pugh_ppm.par b/test/x_flip_pugh_ppm.par
index 776ca20..7d05f0e 100644
--- a/test/x_flip_pugh_ppm.par
+++ b/test/x_flip_pugh_ppm.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -69,16 +69,16 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip    =1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip    =1
diff --git a/test/x_flip_pugh_tvd.par b/test/x_flip_pugh_tvd.par
index 167b515..124b366 100644
--- a/test/x_flip_pugh_tvd.par
+++ b/test/x_flip_pugh_tvd.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,16 +70,16 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
-whisky_init_data::change_shock_direction = "yes"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
+grhydro_initdata::change_shock_direction = "yes"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.75
-whisky_initexcision::whisky_initexcision_flip    =1
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.75
+hydro_initexcision::hydro_initexcision_flip    =1
diff --git a/test/x_pugh_eno.par b/test/x_pugh_eno.par
index e80ba03..a8c46e3 100644
--- a/test/x_pugh_eno.par
+++ b/test/x_pugh_eno.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -69,14 +69,14 @@ whisky::whisky_stencil			=	2
 whisky::recon_method			=	"eno"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/x_pugh_ppm.par b/test/x_pugh_ppm.par
index dbc742e..c0f4872 100644
--- a/test/x_pugh_ppm.par
+++ b/test/x_pugh_ppm.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -69,14 +69,14 @@ whisky::whisky_stencil			=	3
 whisky::recon_method			=	"ppm"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.25
diff --git a/test/x_pugh_tvd.par b/test/x_pugh_tvd.par
index df07a43..02614a4 100644
--- a/test/x_pugh_tvd.par
+++ b/test/x_pugh_tvd.par
@@ -53,11 +53,11 @@ ADMBase::initial_shift			=	"none"
 ADMBase::metric_type			= 	"physical"
 SpaceMask::use_mask = "yes"
 
-ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
+ActiveThorns = "eos_base eos_idealfluid eos_polytrope"
 
-EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
+EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "tmunubase hydrobase whisky initbase"
+ActiveThorns = "tmunubase hydrobase grhydro initbase"
 
 hydrobase::timelevels = 2
 hydrobase::evolution_method       = "whisky"
@@ -70,14 +70,14 @@ whisky::recon_method			=	"tvd"
 whisky::tvd_limiter			=	"minmod"
 whisky::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "grhydro_initdata"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	    =	"xshock"
-whisky_init_data::shock_case          =	"Simple"
+grhydro_initdata::shocktube_type	    =	"xshock"
+grhydro_initdata::shock_case          =	"Simple"
 
-ActiveThorns = "whisky_initexcision"
+ActiveThorns = "hydro_initexcision"
 
-whisky_initexcision::whisky_initexcision = "yes"
-whisky_initexcision::whisky_initexcision_type ="x-axis"
-whisky_initexcision::whisky_initexcision_fraction=0.25
+hydro_initexcision::hydro_initexcision = "yes"
+hydro_initexcision::hydro_initexcision_type ="x-axis"
+hydro_initexcision::hydro_initexcision_fraction=0.25