file/parameter string replacement from whisky to GRHydro

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/GRHydro_InitData/trunk@106 ac85fae7-cede-4708-beff-ae01c7fa1c26

16 files changed, 112 insertions, 112 deletions

diff --git a/README b/README
index 72224b2..fe25384 100644
--- a/README
+++ b/README
@@ -1,14 +1,14 @@
-Cactus Code Thorn Whisky_Init_Data
+Cactus Code Thorn GRHydro_Init_Data  
 Author(s)    : Luca Baiotti
                Ian Hawke
                Scott Hawley
                Frank Löffler
                Christian David Ott
-Maintainer(s): Whisky developers team
+Maintainer(s): CIGR developers team
 Licence      : GPLv2+
 --------------------------------------------------------------------------
 
 1. Purpose
 
-Provides simple initial data (shock tubes, ...) for the Whisky code.
+Provides simple initial data (shock tubes, ...) for the GRHydro code.
 
diff --git a/doc/documentation.tex b/doc/documentation.tex
index 968e98a..6383fd4 100644
--- a/doc/documentation.tex
+++ b/doc/documentation.tex
@@ -2,18 +2,18 @@
 
 \begin{document}
 
-\title{Whisky\_Init\_Data}
+\title{GRHydro\_Init\_Data}
 \author{Luca Baiotti, Ian Hawke, Scott Hawley}
 \date{24/07/2008}
 \maketitle
 
-\abstract{Whisky\_Init\_Data - some initial data for {\tt Whisky}}
+\abstract{GRHydro\_Init\_Data - some initial data for {\tt GRHydro}}
 
 \section{Introduction}
 \label{sec:intro}
 
-This thorn generates some initial data for the Whisky code. There are more (and more physically
-interesting) initial-data codes in other thorns. As with the Whisky code itself, please feel free to
+This thorn generates some initial data for the GRHydro code. There are more (and more physically
+interesting) initial-data codes in other thorns. As with the GRHydro code itself, please feel free to
 add, alter or extend any part of this code. However please keep the documentation up to date (even,
 or especially, if it's just to say what doesn't work).
 
diff --git a/interface.ccl b/interface.ccl
index 29c56be..52f1998 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -1,8 +1,8 @@
-# Interface definition for thorn Whisky_Init_Data
+# Interface definition for thorn GRHydro_Init_Data
 # $Header$
 
-implements: whisky_init_data
-inherits: whisky grid
+implements: GRHydro_init_data
+inherits: GRHydro grid
 
 USES INCLUDE: EOS_Base.inc
 USES INCLUDE: SpaceMask.h
@@ -50,7 +50,7 @@ SUBROUTINE Con2PrimPoly(CCTK_INT IN handle, CCTK_REAL OUT dens, \
 			CCTK_REAL IN uyz, CCTK_REAL IN uzz, CCTK_REAL IN det, \
 			CCTK_REAL IN x, CCTK_REAL IN y, CCTK_REAL IN z, \
 			CCTK_REAL IN r, CCTK_REAL IN rho_min, \
-			CCTK_INT IN whisky_reflevel, CCTK_REAL IN whisky_C2P_failed)
+			CCTK_INT IN GRHydro_reflevel, CCTK_REAL IN GRHydro_C2P_failed)
 
 
 USES FUNCTION SpatialDet
@@ -81,4 +81,4 @@ CCTK_REAL simple_wave_output TYPE=GF TIMELEVELS=1 tags='checkpoint="no"'
 
 private:
 
-CCTK_INT whisky_init_data_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level Whisky is working on right now"
+CCTK_INT GRHydro_init_data_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level GRHydro is working on right now"
diff --git a/param.ccl b/param.ccl
index 64a8aad..2655115 100644
--- a/param.ccl
+++ b/param.ccl
@@ -1,4 +1,4 @@
-# Parameter definitions for thorn Whisky_Init_Data
+# Parameter definitions for thorn GRHydro_Init_Data
 # $Header$
 
 shares:HydroBase
@@ -17,7 +17,7 @@ shares:ADMBase
 
 EXTENDS KEYWORD initial_data ""
 {
-#  "shocktube"		:: "Shock tube initial data for Whisky"
+#  "shocktube"		:: "Shock tube initial data for GRHydro"
   "con2primtest"	:: "Testing the con -> prim conversion"
   "con2prim2con_test"	:: "Testing the con -> prim -> con conversion"
   "reconstruction_test"	:: "Testing reconstruction"
@@ -86,14 +86,14 @@ BOOLEAN attenuate_atmosphere "Attenuate the velocity in the atmosphere"
 {
 } "no"
 
-shares:whisky
+shares:GRHydro
 
-USES real whisky_rho_central
-USES real whisky_eps_min ""
-USES real whisky_perc_ptol ""
-USES real whisky_del_ptol ""
-USES string whisky_eos_type ""
-USES string whisky_eos_table ""
+USES real GRHydro_rho_central
+USES real GRHydro_eps_min ""
+USES real GRHydro_perc_ptol ""
+USES real GRHydro_del_ptol ""
+USES string GRHydro_eos_type ""
+USES string GRHydro_eos_table ""
 USES real rho_abs_min
 USES real rho_rel_min
 USES REAL initial_rho_abs_min
diff --git a/schedule.ccl b/schedule.ccl
index 1503665..1622776 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,33 +1,33 @@
-# Schedule definitions for thorn Whisky_Init_Data
+# Schedule definitions for thorn GRHydro_Init_Data
 
-schedule Whisky_InitData_CheckParameters  AT CCTK_PARAMCHECK
+schedule GRHydro_InitData_CheckParameters  AT CCTK_PARAMCHECK
 {
   LANG: C
 } "Check parameters"
 
 if (CCTK_Equals(initial_hydro,"shocktube")) {
-  schedule Whisky_shocktube in HydroBase_Initial
+  schedule GRHydro_shocktube in HydroBase_Initial
   {
     LANG: Fortran
   } "Shocktube initial data"
 }
 
 if (CCTK_Equals(initial_data,"con2primtest")) {
-  STORAGE:whisky_init_data_reflevel
-  schedule Whisky_Init_Data_RefinementLevel IN HydroBase_Initial BEFORE Whisky_con2primtest
+  STORAGE:GRHydro_init_data_reflevel
+  schedule GRHydro_Init_Data_RefinementLevel IN HydroBase_Initial BEFORE GRHydro_con2primtest
   {
     LANG: Fortran
   } "Calculate current refinement level"
 
-  schedule Whisky_con2primtest in HydroBase_Initial
+  schedule GRHydro_con2primtest in HydroBase_Initial
   {
     LANG: Fortran
   } "Testing the conservative to primitive solver"
 }
 
 if (CCTK_Equals(initial_data,"con2prim2con_test")) {
-  STORAGE:whisky_init_data_reflevel
-  schedule Whisky_Init_Data_RefinementLevel IN HydroBase_Initial BEFORE c2p2c
+  STORAGE:GRHydro_init_data_reflevel
+  schedule GRHydro_Init_Data_RefinementLevel IN HydroBase_Initial BEFORE c2p2c
   {
     LANG: Fortran
   } "Calculate current refinement level"
@@ -39,24 +39,24 @@ if (CCTK_Equals(initial_data,"con2prim2con_test")) {
 }
 
 if (CCTK_Equals(initial_data,"reconstruction_test")) {
-  schedule Whisky_reconstruction_test in HydroBase_Initial
+  schedule GRHydro_reconstruction_test in HydroBase_Initial
   {
     LANG: Fortran
-    STORAGE: whisky_prim_bext
-    STORAGE: whisky_scalars
+    STORAGE: GRHydro_prim_bext
+    STORAGE: GRHydro_scalars
     OPTIONS: global loop-local
   } "Testing the reconstruction"
 }
 
 if (CCTK_Equals(initial_hydro,"only_atmo")) {
-  schedule Whisky_Only_Atmo in HydroBase_Initial
+  schedule GRHydro_Only_Atmo in HydroBase_Initial
   {
     LANG: Fortran
   } "Only atmosphere as initial data"
 }
 
 if (CCTK_Equals(initial_hydro,"read_conformal")) {
-  schedule Whisky_ReadConformalData in HydroBase_Initial
+  schedule GRHydro_ReadConformalData in HydroBase_Initial
   {
     LANG: Fortran
   } "Set the missing quantities, after reading in from file initial data from conformally-flat codes (Garching)"
@@ -65,13 +65,13 @@ if (CCTK_Equals(initial_hydro,"read_conformal")) {
 if (CCTK_Equals(initial_hydro,"simple_wave")) {
   STORAGE: simple_wave_grid_functions
   STORAGE: simple_wave_scalars
-  schedule Whisky_SimpleWave in HydroBase_Initial
+  schedule GRHydro_SimpleWave in HydroBase_Initial
   {
     LANG: Fortran
   } "Set initial data from Anile Miller Motta, Phys.Fluids. 26, 1450 (1983)"
 
   STORAGE: simple_wave_output
-  schedule Whisky_SimpleWave_Analysis AT CCTK_ANALYSIS AFTER Whisky_Entropy
+  schedule GRHydro_SimpleWave_Analysis AT CCTK_ANALYSIS AFTER GRHydro_Entropy
   {
     LANG: Fortran
   } "Compute some output variables for the Simple Wave"
diff --git a/src/CheckParam.c b/src/CheckParam.c
index 68f446c..e758f4d 100644
--- a/src/CheckParam.c
+++ b/src/CheckParam.c
@@ -2,7 +2,7 @@
 #include "cctk_Arguments.h"
 #include "cctk_Parameters.h"
 
-void Whisky_InitData_CheckParameters(CCTK_ARGUMENTS)
+void GRHydro_InitData_CheckParameters(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
diff --git a/src/Whisky_C2P2C.F90 b/src/GRHydro_C2P2C.F90
index b6ea31b..5808c1b 100644
--- a/src/Whisky_C2P2C.F90
+++ b/src/GRHydro_C2P2C.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_C2P2C.F90
+   @file      GRHydro_C2P2C.F90
    @date      Sat Jan 26 02:44:43 2002
    @author    Luca Baiotti
    @desc 
@@ -89,9 +89,9 @@ subroutine c2p2c(CCTK_ARGUMENTS)
 
   epsnegative = .false.
   
-  whisky_rho_min = 1.e-10
-  pmin   = EOS_Pressure(whisky_eos_handle, whisky_rho_min, 1.0d0)
-  epsmin = EOS_SpecificIntEnergy(whisky_eos_handle, whisky_rho_min, pmin)
+  GRHydro_rho_min = 1.e-10
+  pmin   = EOS_Pressure(GRHydro_eos_handle, GRHydro_rho_min, 1.0d0)
+  epsmin = EOS_SpecificIntEnergy(GRHydro_eos_handle, GRHydro_rho_min, pmin)
   C2P_failed = 0
 
   write(*,*) 'C2P2C test: initial values.'
@@ -105,11 +105,11 @@ subroutine c2p2c(CCTK_ARGUMENTS)
   write(*,*) '   W   : ',w_lorentz_send
   
   write(*,*) 'C2P2C test: getting the associated primitive variables.'
-  call Con2Prim_pt(whisky_eos_handle,dens_send,sx_send,sy_send,sz_send, &
+  call Con2Prim_pt(GRHydro_eos_handle,dens_send,sx_send,sy_send,sz_send, &
        tau_send,rho_send,velx_send,vely_send,velz_send, &
        eps_send,press_send,w_lorentz_send, &
        uxx,uxy,uxz,uyy,uyz,uzz,det,x_send,y_send,z_send,r_send,&
-       epsnegative,whisky_rho_min, pmin, epsmin, whisky_init_data_reflevel,C2P_failed)
+       epsnegative,GRHydro_rho_min, pmin, epsmin, GRHydro_init_data_reflevel,C2P_failed)
   
   write(*,*) 'C2P2C test: the primitive variables are'
   write(*,*) '   primitive variables: '
@@ -122,7 +122,7 @@ subroutine c2p2c(CCTK_ARGUMENTS)
   write(*,*) '   W     : ',w_lorentz_send
   
   write(*,*) 'C2P2C test: converting back to conserved variables.'
-  call prim2con(whisky_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, &
+  call prim2con(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, &
        dens_send, sx_send, sy_send, sz_send, tau_send, rho_send, &
        velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send) 
   
diff --git a/src/Whisky_Con2Prim.F90 b/src/GRHydro_Con2Prim.F90
index 626b02d..6c22850 100644
--- a/src/Whisky_Con2Prim.F90
+++ b/src/GRHydro_Con2Prim.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Con2Prim.F90
+   @file      GRHydro_Con2Prim.F90
    @date      Sat Jan 26 02:49:32 2002
    @author    Luca Baiotti
    @desc 
@@ -12,7 +12,7 @@
 #include "cctk_Arguments.h"
 
  /*@@
-   @routine    Whisky_con2primtest
+   @routine    GRHydro_con2primtest
    @date       Sat Jan 26 02:49:58 2002
    @author     Luca Baiotti
    @desc 
@@ -26,17 +26,17 @@
 
 @@*/
 
-subroutine Whisky_Init_Data_RefinementLevel(CCTK_ARGUMENTS)
+subroutine GRHydro_Init_Data_RefinementLevel(CCTK_ARGUMENTS)
 
   implicit none
   DECLARE_CCTK_ARGUMENTS
 
-  whisky_init_data_reflevel = aint(log10(dble(cctk_levfac(1)))/log10(2.0d0))
+  GRHydro_init_data_reflevel = aint(log10(dble(cctk_levfac(1)))/log10(2.0d0))
 
-end subroutine Whisky_Init_Data_RefinementLevel
+end subroutine GRHydro_Init_Data_RefinementLevel
 
 
-subroutine Whisky_con2primtest(CCTK_ARGUMENTS)
+subroutine GRHydro_con2primtest(CCTK_ARGUMENTS)
   
   implicit  none
   
@@ -92,16 +92,16 @@ subroutine Whisky_con2primtest(CCTK_ARGUMENTS)
 
   epsnegative = .false.
 
-  pmin   = EOS_Pressure(whisky_eos_handle, whisky_rho_min, 1.0d0)
-  epsmin = EOS_SpecificIntEnergy(whisky_eos_handle, whisky_rho_min, pmin)
+  pmin   = EOS_Pressure(GRHydro_eos_handle, GRHydro_rho_min, 1.0d0)
+  epsmin = EOS_SpecificIntEnergy(GRHydro_eos_handle, GRHydro_rho_min, pmin)
   C2P_failed = 0
 
   write(*,*) 'Con2Prim test: converting to primitive variables'
-  call Con2Prim_pt(whisky_eos_handle,dens_send,sx_send,sy_send,sz_send,&
+  call Con2Prim_pt(GRHydro_eos_handle,dens_send,sx_send,sy_send,sz_send,&
        tau_send,rho_send,velx_send,vely_send,velz_send,&
        eps_send,press_send,w_lorentz_send, &
        uxx,uxy,uxz,uyy,uyz,uzz,det,x_send,y_send,z_send,r_send,&
-       epsnegative,whisky_rho_min, pmin, epsmin, whisky_init_data_reflevel, C2P_failed)
+       epsnegative,GRHydro_rho_min, pmin, epsmin, GRHydro_init_data_reflevel, C2P_failed)
   write(*,*) 'Con2Prim test: the primitive variables are'
   write(*,*) '   primitive variables: '
   write(*,*) '   rho   : ',rho_send
@@ -116,4 +116,4 @@ subroutine Whisky_con2primtest(CCTK_ARGUMENTS)
 
   return
 
-end subroutine Whisky_con2primtest
+end subroutine GRHydro_con2primtest
diff --git a/src/Whisky_Only_Atmo.F90 b/src/GRHydro_Only_Atmo.F90
index 7bdc79f..c2fb989 100644
--- a/src/Whisky_Only_Atmo.F90
+++ b/src/GRHydro_Only_Atmo.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Only_Atmo.F90
+   @file      GRHydro_Only_Atmo.F90
    @date      Sat Jan 29 04:44:25 2002
    @author    Luca Baiotti
    @desc 
@@ -19,7 +19,7 @@
 #define sz(i,j,k) scon(i,j,k,3)
 
  /*@@
-   @routine    Whisky_Only_Atmo
+   @routine    GRHydro_Only_Atmo
    @date       Sat Jan 29 04:53:43 2002
    @author     Luca Baiotti
    @desc 
@@ -33,7 +33,7 @@
 
 @@*/
 
-subroutine Whisky_Only_Atmo(CCTK_ARGUMENTS)
+subroutine GRHydro_Only_Atmo(CCTK_ARGUMENTS)
 
   implicit none
   
@@ -52,7 +52,7 @@ subroutine Whisky_Only_Atmo(CCTK_ARGUMENTS)
   
   if (rho_abs_min > 0.0) then
     atmo = rho_abs_min
-    whisky_rho_min = rho_abs_min
+    GRHydro_rho_min = rho_abs_min
   else 
     call CCTK_WARN(0,"For initial data 'only_atmo' the parameter 'rho_abs_min' must be set")
   end if
@@ -82,7 +82,7 @@ subroutine Whisky_Only_Atmo(CCTK_ARGUMENTS)
     vely(:,:,:) = vely(:,:,:) * (1.d0 - exp(-2.d0 * (r - 1.d0)**2))
     velz(:,:,:) = velz(:,:,:) * (1.d0 - exp(-2.d0 * (r - 1.d0)**2))
   end if
-  eps = whisky_eps_min
+  eps = GRHydro_eps_min
 
   do i=1,nx
     do j=1,ny
@@ -96,7 +96,7 @@ subroutine Whisky_Only_Atmo(CCTK_ARGUMENTS)
         
         call SpatialDeterminant(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),&
              gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),det)
-        call prim2con(whisky_eos_handle,gxx(i,j,k),gxy(i,j,k),&
+        call prim2con(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),&
              gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&
              det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
              tau(i,j,k),rho(i,j,k),velx(i,j,k),vely(i,j,k),velz(i,j,k),&
@@ -111,4 +111,4 @@ subroutine Whisky_Only_Atmo(CCTK_ARGUMENTS)
 
   return
   
-end subroutine Whisky_Only_Atmo
+end subroutine GRHydro_Only_Atmo
diff --git a/src/Whisky_ReadConformalData.F90 b/src/GRHydro_ReadConformalData.F90
index 0d31976..5829d80 100644
--- a/src/Whisky_ReadConformalData.F90
+++ b/src/GRHydro_ReadConformalData.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_ReadConformalData.F90
+   @file      GRHydro_ReadConformalData.F90
    @date      Fri Jul  6 12:29:27 2007
    @author    Luca Baiotti
    @desc 
@@ -21,7 +21,7 @@
 #define sz(i,j,k) scon(i,j,k,3)
 
  /*@@
-   @routine    Whisky_ReadConformalData
+   @routine    GRHydro_ReadConformalData
    @date       Fri Jul  6 12:31:18 2007
    @author     Luca Baiotti
    @desc 
@@ -35,7 +35,7 @@
 
 @@*/
 
-subroutine Whisky_ReadConformalData(CCTK_ARGUMENTS)
+subroutine GRHydro_ReadConformalData(CCTK_ARGUMENTS)
 
   implicit none
   
@@ -131,8 +131,8 @@ subroutine Whisky_ReadConformalData(CCTK_ARGUMENTS)
 
 !  if (handle < 0) call CCTK_WARN(0,"For this hack you need to compile with EOS_Polytrope")
 
-  eos_k = EOS_Pressure(whisky_eos_handle, 1.0, 1.0)
-  eos_gamma = 1.0 + eos_k / EOS_SpecificIntEnergy(whisky_eos_handle,1.0,1.0)
+  eos_k = EOS_Pressure(GRHydro_eos_handle, 1.0, 1.0)
+  eos_gamma = 1.0 + eos_k / EOS_SpecificIntEnergy(GRHydro_eos_handle,1.0,1.0)
 
 
 !  press = eos_k * rho**eos_gamma
@@ -140,7 +140,7 @@ subroutine Whisky_ReadConformalData(CCTK_ARGUMENTS)
   do i=1,cctk_lsh(1)
     do j=1,cctk_lsh(2)
       do k=1,cctk_lsh(3)
-        eps(i,j,k) = EOS_SpecificIntEnergy(whisky_eos_handle,rho(i,j,k),press(i,j,k))
+        eps(i,j,k) = EOS_SpecificIntEnergy(GRHydro_eos_handle,rho(i,j,k),press(i,j,k))
       end do
     end do
   end do
@@ -163,15 +163,15 @@ subroutine Whisky_ReadConformalData(CCTK_ARGUMENTS)
         call SpatialDet(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),&
              gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),det)
         
-        if (CCTK_EQUALS(whisky_eos_type,"Polytype")) then
-          call Prim2ConPoly(whisky_eos_handle,gxx(i,j,k),gxy(i,j,k),&
+        if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then
+          call Prim2ConPoly(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),&
                gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&
                det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
                tau(i,j,k),rho(i,j,k),&
                velx(i,j,k),vely(i,j,k),velz(i,j,k),&
                eps(i,j,k),press(i,j,k),w_lorentz(i,j,k))
         else
-          call Prim2ConGen(whisky_eos_handle,gxx(i,j,k),gxy(i,j,k),&
+          call Prim2ConGen(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),&
                gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&
                det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
                tau(i,j,k),rho(i,j,k),&
@@ -186,4 +186,4 @@ subroutine Whisky_ReadConformalData(CCTK_ARGUMENTS)
 
   return
   
-end subroutine Whisky_ReadConformalData
+end subroutine GRHydro_ReadConformalData
diff --git a/src/Whisky_ReconstructTest.F90 b/src/GRHydro_ReconstructTest.F90
index 3302748..a8ea62f 100644
--- a/src/Whisky_ReconstructTest.F90
+++ b/src/GRHydro_ReconstructTest.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_ReconstructTest.F90
+   @file      GRHydro_ReconstructTest.F90
    @date      Sat Jan 26 02:51:49 2002
    @author    Luca Baiotti
    @desc 
@@ -12,7 +12,7 @@
 #include "cctk_Parameters.h"
 
  /*@@
-   @routine    Whisky_reconstruction_test
+   @routine    GRHydro_reconstruction_test
    @date       Sat Jan 26 02:52:17 2002
    @author     Luca Baiotti
    @desc 
@@ -27,7 +27,7 @@
 
 @@*/
 
-subroutine Whisky_reconstruction_test(CCTK_ARGUMENTS)
+subroutine GRHydro_reconstruction_test(CCTK_ARGUMENTS)
 
   implicit none
   
@@ -90,4 +90,4 @@ subroutine Whisky_reconstruction_test(CCTK_ARGUMENTS)
   
   return
   
-end subroutine Whisky_reconstruction_test
+end subroutine GRHydro_reconstruction_test
diff --git a/src/Whisky_ShockTube.F90 b/src/GRHydro_ShockTube.F90
index 8d92dbb..80d8968 100644
--- a/src/Whisky_ShockTube.F90
+++ b/src/GRHydro_ShockTube.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_ShockTube.F90
+   @file      GRHydro_ShockTube.F90
    @date      Sat Jan 26 02:53:25 2002
    @author    Ian Hawke
    @desc 
@@ -20,7 +20,7 @@
 #define sz(i,j,k) scon(i,j,k,3)
 
  /*@@
-   @routine    Whisky_shocktube
+   @routine    GRHydro_shocktube
    @date       Sat Jan 26 02:53:49 2002
    @author     Ian Hawke
    @desc 
@@ -36,7 +36,7 @@
 
 @@*/
 
-subroutine Whisky_shocktube(CCTK_ARGUMENTS)
+subroutine GRHydro_shocktube(CCTK_ARGUMENTS)
 
   implicit none
   
@@ -127,15 +127,15 @@ subroutine Whisky_shocktube(CCTK_ARGUMENTS)
         call SpatialDet(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),&
              gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),det)
 
-        if (CCTK_EQUALS(whisky_eos_type,"Polytype")) then
-          call Prim2ConPoly(whisky_eos_handle,gxx(i,j,k),gxy(i,j,k),&
+        if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then
+          call Prim2ConPoly(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),&
                gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&
                det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
                tau(i,j,k),rho(i,j,k),&
                velx(i,j,k),vely(i,j,k),velz(i,j,k),&
                eps(i,j,k),press(i,j,k),w_lorentz(i,j,k))
         else
-          call Prim2ConGen(whisky_eos_handle,gxx(i,j,k),gxy(i,j,k),&
+          call Prim2ConGen(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),&
                gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&
                det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
                tau(i,j,k),rho(i,j,k),&
@@ -152,4 +152,4 @@ subroutine Whisky_shocktube(CCTK_ARGUMENTS)
 
   return
   
-end subroutine Whisky_shocktube
+end subroutine GRHydro_shocktube
diff --git a/src/Whisky_SimpleWave.F90 b/src/GRHydro_SimpleWave.F90
index b840822..829170f 100644
--- a/src/Whisky_SimpleWave.F90
+++ b/src/GRHydro_SimpleWave.F90
@@ -1,6 +1,6 @@
 
  /*@@
-   @file      Whisky_SimpleWave.F90
+   @file      GRHydro_SimpleWave.F90
    @date      Thu Aug  2 15:17:35 2007
    @author    Luca Baiotti
    @desc 
@@ -23,7 +23,7 @@
 #define sz(i,j,k) scon(i,j,k,3)
 
  /*@@
-   @routine    Whisky_SimpleWave
+   @routine    GRHydro_SimpleWave
    @date       Thu Aug  2 15:20:28 2007
    @author     Luca Baiotti
    @desc 
@@ -38,7 +38,7 @@
 
 @@*/
 
-subroutine Whisky_SimpleWave(CCTK_ARGUMENTS)
+subroutine GRHydro_SimpleWave(CCTK_ARGUMENTS)
 
   implicit none
   
@@ -127,13 +127,13 @@ subroutine Whisky_SimpleWave(CCTK_ARGUMENTS)
     
     ! atmosphere
 
-    if ( (rho(i,1,1) < whisky_rho_min).OR.(velx(i,1,1) < 0) ) then
+    if ( (rho(i,1,1) < GRHydro_rho_min).OR.(velx(i,1,1) < 0) ) then
       rho(i,1,1) = rho_abs_min
 !      rho(i,1,1) = 1.0 !the value of rho_min for the initial data
       eps(i,1,1) = rho_abs_min**(1.d0/3.d0)
       velx(i,1,1) = 0.d0
       w_lorentz(i,1,1) = 1.d0
-      press(i,1,1) = EOS_Pressure(whisky_polytrope_handle, rho(i,1,1), 1.0d0)  
+      press(i,1,1) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,1,1), 1.0d0)  
       ! polytrope only (initial data)
     end if
 
@@ -142,16 +142,16 @@ subroutine Whisky_SimpleWave(CCTK_ARGUMENTS)
     call SpatialDet(gxx(i,1,1),gxy(i,1,1),gxz(i,1,1),&
          gyy(i,1,1),gyz(i,1,1),gzz(i,1,1),det)
     
-!    if (CCTK_EQUALS(whisky_eos_type,"Polytype")) then
+!    if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then
     ! always use polytype for initial data
-      call Prim2ConPoly(whisky_polytrope_handle,gxx(i,1,1),gxy(i,1,1),&
+      call Prim2ConPoly(GRHydro_polytrope_handle,gxx(i,1,1),gxy(i,1,1),&
            gxz(i,1,1),gyy(i,1,1),gyz(i,1,1),gzz(i,1,1),&
            det, dens(i,1,1),sx(i,1,1),sy(i,1,1),sz(i,1,1),&
            tau(i,1,1),rho(i,1,1),&
            velx(i,1,1),vely(i,1,1),velz(i,1,1),&
            eps(i,1,1),press(i,1,1),w_lorentz(i,1,1))
 !!$    else
-!!$      call Prim2ConGen(whisky_eos_handle,gxx(i,1,1),gxy(i,1,1),&
+!!$      call Prim2ConGen(GRHydro_eos_handle,gxx(i,1,1),gxy(i,1,1),&
 !!$           gxz(i,1,1),gyy(i,1,1),gyz(i,1,1),gzz(i,1,1),&
 !!$           det, dens(i,1,1),sx(i,1,1),sy(i,1,1),sz(i,1,1),&
 !!$           tau(i,1,1),rho(i,1,1),&
@@ -212,10 +212,10 @@ call CCTK_INFO("Finished initial data")
 
   return
   
-end subroutine Whisky_SimpleWave
+end subroutine GRHydro_SimpleWave
 
 
-subroutine Whisky_SimpleWave_Analysis(CCTK_ARGUMENTS)
+subroutine GRHydro_SimpleWave_Analysis(CCTK_ARGUMENTS)
 
   implicit none
   
@@ -235,4 +235,4 @@ subroutine Whisky_SimpleWave_Analysis(CCTK_ARGUMENTS)
 
   return
 
-end subroutine Whisky_SimpleWave_Analysis
+end subroutine GRHydro_SimpleWave_Analysis
diff --git a/src/Whisky_TOV.F90 b/src/GRHydro_TOV.F90
index c62044d..f40af9a 100644
--- a/src/Whisky_TOV.F90
+++ b/src/GRHydro_TOV.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_TOV.F90
+   @file      GRHydro_TOV.F90
    @date      Wed Feb 13 02:53:25 2002
    @author    Scott Hawley
    @desc 
@@ -12,7 +12,7 @@
 #include "cctk_Arguments.h"
 
  /*@@
-   @routine    Whisky_TOV
+   @routine    GRHydro_TOV
    @date       Sat Jan 26 02:53:49 2002
    @author     Scott Hawley
    @desc 
@@ -21,12 +21,12 @@
    @calls     
    @calledby   
    @history 
-   Alteration of the Whisky_shockwave written by Ian Hawke
+   Alteration of the GRHydro_shockwave written by Ian Hawke
    @endhistory 
 
 @@*/
 
-subroutine Whisky_TOV(CCTK_ARGUMENTS)
+subroutine GRHydro_TOV(CCTK_ARGUMENTS)
 
   implicit  none
   
@@ -80,7 +80,7 @@ subroutine Whisky_TOV(CCTK_ARGUMENTS)
 !-----------------------------------------------------------
 !  Assign data at r=0
 !-----------------------------------------------------------
-    rho0 = whisky_rho_central
+    rho0 = GRHydro_rho_central
     tov_rho(1) = rho0
     tov_alpha(1) = 1.0
     tov_m(1)   = 0.0
@@ -107,7 +107,7 @@ subroutine Whisky_TOV(CCTK_ARGUMENTS)
 !-----------------------------------------------------------
   do j=1,nr
 !    BUG: the call looks something like this...
-    tov_rho(j) = EOS_RestMassDens(whisky_eos_handle,tov_p(j))
+    tov_rho(j) = EOS_RestMassDens(GRHydro_eos_handle,tov_p(j))
   end do
 
 !-----------------------------------------------------------
@@ -147,7 +147,7 @@ subroutine Whisky_TOV(CCTK_ARGUMENTS)
 !-----------------------------------------------------------
 ! Conserved Variables
   det = 1.0d0
-  call prim2con(whisky_eos_handle,gxx, gxy, gxz, gyy, gyz, gzz, det, &
+  call prim2con(GRHydro_eos_handle,gxx, gxy, gxz, gyy, gyz, gzz, det, &
        dens, sx, sy, sz, tau, rho, &
        velx, vely, velz, eps, press, w_lorentz)
 
@@ -185,7 +185,7 @@ subroutine Whisky_TOV(CCTK_ARGUMENTS)
 
   return
   
-end subroutine Whisky_TOV
+end subroutine GRHydro_TOV
 
 
 
@@ -314,7 +314,7 @@ end subroutine Whisky_TOV
           enddo
         enddo
 #else
-        write(6,*) 'Whisky_TOV: Does nothing.  Recompile with odepack'
+        write(6,*) 'GRHydro_TOV: Does nothing.  Recompile with odepack'
 #endif
 
       return
diff --git a/src/make.code.defn b/src/make.code.defn
index 2aefd19..fd18296 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -1,14 +1,14 @@
 # Main make.code.defn file for thorn Hydra_Init_Data
-# $Header: /Whisky/Whisky_Dev/Whisky_Init_Data/src/make.code.defn,v 1.6 2004/04/28 17:30:18 hawke Exp $
+# $Header: /GRHydro/GRHydro_Dev/GRHydro_Init_Data/src/make.code.defn,v 1.6 2004/04/28 17:30:18 hawke Exp $
 
 # Source files in this directory
-SRCS = 	Whisky_C2P2C.F90 \
-	Whisky_Con2Prim.F90 \
-	Whisky_ReconstructTest.F90 \
-	Whisky_ShockTube.F90 \
-	Whisky_Only_Atmo.F90 \
-	Whisky_ReadConformalData.F90 \
-	Whisky_SimpleWave.F90 \
+SRCS = 	GRHydro_C2P2C.F90 \
+	GRHydro_Con2Prim.F90 \
+	GRHydro_ReconstructTest.F90 \
+	GRHydro_ShockTube.F90 \
+	GRHydro_Only_Atmo.F90 \
+	GRHydro_ReadConformalData.F90 \
+	GRHydro_SimpleWave.F90 \
   CheckParam.c
 
 # Subdirectories containing source files
diff --git a/src/tov_fcn.F b/src/tov_fcn.F
index 0e87845..120e727 100644
--- a/src/tov_fcn.F
+++ b/src/tov_fcn.F
@@ -37,7 +37,7 @@ c
 c  (see, e.g. Walds textbook pp126-127.)
 c  where g_tt = - alpha**2, and g_rr = 1/(1-2m/r)
 c
-c  Note that (my rho) = (the-rest-of-Whiskys rho)*(1+epsilon)
+c  Note that (my rho) = (the-rest-of-GRHydros rho)*(1+epsilon)
 c
 c-----------------------------------------------------------
 c     neq = 3