1249 files changed, 1494 insertions, 1494 deletions

diff --git a/README b/README
index 83cb391..0a6b61e 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Cactus Code Thorn Whisky
+Cactus Code Thorn GRHydro
 Author(s)    : Luca Baiotti
                Ian Hawke
                Pedro Montero
@@ -14,13 +14,13 @@ Author(s)    : Luca Baiotti
                Nikolaos Stergioulas
                Aaryn Tonita
                many others
-Maintainer(s): Whisky developers team
+Maintainer(s): CIGR developers team
 Licence      : GPLv2+
 --------------------------------------------------------------------------
 
 1. Purpose
 
-Whisky is the evolution code for a general-purpose 3D relativistic
+GRHydro is the evolution code for a general-purpose 3D relativistic
 hydrodynamics code. To work it requires Einstein, MoL (the method of
 lines thorn), CactusEOS (the general equation of state interface).
 In theory any (suitably written) spacetime evolution thorn should work,
diff --git a/configuration.ccl b/configuration.ccl
index 514cd02..f6f5a0f 100644
--- a/configuration.ccl
+++ b/configuration.ccl
@@ -1,4 +1,4 @@
-# Configuration definition for thorn Whisky
+# Configuration definition for thorn GRHydro
 # $Header$
 
 REQUIRES EOS_Base EOS_Polytrope Boundary CartGrid3D SpaceMask ADMMacros
diff --git a/doc/documentation.tex b/doc/documentation.tex
index 675cca8..b084389 100644
--- a/doc/documentation.tex
+++ b/doc/documentation.tex
@@ -4,7 +4,7 @@
 \begin{document}
 
 % The title of the document (not necessarily the name of the Thorn)
-\title{The {\tt Whisky} code: three-dimensional relativistic hydrodynamics}
+\title{The {\tt GRHydro} code: three-dimensional relativistic hydrodynamics}
 
 % The author of the documentation - on one line, otherwise it does not work
 \author{Original authors: Luca Baiotti, Ian Hawke, Pedro Montero \cr Contributors: 
@@ -101,7 +101,7 @@
 
 % Add an abstract for this thorn's documentation
 \begin{abstract}
-  {\tt Whisky} is a fully general-relativistic three-dimensional hydrodynamics code. It evolves the
+  {\tt GRHydro} is a fully general-relativistic three-dimensional hydrodynamics code. It evolves the
   hydrodynamics using High Resolution Shock Capturing methods and can
   work with realistic equations of state. The evolution of the
   spacetime can be done by any other ``appropriate'' thorn, such as
@@ -114,9 +114,9 @@
 \section{Introduction}
 \label{sec:intro}
 
-The {\tt Whisky}\footnote{The name is
+The {\tt GRHydro}\footnote{The name is
   due to Tom Goodale, who pointed out that the in the original Gaelic
-  {\it uisge beatha} (from which {\tt whisky} is derived) meant {\it water of
+  {\it uisge beatha} (from which {\tt GRHydro} is derived) meant {\it water of
   life}. This name was chosen at a free and fair democratic ballot
   at the EU Network meeting in Southampton that gave the right answer
   thanks to a little bit of help from the authors of the code after
@@ -131,27 +131,27 @@ contributors.
 \section{Using This Thorn}
 \label{sec:use}
 
-What follows is a brief introduction to using {\tt Whisky}. It assumes that
+What follows is a brief introduction to using {\tt GRHydro}. It assumes that
 you know the required physics and numerical methods, and also the
 basics of Cactus\footnote{http://www.cactuscode.org}. If you don't, then skip this section and come back
 to it after reading the rest of this ThornGuide of Cactus. For more details such
-as thornlists and parameter files, take a look at the {\tt Whisky} web page
+as thornlists and parameter files, take a look at the {\tt GRHydro} web page
 which is currently stored at
 \begin{verbatim}
-http://www.whiskycode.org
+http://www.GRHydrocode.org
 \end{verbatim}
 
-{\tt Whisky} provides the hydro variables and methods to evolve them. It
+{\tt GRHydro} provides the hydro variables and methods to evolve them. It
 does not provide any information about initial data or equations of
 state. For these, other thorns are required. A minimal list of thorns
 for performing a shock-tube test is given in the shock-tube test
 parameter file, found at
 \begin{verbatim}
-Whisky/test/whisky_test_shock.par
+GRHydro/test/GRHydro_test_shock.par
 \end{verbatim}
 and will include the essential thorns
 \begin{verbatim}
-whisky eos_base admbase admcoupling mol
+GRHydro eos_base admbase admcoupling mol
 \end{verbatim}
 Current thorns actually implementing equations of state include
 \begin{verbatim}
@@ -159,17 +159,17 @@ eos_ideal_fluid eos_polytrope
 \end{verbatim}
 Initial data for shocks can be set using
 \begin{verbatim}
-whisky_init_data 
+GRHydro_init_data 
 \end{verbatim}
 Initial data for spherically symmetric static stars (with
 perturbations or multiple ``glued'' stars) can be set by
 \begin{verbatim}
-whisky_tovsolverc
+GRHydro_tovsolverc
 \end{verbatim}
 
 The actual evolution in time is controlled by the Method of Lines
 thorn MoL. For full details see the relevant ThornGuide. For the
-purposes of {\tt Whisky} at least two parameters are relevant; {\tt
+purposes of {\tt GRHydro} at least two parameters are relevant; {\tt
   ode\_method} and {\tt mol\_timesteps}. If second-order accuracy is
 all that is required then {\tt ode\_method} can be set to either {\tt
   "rk2"} (second-order TVD Runge-Kutta evolution) or {\tt "icn"}
@@ -181,7 +181,7 @@ Shu-Osher type TVD Runge-Kutta evolution. Then the parameter {\tt
   mol\_timesteps} controls the number of intermediate steps and hence
 the order of accuracy. First to seventh order are currently supported.
 
-{\tt Whisky} currently uses a Reconstruction-Evolution type method. The type
+{\tt GRHydro} currently uses a Reconstruction-Evolution type method. The type
 of reconstruction is controlled by the parameter {\tt recon\_method}.
 The currently supported values are {\tt "tvd"} for slope limited TVD
 reconstruction, {\tt "ppm"} for the Colella-Woodward PPM method, and
@@ -192,7 +192,7 @@ there are a number of slope limiters controlled by the keyword {\tt
 Boolean {\tt ppm\_detect}, and the ENO method can have various orders
 of accuracy controlled by {\tt eno\_order}. Note that the higher-order
 methods such as PPM and ENO require the stencil size to be increased
-using {\tt whisky\_stencil} {\bf and} {\tt driver::ghost\_size}.
+using {\tt GRHydro\_stencil} {\bf and} {\tt driver::ghost\_size}.
 
 For the evolution various approximate Riemann solvers are available,
 controlled by {\tt riemann\_solver}. Currently implemented are {\tt
@@ -203,25 +203,25 @@ methods of the Valencia group, but the explicit matrix inversion is
 still there for reference.
 
 For the equations of state, two ``types'' are recognized, controlled
-by the parameter {\tt whisky\_eos\_type}. These are {\tt "Polytype"}
+by the parameter {\tt GRHydro\_eos\_type}. These are {\tt "Polytype"}
 where the pressure is a function of the density, $P=P(\rho)$, and the
 more generic {\tt "General"} type where the pressure is a function
 of the density and the internal energy, $P=P(\rho, \epsilon)$. For the
 {\tt Polytype} equations of state one fewer equation is evolved and
 the specific internal energy is set directly from the density. The
 actual equation of state used is controlled by the parameter {\tt
-  whisky\_eos\_table}. Polytype equations of state include {\tt
+  GRHydro\_eos\_table}. Polytype equations of state include {\tt
   "2D\_Polytrope"} and general equations of state include {\tt
   "Ideal\_Fluid"}. 
 
 \subsection{Obtaining This Thorn}
 
-The public version of Whisky can be found on the
-website {\tt http://www.whiskycode.org}.
+The public version of GRHydro can be found on the
+website {\tt http://www.GRHydrocode.org}.
 
 \subsection{Basic Usage}
 
-The simplest way to start using {\tt Whisky} would be to download some
+The simplest way to start using {\tt GRHydro} would be to download some
 example parameter files from the web page to try it. There are a number
 of essential parameters which might reward some experimentation. These
 include:
@@ -243,10 +243,10 @@ include:
 \item Riemann solvers: {\tt Marquina} is the standard solver
   used. {\tt HLLE} is significantly faster, but sometimes provides cruder approximation.
 \item Equations of state: These are controlled by the {\tt
-    whisky\_eos\_type} and {\tt whisky\_eos\_table} parameters. Changing
+    GRHydro\_eos\_type} and {\tt GRHydro\_eos\_table} parameters. Changing
   these parameters will depend on which equation of state thorns you
   have compiled in.
-\item Initial data parameters: {\tt whisky\_rho\_central} is inherited by many
+\item Initial data parameters: {\tt GRHydro\_rho\_central} is inherited by many
   initial data thorns to set the central density of compact fluid
   objects such as single stars.
 \item Atmosphere parameters: Many of these are listed in
@@ -255,35 +255,35 @@ include:
 
 \subsection{Special Behaviour}
 
-Although in theory {\tt Whisky} can deal with conformal metrics as well as
+Although in theory {\tt GRHydro} can deal with conformal metrics as well as
 physical metrics, this part of the code is completely untested as we
 don't have conformal initial data (although this would not be hard -
 we just haven't had the incentive).
 
 \subsection{Interaction With Other Thorns}
 
-{\tt Whisky} provides the appropriate contribution to the stress energy
+{\tt GRHydro} provides the appropriate contribution to the stress energy
 through the {\tt TmunuBase} interface. Those spacetime evolvers that
-use this interface can use {\tt Whisky} without change. 
-%To pass the required variables across {\tt Whisky} is a friend of {\tt ADMCoupling}.
+use this interface can use {\tt GRHydro} without change. 
+%To pass the required variables across {\tt GRHydro} is a friend of {\tt ADMCoupling}.
 
-{\tt Whisky} uses the {\tt MoL} thorn to perform the actual time
+{\tt GRHydro} uses the {\tt MoL} thorn to perform the actual time
 evolution. This means that if all other evolution thorns are also
 using {\tt MoL} then the complete evolution will have the accuracy of
 the {\tt MoL} evolution method without change. This (currently) allows
-for up to fourth-order accuracy in time without any changes to {\tt Whisky}.
+for up to fourth-order accuracy in time without any changes to {\tt GRHydro}.
 
-For the general equations of state {\tt Whisky} uses the {\tt EOS\_Base}
+For the general equations of state {\tt GRHydro} uses the {\tt EOS\_Base}
 interface. This returns the necessary hydrodynamical quantities, such
 as the pressure and derivatives with general function calls. The
-parameter {\tt whisky\_eos\_table} controls which equation of state is
+parameter {\tt GRHydro\_eos\_table} controls which equation of state is
 used during evolution. 
 
-{\tt Whisky} also explicitly depends on the polytropic equation of state
+{\tt GRHydro} also explicitly depends on the polytropic equation of state
 thorn {\tt EOS\_Polytrope}. This is used to reset the hydrodynamical
 quantities in the atmosphere if necessary.
 
-For the metric quantities {\tt Whisky} uses the standard {\tt
+For the metric quantities {\tt GRHydro} uses the standard {\tt
   CactusEinstein} arrangement, especially {\tt ADMBase}. This allows
 the standard thorns to be used for the calculation of constraint
 violations, emission of gravitational waves, location of the apparent
@@ -291,9 +291,9 @@ horizon, and more.
 
 \subsection{Support and Feedback}
 
-The {\tt Whisky} web page is located at
+The {\tt GRHydro} web page is located at
 \begin{verbatim}
-http://www.whiskycode.org
+http://www.GRHydrocode.org
 \end{verbatim}
 and contains information on obtaining the code, together with
 thornlists and sample parameter files. There is also a section on
@@ -301,17 +301,17 @@ Frequently Asked Questions which will hopefully solve your problem.
 If your problem is not answered there then please send details to one
 of the maintainers listed below.
 
-The primary maintainers of {\tt Whisky} are Ian Hawke ({\tt
+The primary maintainers of {\tt GRHydro} are Ian Hawke ({\tt
   hawke@aei.mpg.de}), Luca Baiotti ({\tt baiotti@yukawa.kyoto-u.ac.jp}) and Frank L\"offler
 ({\tt knarf@cct.lsu.edu}). Email should always reach us faster than
 other means and we will try to fix any problems as fast as possible.
 Problems with the web page should also be addressed to Frank.
 
 Other people with knowledge and experience of developing and using
-{\tt Whisky} who may be able to help include Luciano Rezzolla ({\tt
+{\tt GRHydro} who may be able to help include Luciano Rezzolla ({\tt
   rezzolla@aei.mpg.de}) and Nick Stergioulas ({\tt niksterg@aei.mpg.de}).
 
-Problems with thorns that {\tt Whisky} depends on should go direct to their
+Problems with thorns that {\tt GRHydro} depends on should go direct to their
 maintainers. Examples would be
 \begin{itemize}
 \item {\tt MoL}: Ian Hawke ({\tt hawke@aei.mpg.de})
@@ -321,11 +321,11 @@ maintainers. Examples would be
   ({\tt cactusmaint@cactuscode.org})
 \item {\tt EOS\_*}: Ian Hawke (although in this case I can't guarantee
   I'll be able to fix the problem)
-\item {\tt Whisky\_Init\_Data}: Luca Baiotti ({\tt baiotti@yukawa.kyoto-u.ac.jp}) or
+\item {\tt GRHydro\_Init\_Data}: Luca Baiotti ({\tt baiotti@yukawa.kyoto-u.ac.jp}) or
   Ian Hawke ({\tt hawke@aei.mpg.de})
-\item {\tt Whisky\_TOVSolverC}: Ian Hawke ({\tt hawke@aei.mpg.de}) or Frank L\"offler ({\tt
+\item {\tt GRHydro\_TOVSolverC}: Ian Hawke ({\tt hawke@aei.mpg.de}) or Frank L\"offler ({\tt
     knarf@cct.lsu.edu})
-\item {\tt Whisky\_IVP}: Frank L\"offler ({\tt knarf@cct.lsu.edu}) 
+\item {\tt GRHydro\_IVP}: Frank L\"offler ({\tt knarf@cct.lsu.edu}) 
   or Luca Baiotti ({\tt baiotti@yukawa.kyoto-u.ac.jp}) or Ian Hawke ({\tt hawke@aei.mpg.de})
 \end{itemize}
 
@@ -349,12 +349,12 @@ These conserved variables are composed from a set of {\it primitive variables},
 which are $\rho$, the density, $p$, the
 pressure, $v^i$, the fluid 3-velocities, $\epsilon$, the internal
 energy, and $W$, the Lorentz factor, via the following relations
-% from Whisky/src/Prim2con.F90
+% from GRHydro/src/Prim2con.F90
 %  w = 1.d0 / sqrt(1.d0 - (gxx*dvelx*dvelx + gyy*dvely*dvely + gzz &
 %       &*dvelz*dvelz + 2*gxy*dvelx*dvely + 2*gxz*dvelx *dvelz + 2*gyz&
 %       &*dvely*dvelz))
 % 
-%  dpress = (whisky_eos_gamma - 1.d0) * drho * deps
+%  dpress = (GRHydro_eos_gamma - 1.d0) * drho * deps
 %
 %  ddens = sqrt(det) * drho * w
 %  dsx = sqrt(det) * (drho*(1+deps)+dpress)*w*w * (gxx*dvelx + gxy&
@@ -430,15 +430,15 @@ accuracy over the majority of the domain.
 For a full introduction to HRSC methods see~\cite{laney}, \cite{toro},
 \cite{leveque}, \cite{livrevsrrfd} and \cite{livrevgrrfd}.
 
-In the {\tt Whisky} code it was decided to use the {\it method of lines} as a
+In the {\tt GRHydro} code it was decided to use the {\it method of lines} as a
 base for the HRSC scheme. The method of lines is a way of turning a
 partial differential equation such as~(\ref{eq:consform1}) into an
-ordinary differential equation. For the {\tt Whisky} code the following steps
+ordinary differential equation. For the {\tt GRHydro} code the following steps
 are required.
 \begin{itemize}
 \item Partition the domain of interest into {\it cells}. For
   simplicity we shall assume a regular Cartesian partitioning. This is
-  not necessary for the method of lines, but it is for {\tt Whisky}.
+  not necessary for the method of lines, but it is for {\tt GRHydro}.
 \item Over a given cell with Cartesian coordinates $(x^1_i, x^2_j, x^3_k)$,
   integrate equation~(\ref{eq:consform1}) in space to find the
   ordinary differential equation
@@ -465,7 +465,7 @@ are required.
 \end{itemize}
 
 This ordinary differential equation can be solved by the Cactus thorn
-MoL. All that {\tt Whisky} has to do is to return the values of the discrete
+MoL. All that {\tt GRHydro} has to do is to return the values of the discrete
 spatial differential operator
 \begin{eqnarray}
   \label{eq:molrhs1} \nonumber
@@ -488,7 +488,7 @@ accurate in time.  For more details on the method of lines, and the
 options given with the time integration for MoL, see the relevant
 chapter in the ThornGuide.
 
-In this implementation of {\tt Whisky} the right hand side operator ${\bf L}$
+In this implementation of {\tt GRHydro} the right hand side operator ${\bf L}$
 will be simplified considerably by approximating the integrals by the
 midpoint rule to get
 \begin{equation}
@@ -542,7 +542,7 @@ of the right hand side operator splits simply into the following two parts:
   \end{enumerate}
 \end{enumerate}
 
-So, the difficult part of {\tt Whisky} is expressed in two routines. One that
+So, the difficult part of {\tt GRHydro} is expressed in two routines. One that
 reconstructs the function ${\bf q}$ at the boundaries of a
 computational cell given the cell average data $\bar{{\bf q}}$, and
 another that calculates the intercell flux ${\bf f}$ at this cell
@@ -551,7 +551,7 @@ boundary.
 \section{Reconstruction}
 \label{sec:recon}
 
-In the reduction of all of {\tt Whisky} to two routines in the last section
+In the reduction of all of {\tt GRHydro} to two routines in the last section
 one point was glossed over. That is, in order for the numerical method
 to be consistent and convergent it must retain conservation and not
 introduce spurious oscillations. Up to this point all the steps have
@@ -630,7 +630,7 @@ Equations (\ref{First_qTVD}) and (\ref{Toro_qTVD}) are equivalent.
 
 For details on how to construct a limiter, on their stability regions and on 
 the explicit expressions for the limiters used here,
-see~\cite{toro}. The {\tt Whisky} code implements the {\tt minmod} limiter
+see~\cite{toro}. The {\tt GRHydro} code implements the {\tt minmod} limiter
 (the most diffusive and the default), the Van Leer Monotonized Centred
 (MC) ({\tt VanLeerMC}) limiter in a number of forms (which should give equivalent results), 
 and the {\tt Superbee} limiter. The limiter specified by the parameter value {\tt VanLeerMC2} 
@@ -664,7 +664,7 @@ and write
 
 The piecewise parabolic method (PPM) of Colella and
 Woodward~\cite{ppm} is a rather more complex method that requires a
-number of steps. The implementation in the {\tt Whisky} code is specialized
+number of steps. The implementation in the {\tt GRHydro} code is specialized
 to use evenly spaced grids. Also, some of the more complex features are not
 implemented; in particular, the dissipation algorithm is only the
 simplest given in the original article. Here we just give the implementation
@@ -774,7 +774,7 @@ and $\omega_0, \omega_1,\omega_2$ are constants.
 
 The above flattening procedure is not the one in the original article of Colella and Woodward, but
 it has been adapted from it in order to have a stencil of three points.  The original flattening
-procedure is also implemented in {\tt Whisky}. Instead of \ref{eq:ppmflatten}, it consists in the formula
+procedure is also implemented in {\tt GRHydro}. Instead of \ref{eq:ppmflatten}, it consists in the formula
 \begin{equation}
   \label{eq:ppmflatten-stencil4}
   q_i^{L,R} = \tilde \nu_i q_i^{L,R} + (1 - \tilde \nu_i) q_i,
@@ -1230,10 +1230,10 @@ Then the numerical flux is given by
 The above implementation is based on \cite{Aloy99b}.
 
 
-\section{Other points in {\tt Whisky}}
+\section{Other points in {\tt GRHydro}}
 \label{sec:misc}
 
-There are a number of other things done by {\tt Whisky} which, whilst not as
+There are a number of other things done by {\tt GRHydro} which, whilst not as
 important as reconstruction and evolution, are still essential.
 
 
@@ -1249,7 +1249,7 @@ There are a few points to note about the calculation of the sources.
   metric and the extrinsic curvature.
 \item In order to calculate the Christoffel symbols the gauge and
   metric variables must be differenced. Currently centred differencing
-  of second or fourth (we are safe to use this, as {\tt Whisky} requires 
+  of second or fourth (we are safe to use this, as {\tt GRHydro} requires 
   always at least 2 ghost zones) order is hardwired in. The two differencings can be selected via
   the parameter {\tt ADMMacros/spatial\_order}.
 \item For numerical reasons, namely in order to avoid the presence of time derivatives
@@ -1787,7 +1787,7 @@ problem; by rearranging the order of the eigenvalues and vectors it is
 possible to numerically invert the matrix. 
 This means that no specific ordering of the eigenvalues should be
 assumed. It also explains the slightly strange ordering in the
-routines {\tt Whisky\_EigenProblem*.F90}.
+routines {\tt GRHydro\_EigenProblem*.F90}.
 
 The current default is that the left eigenvectors are calculated
 analytically - for the expressions see Font~\cite{livrevgrrfd}. For
@@ -1810,13 +1810,13 @@ To avoid this problem it is customary to introduce an atmosphere. In our impleme
 low-density region surrounding the compact objects and initially it has no velocity and is in equilibrium. The
 introduction of an atmosphere is managed by the initial data thorns.
 
-However {\tt Whisky} itself also knows about the atmosphere, of course. If the conserved variables
+However {\tt GRHydro} itself also knows about the atmosphere, of course. If the conserved variables
 $D$ or $\tau$ are beneath some minimum value, or an evolution step might push them below such a
 value, then the relevant cell is not evolved. Also, if the density should fall below a minimum value
 in the routine that converts from conservative to primitive variables, all the variables are reset
 to the values adopted for the atmosphere.
 
-Probably the hardest part of using {\tt Whisky} is to correctly set these
+Probably the hardest part of using {\tt GRHydro} is to correctly set these
 atmosphere values. In the current implementation the atmosphere is
 used in three separate places. These are
 \begin{enumerate}
@@ -1861,14 +1861,14 @@ density.
 
 The parameters controlling the atmosphere are the following.
 \begin{itemize}
-\item {\tt Whisky::rho\_abs\_min}. An absolute value for $\rho$ in the
+\item {\tt GRHydro::rho\_abs\_min}. An absolute value for $\rho$ in the
   atmosphere. Defaults to -1. Any negative value will be ignored, and
   the value of {\tt rho\_rel\_min} used instead.
-\item {\tt Whisky::rho\_rel\_min}. A relative value for $\rho$ in the
+\item {\tt GRHydro::rho\_rel\_min}. A relative value for $\rho$ in the
   atmosphere. Defaults to $10^{-7}$. Only used if {\tt rho\_abs\_min}
   is negative, which is the default behaviour. The actual value of the
   atmosphere will be $\rho =${\tt rho\_rel\_min}$\times${\tt
-    whisky\_rho\_max}, where {\tt Whisky::whisky\_rho\_max}
+    GRHydro\_rho\_max}, where {\tt GRHydro::GRHydro\_rho\_max}
   is a variable containing the maximum value of $\rho$ on the numerical grid at time zero.
 \item {\tt initial\_rho\_abs\_min}. An absolute value for rho in the initial atmosphere. It is used
   only by initial data routines. Unused if negative.
@@ -1878,9 +1878,9 @@ The parameters controlling the atmosphere are the following.
 \item {\tt initial\_atmosphere\_factor}. A relative (to the initial atmosphere) value for rho in the
   atmosphere. It is used only by initial data routines. It multiplies the atmosphere value used by
   the initial data solver. Unused if negative.
-\item {\tt whisky\_atmo\_tolerance}. A parameter useful mostly in mesh-refined simulations. A point
+\item {\tt GRHydro\_atmo\_tolerance}. A parameter useful mostly in mesh-refined simulations. A point
   is set to the atmosphere values in the conservative to primitive routines if its rest-mass density
-  is such that $\rho <$ {\tt whisky\_rho\_min}$*(1+${\tt whisky\_atmo\_tolerance}). This avoids
+  is such that $\rho <$ {\tt GRHydro\_rho\_min}$*(1+${\tt GRHydro\_atmo\_tolerance}). This avoids
   occasional spurious oscillations in ({\tt Carpet}) buffer zones lying in the atmosphere (because
   prolongation happens on conserved variables).
 \end{itemize}
@@ -1891,7 +1891,7 @@ avoids truncation error and metric evolution leading to low density waves travel
 atmosphere.
 
 The routines essential to the atmosphere are contained in {\tt
-Whisky\_Minima.F90, Whisky\_Con2Prim.F90, Whisky\_UpdateMask.F90}. 
+GRHydro\_Minima.F90, GRHydro\_Con2Prim.F90, GRHydro\_UpdateMask.F90}. 
 
 \subsection{Advection of passive scalars ('tracers')}
 \label{sec:tracer}
@@ -1913,20 +1913,20 @@ equation looks like
   \partial_t { ( D X_k )} + \partial_{x^j} {\bf f}^{(j)} ({D X_k}) = 0\, ,
 \end{equation}
 where $D$ is the generalized particle number density as defined in
-Eq.~(\ref{eq:prim2con}). {\tt Whisky} currently supports any number of
+Eq.~(\ref{eq:prim2con}). {\tt GRHydro} currently supports any number of
 independent tracer variables. The following parameters have to be
 set to use the tracers:
 
 \begin{itemize}
-  \item {\tt Whisky::evolve\_tracer}. Boolean. Set to {\tt yes} if
+  \item {\tt GRHydro::evolve\_tracer}. Boolean. Set to {\tt yes} if
     you want the tracers to be active.
-  \item {\tt Whisky::number\_of\_tracers}. Integer. Defaults to 0. To
+  \item {\tt GRHydro::number\_of\_tracers}. Integer. Defaults to 0. To
     use tracers, set to at least 1.
 \end{itemize}
 
 Note, that your initial data thorn must set initial data for
-{\tt Whisky::tracer[k]} and {\tt Whisky::cons\_tracer[k]} for all tracers
-you want to advect. {\tt Whisky::cons\_tracer[k]} stores $D X_k$.
+{\tt GRHydro::tracer[k]} and {\tt GRHydro::cons\_tracer[k]} for all tracers
+you want to advect. {\tt GRHydro::cons\_tracer[k]} stores $D X_k$.
 
 \subsubsection{Implementation and Limitations}
 
@@ -1958,7 +1958,7 @@ you want to advect. {\tt Whisky::cons\_tracer[k]} stores $D X_k$.
 
     The above was suggested by Miguel Aloy and first implemented and
     tested by Harry Dimmelmeier in his code (CoCoNuT), then by Christian~D.~Ott
-    in {\tt Whisky}.
+    in {\tt GRHydro}.
 
 \end{itemize}
 
@@ -1974,7 +1974,7 @@ The approximate time line is something like this:
 \item ~1998-: Developed as Cactus thorn {\tt MAHC} inside the
   GR{\tt Astro\_Hydro} arrangement at Washington University, primarily by
   Mark Miller.
-\item 2002-: {\tt Whisky} written based on {\tt GR3D}.
+\item 2002-: {\tt GRHydro} written based on {\tt GR3D}.
 \end{itemize}
 
 This is necessarily only a sketch; many people have contributed to
@@ -1984,8 +1984,8 @@ the history of this code, and the present authors were not around for most of it
 
 This was initially written by Luca Baiotti, Ian Hawke and Pedro
 Montero with considerable assistance from Luciano Rezzolla, Toni Font,
-Nick Stergioulas and Ed Seidel. This led to the basic {\tt Whisky} thorns,
-{\tt Whisky} itself, {\tt Whisky\_Init\_Data} and {\tt Whisky\_RNSID}.
+Nick Stergioulas and Ed Seidel. This led to the basic {\tt GRHydro} thorns,
+{\tt GRHydro} itself, {\tt GRHydro\_Init\_Data} and {\tt GRHydro\_RNSID}.
 
 Since then most of the maintenance has been done by Ian Hawke, Luca Baiotti and Frank L\"offler. Various
 people have contributed to the development. In particular
@@ -1997,12 +1997,12 @@ people have contributed to the development. In particular
 \item The current atmosphere algorithm is a mixture of ideas from the
   {\tt GR3D} code, Luciano Rezzolla, Toni Font and Nick
   Stergioulas. The current setup was written by Ian Hawke and Luca Baiotti.
-\item The 1-dimensional TOV solver {\tt Whisky\_TOVSolver} was written
+\item The 1-dimensional TOV solver {\tt GRHydro\_TOVSolver} was written
   by Ian Hawke based on a short paper by Thomas Baumgarte.
 %\item The use of the equation of state, in particular the routines to
 %  ensure the initial hydrodynamic consistency, were due to the work of
 %  Harald Dimmelmeier and Christian Ott.
-\item The initial value solver {\tt Whisky\_IVP} was initially a
+\item The initial value solver {\tt GRHydro\_IVP} was initially a
   rewrite of the IVP solver written by Washington University (Malcolm
   Tobias?) based on the formulation given by the Living Review of
   Cook~\cite{Cook00}. For actually making it work thanks are due to
diff --git a/interface.ccl b/interface.ccl
index 3bb1d5b..39a8463 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -1,16 +1,16 @@
-# Interface definition for thorn Whisky
+# Interface definition for thorn GRHydro
 
 ####################################################################
-###  Whisky needs to inherit the metric from Einstein.           ###
+###  GRHydro needs to inherit the metric from Einstein.           ###
 ###  Other thorns will need to know what EOS we're using. They   ###
 ###  inherit to get the handle.                                  ###
 ####################################################################
 
-implements: Whisky
+implements: GRHydro
 inherits: ADMBase, StaticConformal, Boundary, SpaceMask, ADMMacros, Tmunubase, HydroBase
 
-#INCLUDES SOURCE: Whisky_EMTensor.inc in CalcTmunu.inc
-#INCLUDES: Whisky_EMTensor_temps.inc in CalcTmunu_temps.inc
+#INCLUDES SOURCE: GRHydro_EMTensor.inc in CalcTmunu.inc
+#INCLUDES: GRHydro_EMTensor_temps.inc in CalcTmunu_temps.inc
 
 USES INCLUDE: FishEye.h
 USES INCLUDE: EOS_Base.inc
@@ -22,7 +22,7 @@ USES INCLUDE HEADER: carpet.hh
 ###############################################################
 ###  Provided functions. These are mainly to allow RNSID    ###
 ###  to convert back to primitive / conservative variables  ###
-###  without having an explicit coupling to Whisky.         ###
+###  without having an explicit coupling to GRHydro.         ###
 ###  NOTE: the function that converts conservative to       ###
 ###  primitive variables requires pointers to the conserved ###
 ###  variables as well as these variables are reset if      ###
@@ -54,8 +54,8 @@ void FUNCTION UpperMet(CCTK_REAL OUT uxx, CCTK_REAL OUT uxy, \
 #		       CCTK_REAL IN det, \
 #		       CCTK_REAL IN x, CCTK_REAL IN y, CCTK_REAL IN z, CCTK_REAL IN r, \
 #		       CCTK_INT OUT epsnegative, \
-#		       CCTK_REAL IN whisky_rho_min, CCTK_REAL IN pmin, \
-#		       CCTK_INT IN whisky_reflevel, CCTK_REAL IN whisky_C2P_failed)
+#		       CCTK_REAL IN GRHydro_rho_min, CCTK_REAL IN pmin, \
+#		       CCTK_INT IN GRHydro_reflevel, CCTK_REAL IN GRHydro_C2P_failed)
 
 void FUNCTION Con2PrimPoly(CCTK_INT IN handle, CCTK_REAL OUT dens, \
                            CCTK_REAL OUT sx, CCTK_REAL OUT sy, \
@@ -69,7 +69,7 @@ void FUNCTION Con2PrimPoly(CCTK_INT IN handle, CCTK_REAL OUT dens, \
                            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)
 
 #void FUNCTION Prim2Con CCTK_INT handle, CCTK_REAL gxx, CCTK_REAL gxy, CCTK_REAL gxz, CCTK_REAL gyy, CCTK_REAL gyz, CCTK_REAL gzz, CCTK_REAL det, CCTK_REAL dens, CCTK_REAL sx, CCTK_REAL sy, CCTK_REAL sz, CCTK_REAL tau, CCTK_REAL rho, CCTK_REAL velx, CCTK_REAL vely, CCTK_REAL velz, CCTK_REAL epsilon, CCTK_REAL press, CCTK_REAL w_lorentz
 
@@ -170,16 +170,16 @@ USES FUNCTION EOS_SetGFs
   
 public:
 
-int whisky_eos_scalars type = SCALAR
+int GRHydro_eos_scalars type = SCALAR
 {
-  whisky_eos_handle
-  whisky_polytrope_handle
+  GRHydro_eos_handle
+  GRHydro_polytrope_handle
 } "Handle number for EOS"
 
-real whisky_minima type = SCALAR
+real GRHydro_minima type = SCALAR
 {
-  whisky_rho_min
-#  whisky_dens_min
+  GRHydro_rho_min
+#  GRHydro_dens_min
 } "Atmosphere values"
 
 real dens type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "generalized particle number"
@@ -189,7 +189,7 @@ real tau  type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolo
 real scon[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "generalized momenta"
 
 
-real whisky_tracers[number_of_tracers] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar"'
+real GRHydro_tracers[number_of_tracers] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar"'
 {
   tracer
 } "Tracers"
@@ -205,37 +205,37 @@ real srhs[3] type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
 ### the tests in init_data work. Should fix.   ###
 ##################################################
 
-real whisky_prim_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
+real GRHydro_prim_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
 {
   rhoplus, velxplus, velyplus, velzplus, pressplus, epsplus, w_lorentzplus, 
   rhominus, velxminus, velyminus, velzminus, pressminus, epsminus, 
   w_lorentzminus
 } "Primitive variables extended to the cell boundaries"
 
-int whisky_scalars type = SCALAR tags='checkpoint="no"'
+int GRHydro_scalars type = SCALAR tags='checkpoint="no"'
 {
   flux_direction, xoffset, yoffset, zoffset
 } "Which direction are we taking the fluxes in and the offsets"
 
-int whisky_atmosphere_mask type = GF Timelevels = 1 tags='Prolongation="None"'
+int GRHydro_atmosphere_mask type = GF Timelevels = 1 tags='Prolongation="None"'
 {
   atmosphere_mask
 } "Flags to say whether a point needs to be reset to the atmosphere"
 
-int whisky_atmosphere_descriptors type=SCALAR
+int GRHydro_atmosphere_descriptors type=SCALAR
 {
   atmosphere_field_descriptor
   atmosphere_atmosp_descriptor
   atmosphere_normal_descriptor
 }
 
-real whisky_cons_tracers[number_of_tracers] TYPE=GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar"'
+real GRHydro_cons_tracers[number_of_tracers] TYPE=GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar"'
 {
   cons_tracer
 } "The conserved tracer variable"
 
 # For measuring separations
-CCTK_REAL whisky_maxima_position TYPE=SCALAR tags='checkpoint="no"'
+CCTK_REAL GRHydro_maxima_position TYPE=SCALAR tags='checkpoint="no"'
 {
   maxima_x
   maxima_y
@@ -246,20 +246,20 @@ CCTK_REAL whisky_maxima_position TYPE=SCALAR tags='checkpoint="no"'
 CCTK_REAL maxrho_global TYPE=SCALAR tags='checkpoint="no"' "store the global maximum of rho, for refinment-grid steering"
 
 # functions can be prolonged only if they are real (not integer).
-CCTK_REAL whisky_C2P_failed TYPE=GF Timelevels = 1 tags='Prolongation="restrict" tensortypealias="Scalar" checkpoint="no"' "Mask that stores the points where C2P has failed"
+CCTK_REAL GRHydro_C2P_failed TYPE=GF Timelevels = 1 tags='Prolongation="restrict" tensortypealias="Scalar" checkpoint="no"' "Mask that stores the points where C2P has failed"
 
 # Should we do the same for the atmo masks?
 
-real whisky_fluxes type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
+real GRHydro_fluxes type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
 {
   densflux, sxflux, syflux, szflux, tauflux
 } "Fluxes for each conserved variable"
 
 private:
 
-int whisky_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level Whisky is working on right now"
+int GRHydro_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level GRHydro is working on right now"
 
-real whisky_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
+real GRHydro_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"'
 {
   densplus, sxplus, syplus, szplus, tauplus,
   densminus, sxminus, syminus, szminus, tauminus
@@ -273,52 +273,52 @@ real whisky_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoi
 # 
 # real cell_surface[3] type = GF Timelevels = 1
 # 
-# real whisky_fisheye_scalars type=GF timelevels=1
+# real GRHydro_fisheye_scalars type=GF timelevels=1
 # {
 #   frho
 #   fpress
 #   feps
-# } "Whisky scalars in physical coordinates"
+# } "GRHydro scalars in physical coordinates"
 # 
-# real whisky_fisheye_vectors type=GF timelevels=1
+# real GRHydro_fisheye_vectors type=GF timelevels=1
 # {
 #   fvelx
 #   fvely
 #   fvelz
-# } "Whisky vectors in physical coordinates"
+# } "GRHydro vectors in physical coordinates"
 
-real whisky_coords type=GF timelevels=3 
+real GRHydro_coords type=GF timelevels=3 
 {
-  whisky_x
-  whisky_y
-  whisky_z
+  GRHydro_x
+  GRHydro_y
+  GRHydro_z
 } "Coordinates to use with the comoving shift"
 
-real whisky_coords_rhs type=GF timelevels=1 tags='Prolongation="None"'
+real GRHydro_coords_rhs type=GF timelevels=1 tags='Prolongation="None"'
 {
-  whisky_x_rhs
-  whisky_y_rhs
-  whisky_z_rhs
+  GRHydro_x_rhs
+  GRHydro_y_rhs
+  GRHydro_z_rhs
 } "RHS for coordinates to use with the comoving shift"
 
-#real whisky_hamiltonian type=GF  tags='tensortypealias="Scalar"'
+#real GRHydro_hamiltonian type=GF  tags='tensortypealias="Scalar"'
 #{
-#  whisky_hamnormalized
-#  whisky_ham
-#} "Whisky hamiltonian constraints"
+#  GRHydro_hamnormalized
+#  GRHydro_ham
+#} "GRHydro hamiltonian constraints"
 
-#real whisky_momentum type=GF tags='tensortypealias="U" checkpoint="no"'
+#real GRHydro_momentum type=GF tags='tensortypealias="U" checkpoint="no"'
 #{
-#  whisky_momx,
-#  whisky_momy,
-#  whisky_momz  
-#} "Whisky momentum constraints"
+#  GRHydro_momx,
+#  GRHydro_momy,
+#  GRHydro_momz  
+#} "GRHydro momentum constraints"
 
-int whisky_trivial_rp_gf_group type=GF timelevels=1 tags='Prolongation="None"'
+int GRHydro_trivial_rp_gf_group type=GF timelevels=1 tags='Prolongation="None"'
 {
-  whisky_trivial_rp_gf_x
-  whisky_trivial_rp_gf_y
-  whisky_trivial_rp_gf_z
+  GRHydro_trivial_rp_gf_x
+  GRHydro_trivial_rp_gf_y
+  GRHydro_trivial_rp_gf_z
 } "set gf for triv. rp (only for debugging)"
 
 
@@ -340,37 +340,37 @@ real fs_alpha TYPE=SCALAR
   fs_alpha5
 } "Maximum characteristic speeds for the flux splitting"
 
-real whisky_tracer_rhs[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
+real GRHydro_tracer_rhs[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
 {
   cons_tracerrhs
 } "RHS for the tracer"
 
-real whisky_tracer_flux[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
+real GRHydro_tracer_flux[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
 {
   cons_tracerflux
 } "Flux for the tracer"
 
-real whisky_tracer_cons_bext[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
+real GRHydro_tracer_cons_bext[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
 {
   cons_tracerplus, cons_tracerminus
 } "Cell boundary values for the tracer"
 
-real whisky_tracer_prim_bext[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
+real GRHydro_tracer_prim_bext[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
 {
   tracerplus, tracerminus
 } "Primitive cell boundary values for the tracer"
 
-real whisky_tracer_flux_splitting[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
+real GRHydro_tracer_flux_splitting[number_of_tracers] TYPE=GF tags='Prolongation="None" checkpoint="no"'
 {
   tracerfplus, tracerfminus
 } "Flux splitting for the tracer"
 
-real whisky_mppm_eigenvalues TYPE=GF tags='Prolongation="None" checkpoint="no"'
+real GRHydro_mppm_eigenvalues TYPE=GF tags='Prolongation="None" checkpoint="no"'
 {
-  whisky_mppm_eigenvalue_x_left, whisky_mppm_eigenvalue_x_right
-  whisky_mppm_eigenvalue_y_left, whisky_mppm_eigenvalue_y_right
-  whisky_mppm_eigenvalue_z_left, whisky_mppm_eigenvalue_z_right
-  whisky_mppm_xwind
+  GRHydro_mppm_eigenvalue_x_left, GRHydro_mppm_eigenvalue_x_right
+  GRHydro_mppm_eigenvalue_y_left, GRHydro_mppm_eigenvalue_y_right
+  GRHydro_mppm_eigenvalue_z_left, GRHydro_mppm_eigenvalue_z_right
+  GRHydro_mppm_xwind
 } "debug variable for flux eigenvalues in mppm"
 
 CCTK_REAL particles TYPE=ARRAY DIM=1 TIMELEVELS=3 SIZE=number_of_particles GHOSTSIZE=0 DISTRIB=DEFAULT
@@ -400,19 +400,19 @@ CCTK_REAL particle_arrays TYPE=ARRAY DIM=1 TIMELEVELS=1 SIZE=number_of_particles
 
 # For measuring separations
 
-CCTK_REAL whisky_maxima_location TYPE=SCALAR tags='checkpoint="no"'
+CCTK_REAL GRHydro_maxima_location TYPE=SCALAR tags='checkpoint="no"'
 {
   maxima_i
   maxima_j
   maxima_k
 } "The location (point index) of the maximum value of rho"
 
-CCTK_INT whisky_maxima_iteration TYPE=SCALAR "Iteration on which maximum was last set"
+CCTK_INT GRHydro_maxima_iteration TYPE=SCALAR "Iteration on which maximum was last set"
 
-CCTK_REAL whisky_maxima_separation TYPE=SCALAR tags='checkpoint="no"'
+CCTK_REAL GRHydro_maxima_separation TYPE=SCALAR tags='checkpoint="no"'
 {
-  whisky_separation
-  whisky_proper_separation
+  GRHydro_separation
+  GRHydro_proper_separation
 } "The distance between the centres (locations of maximum density) of a binary NS"
 
 CCTK_REAL DiffRho TYPE=GF tags='Prolongation="None" checkpoint="no"' "The first difference in rho"
@@ -433,8 +433,8 @@ CCTK_REAL RoeAverage_temps TYPE=GF tags='Prolongation="None" checkpoint="no"'
 
 CCTK_REAL Metric_temps TYPE=GF tags='Prolongation="None" checkpoint="no"'
 {
-  Whisky_det
-  Whisky_uxx,Whisky_uxy,Whisky_uxz,Whisky_uyy,Whisky_uyz,Whisky_uzz
+  GRHydro_det
+  GRHydro_uxx,GRHydro_uxy,GRHydro_uxz,GRHydro_uyy,GRHydro_uyz,GRHydro_uzz
 } "Temporaries for the determinant of the 3-metric and the inverse metric"
 
 CCTK_REAL Con2Prim_temps TYPE=GF tags='Prolongation="None" checkpoint="no"'
diff --git a/par/BenchRNS_Carpet_3level.par b/par/BenchRNS_Carpet_3level.par
index f10365f..917be60 100644
--- a/par/BenchRNS_Carpet_3level.par
+++ b/par/BenchRNS_Carpet_3level.par
@@ -32,9 +32,9 @@ ActiveThorns	=  "	admbase
 
 #--- Hydrodynamics
 
-ActiveThorns	=  "	whisky 
-			whisky_init_data 
-			whisky_rnsid 
+ActiveThorns	=  "	GRHydro 
+			GRHydro_init_data 
+			GRHydro_rnsid 
 			hydrobase
 			tmunubase
 			initbase
@@ -134,23 +134,23 @@ bssn_mol::timelevels				=	3
 
 
 HydroBase::timelevels				=	3
-hydrobase::evolution_method			=	"whisky"
+hydrobase::evolution_method			=	"GRHydro"
 
 TmunuBase::stress_energy_storage		=	yes
 TmunuBase::stress_energy_at_RHS			=	yes
 TmunuBase::timelevels				=	1
 TmunuBase::prolongation_type			=	none
 
-whisky::whisky_rho_central			=	1.61930347e-08
-whisky::riemann_solver				=	"Marquina"
-whisky::whisky_eos_type				=	"Polytype"
-whisky::whisky_eos_table			=	"2D_Polytrope"
-whisky::recon_method	            		=       "ppm"
-whisky::ppm_detect				=	"yes"
-whisky::whisky_stencil          		=       3
-whisky::bound		                	=       "none"
+GRHydro::GRHydro_rho_central			=	1.61930347e-08
+GRHydro::riemann_solver				=	"Marquina"
+GRHydro::GRHydro_eos_type				=	"Polytype"
+GRHydro::GRHydro_eos_table			=	"2D_Polytrope"
+GRHydro::recon_method	            		=       "ppm"
+GRHydro::ppm_detect				=	"yes"
+GRHydro::GRHydro_stencil          		=       3
+GRHydro::bound		                	=       "none"
 
-whisky::EoS_Change				=	"no"
+GRHydro::EoS_Change				=	"no"
 EOS_Polytrope::eos_gamma                	=       2.0
 EOS_Polytrope::eos_k                    	=       1.0
 EOS_Polytrope::use_cgs				=	"yes"
@@ -160,10 +160,10 @@ EOS_Polytrope::gamma_ini			=	2.0
 
 SpaceMask::use_mask 				= 	yes
 
-whisky::rho_rel_min				=	1.e-5
+GRHydro::rho_rel_min				=	1.e-5
 
 #------ Atmosphere only for
-whisky::initial_atmosphere_factor		=	0.99
+GRHydro::initial_atmosphere_factor		=	0.99
 
 
 
diff --git a/par/whisky.par b/par/GRHydro.par
index f4b1b4e..3104a08 100644
--- a/par/whisky.par
+++ b/par/GRHydro.par
@@ -22,13 +22,13 @@ time::dtfac 				= 	0.25
 ActiveThorns = "ioutil ioascii iobasic"
 
 IO::out_fileinfo			=	"none"
-IO::out_dir 				= 	"whisky_test_shock"
+IO::out_dir 				= 	"GRHydro_test_shock"
 
 IOBasic::outInfo_every 			= 	1
 IOBasic::outInfo_vars 			= 	"HydroBase::rho"
 
 IOASCII::out1D_every 			= 	1
-IOASCII::out1D_vars 			= 	"whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon"
+IOASCII::out1D_vars 			= 	"GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon"
 
 ActiveThorns = "nanchecker mol"
 
@@ -51,21 +51,21 @@ ActiveThorns = "eos_base eos_ideal_fluid eos_polytrope"
 
 EOS_Ideal_Fluid::eos_ideal_fluid_gamma	=	1.66666666666666
 
-ActiveThorns = "hydrobase whisky"
+ActiveThorns = "hydrobase GRHydro"
 
 hydrobase::timelevels			= 2
-hydrobase::evolution_method       = "whisky"
+hydrobase::evolution_method       = "GRHydro"
 
-whisky::riemann_solver			=	"Roe"
-whisky::whisky_eos_type			=	"General"
-whisky::whisky_eos_table		=	"Ideal_Fluid"
-whisky::whisky_stencil			=	2
-whisky::recon_method			=	"tvd"
-whisky::tvd_limiter			=	"minmod"
-whisky::bound				=	"flat"
+GRHydro::riemann_solver			=	"Roe"
+GRHydro::GRHydro_eos_type			=	"General"
+GRHydro::GRHydro_eos_table		=	"Ideal_Fluid"
+GRHydro::GRHydro_stencil			=	2
+GRHydro::recon_method			=	"tvd"
+GRHydro::tvd_limiter			=	"minmod"
+GRHydro::bound				=	"flat"
 
-ActiveThorns = "whisky_init_data"
+ActiveThorns = "GRHydro_init_data"
 
 hydrobase::initial_hydro	=	"shocktube"
-whisky_init_data::shocktube_type	=	"diagshock"
-whisky_init_data::shock_case		=	"Simple"
+GRHydro_init_data::shocktube_type	=	"diagshock"
+GRHydro_init_data::shock_case		=	"Simple"
diff --git a/par/Whisky.th b/par/GRHydro.th
index 30d60e6..277aab9 100644
--- a/par/Whisky.th
+++ b/par/GRHydro.th
@@ -10,8 +10,8 @@ CactusPUGH/PUGHSlab
 CactusPUGH/PUGHReduce
 EUHydro/Einstein
 HydroBase/HydroBase
-Whisky/Whisky
-Whisky/Whisky_Init_Data
+GRHydro/GRHydro
+GRHydro/GRHydro_Init_Data
 CactusUtils/NaNChecker
 CactusEOS/EOS_Base
 CactusEOS/EOS_Ideal_Fluid
diff --git a/param.ccl b/param.ccl
index d93e4cd..2cb4919 100644
--- a/param.ccl
+++ b/param.ccl
@@ -1,4 +1,4 @@
-# Parameter definitions for thorn Whisky
+# Parameter definitions for thorn GRHydro
 # $Header$
 
 shares:ADMBase
@@ -28,7 +28,7 @@ USES KEYWORD prolongation_type
 USES INT hydro_excision
 EXTENDS KEYWORD evolution_method ""
 {
-  "whisky" :: "Use Whisky to evolve the hydro variables"
+  "GRHydro" :: "Use GRHydro to evolve the hydro variables"
 }
 
 #########################################
@@ -53,26 +53,26 @@ USES INT spatial_order
 
 restricted:
 
-BOOLEAN whisky_enable_internal_excision "Set this to 'false' to disable the thorn-internal excision." STEERABLE=ALWAYS
+BOOLEAN GRHydro_enable_internal_excision "Set this to 'false' to disable the thorn-internal excision." STEERABLE=ALWAYS
 {
 } "true"
 
-CCTK_INT whisky_hydro_excision "Turns excision automatically on in HydroBase" ACCUMULATOR-BASE=HydroBase::hydro_excision
+CCTK_INT GRHydro_hydro_excision "Turns excision automatically on in HydroBase" ACCUMULATOR-BASE=HydroBase::hydro_excision
 {
   1:1 :: "Only '1' allowed"
 } 1
 
-CCTK_INT Whisky_MaxNumEvolvedVars "The maximum number of evolved variables used by Whisky" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars
+CCTK_INT GRHydro_MaxNumEvolvedVars "The maximum number of evolved variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars
 {
   5:8		:: "dens scon[3] tau"
 } 5
 
-CCTK_INT Whisky_MaxNumConstrainedVars "The maximum number of constrained variables used by Whisky" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
+CCTK_INT GRHydro_MaxNumConstrainedVars "The maximum number of constrained variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
 {
   7:13		:: "A small range, depending on testing or not"
 } 8
  
-CCTK_INT Whisky_MaxNumSandRVars "The maximum number of save and restore variables used by Whisky" ACCUMULATOR-BASE=MethodofLines::MoL_Num_SaveAndRestore_Vars
+CCTK_INT GRHydro_MaxNumSandRVars "The maximum number of save and restore variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_SaveAndRestore_Vars
 {
   0:16		:: "A small range, depending on testing or not"
 } 16
@@ -222,18 +222,18 @@ keyword bound "Which boundary condition to use - FIXME"
   "scalar"	:: "Constant"
 } "none"
 
-int whisky_stencil "Width of the stencil"
+int GRHydro_stencil "Width of the stencil"
 {
   0:		:: "Must be positive"
 } 2
 
-keyword whisky_eos_type "Type of Equation of State"
+keyword GRHydro_eos_type "Type of Equation of State"
 {
   "Polytype"	:: "P = P(rho) or P = P(eps)"
   "General"	:: "P = P(rho, eps)"
 } "General"
 
-string whisky_eos_table "Name for the Equation of State"
+string GRHydro_eos_table "Name for the Equation of State"
 {
   .*		:: "Can be anything"
 } "Ideal_Fluid"
@@ -241,13 +241,13 @@ string whisky_eos_table "Name for the Equation of State"
 
 #Parameters controlling conservative <-> primitive change.
 
-int whisky_c2p_warnlevel "Warnlevel for Con2Prim warnings" STEERABLE=ALWAYS
+int GRHydro_c2p_warnlevel "Warnlevel for Con2Prim warnings" STEERABLE=ALWAYS
 {
   0:1           :: "Either 0 or 1"
 } 0
 
 # This parameter is not used anymore in maintained code: the warnings are produced only for really evolved points.
-int whisky_c2p_warn_from_reflevel "Start warning on given refinement level and on higher levels" STEERABLE=ALWAYS
+int GRHydro_c2p_warn_from_reflevel "Start warning on given refinement level and on higher levels" STEERABLE=ALWAYS
 {
   0:           :: "Greater or equal to 0"
 } 0
@@ -261,39 +261,39 @@ real c2p_reset_pressure_to_value "The value to which the pressure is reset to wh
   0: :: "greater than zero"
 } 1.e-20
 
-real whisky_eps_min "Minimum value of internal energy - this is now only used in Whisky_InitData's Whisky_Only_Atmo routine"
+real GRHydro_eps_min "Minimum value of internal energy - this is now only used in GRHydro_InitData's GRHydro_Only_Atmo routine"
 {
  0: :: "Positive"
 } 1.e-10
 
-real whisky_perc_ptol "Tolerance for primitive variable solve (percent)"
+real GRHydro_perc_ptol "Tolerance for primitive variable solve (percent)"
 {
  0: :: "Do we really want both tolerances?"
 } 1.e-8
 
-real whisky_del_ptol "Tolerance for primitive variable solve (absolute)"
+real GRHydro_del_ptol "Tolerance for primitive variable solve (absolute)"
 {
   0: :: "Do we really want both tolerances?"
 } 1.e-18
 
-int whisky_countmax "Maximum number of iterations for Con2Prim solve"
+int GRHydro_countmax "Maximum number of iterations for Con2Prim solve"
 {
   1:*		:: "Must be positive"
 } 100
 
-int whisky_countmin "Minimum number of iterations for Con2Prim solve"
+int GRHydro_countmin "Minimum number of iterations for Con2Prim solve"
 {
   0:*		:: "Must be non negative"
 } 1
 
-int whisky_polish "Number of extra iterations after root found"
+int GRHydro_polish "Number of extra iterations after root found"
 {
   0:*		:: "Must be non negative"
 } 0
 
 ###Parameters for compact fluid objects
 
-REAL whisky_rho_central "Central Density for Star"
+REAL GRHydro_rho_central "Central Density for Star"
 {
   : :: ""
 } 1.e-5
@@ -330,7 +330,7 @@ REAL rho_abs_min_after_recovery "A new absolute value for rho in the atmosphere.
   -1.0: :: ""
 } -1.0
 
-REAL whisky_atmo_tolerance "A point is set to atmosphere in the Con2Prim's if its rho < whisky_rho_min *(1+whisky_atmo_tolerance). This avoids occasional spurious oscillations in carpet buffer zones lying in the atmosphere (because prolongation happens on conserved variables)" STEERABLE=ALWAYS
+REAL GRHydro_atmo_tolerance "A point is set to atmosphere in the Con2Prim's if its rho < GRHydro_rho_min *(1+GRHydro_atmo_tolerance). This avoids occasional spurious oscillations in carpet buffer zones lying in the atmosphere (because prolongation happens on conserved variables)" STEERABLE=ALWAYS
 {
    0.0: :: "Zero or larger. A useful value could be 0.0001"
 }  0.0
@@ -339,7 +339,7 @@ BOOLEAN wk_atmosphere "Use some of Wolfgang Kastauns atmosphere tricks"
 {
 } "no"
 
-BOOLEAN Check_Rho_Minimum "Should a check on rho < whisky_rho_min be performed and written as WARNING level 2?"
+BOOLEAN Check_Rho_Minimum "Should a check on rho < GRHydro_rho_min be performed and written as WARNING level 2?"
 {
 } "no"
 
@@ -447,7 +447,7 @@ CCTK_INT particle_interpolation_order "What order should be used for the particl
 
 #Finding the local gradient
 
-keyword gradient_method "Which method is used to set Whisky::DiffRho?"
+keyword gradient_method "Which method is used to set GRHydro::DiffRho?"
 {
   "First diff"    :: "Standard first differences"
   "Curvature"     :: "Curvature based method of Paramesh / FLASH"
@@ -503,12 +503,12 @@ REAL outflowboundary_normal[3] "The normal to the plane; to the right of this ou
 
 # NaN detection level
 
-INT Whisky_NaN_verbose "The warning level for NaNs occuring within Whisky"
+INT GRHydro_NaN_verbose "The warning level for NaNs occuring within GRHydro"
 {
   0:* :: "The warning level"
 } 2
 
-CCTK_REAL Whisky_lorentz_overshoot_cutoff "Set the Lorentz factor to this value in case it overshoots (1/0)"
+CCTK_REAL GRHydro_lorentz_overshoot_cutoff "Set the Lorentz factor to this value in case it overshoots (1/0)"
 {
   0:* :: "Some big value"
 } 1.e100
diff --git a/schedule.ccl b/schedule.ccl
index 9772ebb..eeb03f2 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,4 +1,4 @@
-# Schedule definitions for thorn Whisky
+# Schedule definitions for thorn GRHydro
 # $Header$
 
 #######################################################################
@@ -37,13 +37,13 @@ else
   STORAGE: ADMBase::metric[2], ADMBase::curv[2]
   STORAGE: ADMBase::lapse[2]
 }
-STORAGE:whisky_reflevel
+STORAGE:GRHydro_reflevel
 STORAGE:densrhs
 STORAGE:taurhs
 STORAGE:srhs
-STORAGE:whisky_eos_scalars
-STORAGE:whisky_minima
-STORAGE:whisky_scalars
+STORAGE:GRHydro_eos_scalars
+STORAGE:GRHydro_minima
+STORAGE:GRHydro_scalars
 #STORAGE:fluxweightvolume
 #STORAGE:cell_surface
 if (number_of_particles)
@@ -54,16 +54,16 @@ if (number_of_particles)
 
 if (evolve_tracer)
 {
-  STORAGE:whisky_tracers[3]
-  STORAGE:whisky_cons_tracers[3]
-  STORAGE:whisky_tracer_rhs
+  STORAGE:GRHydro_tracers[3]
+  STORAGE:GRHydro_cons_tracers[3]
+  STORAGE:GRHydro_tracer_rhs
 }
 
 # leave this here for compatibility with older code, should not be used anymore
 # and go out at some point
-schedule group Whisky_Initial IN HydroBase_Initial BEFORE SetTmunu
+schedule group GRHydro_Initial IN HydroBase_Initial BEFORE SetTmunu
 {
-} "Whisky initial data group"
+} "GRHydro initial data group"
 
 #################################################
 ### Storage for the extra timelevels for the  ###
@@ -94,25 +94,25 @@ if (!CCTK_Equals(initial_shift,"none"))
   {
     if (timelevels == 3)
     {  
-      STORAGE: whisky_coords[3]
+      STORAGE: GRHydro_coords[3]
     }
     else
     {
-      STORAGE: whisky_coords[2]
+      STORAGE: GRHydro_coords[2]
     }
-    STORAGE: whisky_coords_rhs
+    STORAGE: GRHydro_coords_rhs
 
-    schedule Whisky_SetUpCoords IN HydroBase_Initial
+    schedule GRHydro_SetUpCoords IN HydroBase_Initial
     {
       LANG: Fortran
     } "Set up the coordinates for use with the comoving shift"
 
-    schedule Whisky_EvolveCoords IN WhiskyRHS
+    schedule GRHydro_EvolveCoords IN GRHydroRHS
     {
       LANG: Fortran
     } "Evolve the coordinates for the comoving shift"
 
-    schedule Whisky_ComovingShift IN HydroBase_PostStep AFTER HydroBase_Con2Prim
+    schedule GRHydro_ComovingShift IN HydroBase_PostStep AFTER HydroBase_Con2Prim
     {
       LANG: Fortran
     } "Comoving shift"
@@ -130,7 +130,7 @@ STORAGE: conformal_state
 ### Register startup banner ###
 ###############################
 
-schedule Whisky_Startup AT WRAGH AFTER EOSBase_GeneralRegister AFTER HydroBase_StartUp
+schedule GRHydro_Startup AT WRAGH AFTER EOSBase_GeneralRegister AFTER HydroBase_StartUp
 {
   LANG: Fortran
 } "Startup banner"
@@ -139,7 +139,7 @@ schedule Whisky_Startup AT WRAGH AFTER EOSBase_GeneralRegister AFTER HydroBase_S
 ### Register the masks with SpaceMask ###
 #########################################
 
-schedule Whisky_RegisterMask AT STARTUP
+schedule GRHydro_RegisterMask AT STARTUP
 {
   LANG: C
 } "Register the hydro masks"
@@ -149,7 +149,7 @@ schedule Whisky_RegisterMask AT STARTUP
 ### Check the parameters are ok. ###
 ####################################
 
-schedule Whisky_ParamCheck AT PARAMCHECK
+schedule GRHydro_ParamCheck AT PARAMCHECK
 {
   LANG: Fortran
 } "Check parameters"
@@ -158,7 +158,7 @@ schedule Whisky_ParamCheck AT PARAMCHECK
 ### Standard symmetry registration ###
 ######################################
 
-schedule Whisky_InitSymBound AT BASEGRID
+schedule GRHydro_InitSymBound AT BASEGRID
 {
   LANG: Fortran
 } "Schedule symmetries"
@@ -167,7 +167,7 @@ schedule Whisky_InitSymBound AT BASEGRID
 ### Schedule the flux weighting calculation at initial ###
 ##########################################################
 
-# schedule Whisky_Weights AT CCTK_INITIAL
+# schedule GRHydro_Weights AT CCTK_INITIAL
 # {
 #   LANG: C
 # } "Set up the weighting terms for the fluxes"
@@ -180,7 +180,7 @@ SCHEDULE GROUP GZPatchSystem_register
 {
 } "Tell Cactus that this group exists, but is not scheduled from here"
 
-SCHEDULE Whisky_register_GZPatchSystem IN GZPatchSystem_register
+SCHEDULE GRHydro_register_GZPatchSystem IN GZPatchSystem_register
 {
   LANG: C
   OPTIONS: meta
@@ -190,12 +190,12 @@ SCHEDULE Whisky_register_GZPatchSystem IN GZPatchSystem_register
 ### Set the handle for the EOS ###
 ##################################
 
-schedule Whisky_EOSHandle AT CCTK_INITIAL before HydroBase_Initial
+schedule GRHydro_EOSHandle AT CCTK_INITIAL before HydroBase_Initial
 {
   LANG: C
 } "Set the EOS number"
 
-schedule Whisky_EOSHandle AT CCTK_POST_RECOVER_VARIABLES
+schedule GRHydro_EOSHandle AT CCTK_POST_RECOVER_VARIABLES
 {
   LANG: C
 } "Set the EOS number"
@@ -204,14 +204,14 @@ schedule Whisky_EOSHandle AT CCTK_POST_RECOVER_VARIABLES
 ### Setup of rho minima scalars  ###
 ####################################
 
-schedule Whisky_Rho_Minima_Setup  AT CCTK_Initial BEFORE HydroBase_Initial
+schedule GRHydro_Rho_Minima_Setup  AT CCTK_Initial BEFORE HydroBase_Initial
 {
   LANG: Fortran
 } "Set up minimum for the rest-mass density in the atmosphere (before intial data)"
 
 if (rho_abs_min_after_recovery > 0.0)
 {
-  schedule Whisky_Change_Rho_Minimum_At_Recovery AT CCTK_POST_RECOVER_VARIABLES
+  schedule GRHydro_Change_Rho_Minimum_At_Recovery AT CCTK_POST_RECOVER_VARIABLES
   {
     LANG: Fortran
   } "Set up minimum for the rest-mass density in the atmosphere (before intial data)"
@@ -219,22 +219,22 @@ if (rho_abs_min_after_recovery > 0.0)
 
 if (CCTK_IsThornActive("PUGH" ))
 {
-   schedule Whisky_Rho_Minima_Setup_Final_PUGH  AT CCTK_PostInitial BEFORE MoL_PostStep
+   schedule GRHydro_Rho_Minima_Setup_Final_PUGH  AT CCTK_PostInitial BEFORE MoL_PostStep
    {
      LANG: C
    } "Set the value of the rest-mass density of the atmosphere which will be used during the evolution (PUGH)"
 }  
 else if (CCTK_IsThornActive("Carpet"))
  {
-#   schedule Whisky_Rho_Minima_Setup_Final  AT CCTK_PostInitial BEFORE MoL_PostStep
-   schedule Whisky_Rho_Minima_Setup_Final AT CCTK_PostPostInitial BEFORE Con2Prim
+#   schedule GRHydro_Rho_Minima_Setup_Final  AT CCTK_PostInitial BEFORE MoL_PostStep
+   schedule GRHydro_Rho_Minima_Setup_Final AT CCTK_PostPostInitial BEFORE Con2Prim
    {
      LANG: C
    } "Set the value of the rest-mass density of the atmosphere which will be used during the evolution"
  }    
 
 # this is a temporary hack, because carpet does allow only one loop over the levels for Basegrid-Iniital-Postinitial
-# so we must compute whisky_rho_min at postpostinitial and the constraints after this (and afer C2P)
+# so we must compute GRHydro_rho_min at postpostinitial and the constraints after this (and afer C2P)
 #  schedule GROUP ADMConstraintsGroup at CCTK_POSTINITIAL after (MoL_PostStep MoL_PostInitial)
   schedule GROUP ADMConstraintsGroup at CCTK_POSTPOSTINITIAL
   {
@@ -247,12 +247,12 @@ else if (CCTK_IsThornActive("Carpet"))
 if (CCTK_Equals(recon_method,"eno")) 
 {
 
-  schedule Whisky_ENOSetup AT CCTK_Basegrid
+  schedule GRHydro_ENOSetup AT CCTK_Basegrid
   {
     LANG:Fortran
   } "Coefficients for ENO reconstruction"
 
-  schedule Whisky_ENOShutdown AT CCTK_Terminate BEFORE Driver_Terminate
+  schedule GRHydro_ENOShutdown AT CCTK_Terminate BEFORE Driver_Terminate
   {
     LANG:Fortran
   } "Deallocate ENO coefficients"
@@ -273,21 +273,21 @@ if (EoS_Change)
 {
   if (CCTK_Equals(EoS_Change_type,"Gamma"))
   {
-    schedule Whisky_EoSChangeGamma AT CCTK_Initial AFTER HydroBase_Initial BEFORE Whisky_IVP
+    schedule GRHydro_EoSChangeGamma AT CCTK_Initial AFTER HydroBase_Initial BEFORE GRHydro_IVP
     { 
       LANG: Fortran
     } "Reset the specific internal energy if the EoS changes between ID and evolution"
   }
   if (CCTK_Equals(EoS_Change_type,"K"))
   {
-    schedule Whisky_EoSChangeK AT CCTK_Initial AFTER HydroBase_Initial BEFORE Whisky_IVP
+    schedule GRHydro_EoSChangeK AT CCTK_Initial AFTER HydroBase_Initial BEFORE GRHydro_IVP
     { 
       LANG: Fortran
     } "Reset the hydro variables if the EoS (K) changes between ID and evolution"
   }
   if (CCTK_Equals(EoS_Change_type,"GammaKS"))
   {
-    schedule Whisky_EoSChangeGammaK_Shibata AT CCTK_Initial AFTER HydroBase_Initial BEFORE Whisky_IVP
+    schedule GRHydro_EoSChangeGammaK_Shibata AT CCTK_Initial AFTER HydroBase_Initial BEFORE GRHydro_IVP
     { 
       LANG: Fortran
       SYNC: dens
@@ -306,7 +306,7 @@ if (EoS_Change)
 ### Setup of dens minima scalars  ###
 #####################################
 # commented out, since unused for a long time
-#schedule Whisky_Dens_Minima_Setup AT CCTK_Postinitial
+#schedule GRHydro_Dens_Minima_Setup AT CCTK_Postinitial
 #{
 #  LANG: Fortran
 #} "Set up and check minima for dens"
@@ -315,7 +315,7 @@ if (EoS_Change)
 ### Standard registration of variables to MoL ###
 #################################################
 
-schedule Whisky_Register IN MoL_Register
+schedule GRHydro_Register IN MoL_Register
 {
   LANG: C
 } "Register variables for MoL"
@@ -324,7 +324,7 @@ schedule Whisky_Register IN MoL_Register
 ### Setup of any scalars for efficiency purposes ###
 ####################################################
 
-schedule Whisky_Scalar_Setup IN MoL_PreStep
+schedule GRHydro_Scalar_Setup IN MoL_PreStep
 {
   LANG: Fortran
 } "Set up and check scalars for efficiency"
@@ -333,46 +333,46 @@ schedule Whisky_Scalar_Setup IN MoL_PreStep
 ### We might want to switch off evolution... ###
 ################################################
 
-if (CCTK_EQUALS(evolution_method, "whisky")) {
+if (CCTK_EQUALS(evolution_method, "GRHydro")) {
 
-STORAGE:whisky_atmosphere_mask
-STORAGE:whisky_atmosphere_descriptors
+STORAGE:GRHydro_atmosphere_mask
+STORAGE:GRHydro_atmosphere_descriptors
 
-schedule Whisky_SetupMask AT CCTK_Initial BEFORE HydroBase_Initial
+schedule GRHydro_SetupMask AT CCTK_Initial BEFORE HydroBase_Initial
 {
   LANG: Fortran
 } "Initialize the atmosphere mask"
 
 # If using mesh refinement
-schedule Whisky_SetupMask AT POSTREGRID BEFORE MoL_PostStep AFTER (MaskOne,MaskZero)
+schedule GRHydro_SetupMask AT POSTREGRID BEFORE MoL_PostStep AFTER (MaskOne,MaskZero)
 {
   LANG: Fortran
 } "Initialize the atmosphere mask"
 
-schedule Whisky_SetupMask AT POSTRESTRICTINITIAL BEFORE HydroBase_PostStep AFTER (MaskOne,MaskZero)
+schedule GRHydro_SetupMask AT POSTRESTRICTINITIAL BEFORE HydroBase_PostStep AFTER (MaskOne,MaskZero)
 {
   LANG: Fortran
 } "Initialize the atmosphere mask"
 
 if (wk_atmosphere)
 {
-  schedule Whisky_InitAtmosMask AT CCTK_PostInitial
+  schedule GRHydro_InitAtmosMask AT CCTK_PostInitial
   {
     LANG: Fortran
   } "Set the atmosphere mask"
 
-  schedule Whisky_InitAtmosMask AT POSTREGRID AFTER Whisky_SetupMask BEFORE MoL_PostStep
+  schedule GRHydro_InitAtmosMask AT POSTREGRID AFTER GRHydro_SetupMask BEFORE MoL_PostStep
   {
     LANG: Fortran
   } "Set the atmosphere mask"
 
-  schedule Whisky_InitAtmosMask AT POSTRESTRICTINITIAL AFTER Whisky_SetupMask BEFORE HydroBase_PostStep
+  schedule GRHydro_InitAtmosMask AT POSTRESTRICTINITIAL AFTER GRHydro_SetupMask BEFORE HydroBase_PostStep
   {
     LANG: Fortran
   } "Set the atmosphere mask"
 }
 
-schedule Whisky_SetupDescriptors AT CCTK_Initial BEFORE HydroBase_Initial
+schedule GRHydro_SetupDescriptors AT CCTK_Initial BEFORE HydroBase_Initial
 {
   LANG: C
 } "Get and store the mask descriptors"
@@ -385,30 +385,30 @@ schedule Whisky_SetupDescriptors AT CCTK_Initial BEFORE HydroBase_Initial
 ### the calculation of the source terms and the flux update.      ###
 #####################################################################
 
-schedule group WhiskyRHS IN HydroBase_RHS
+schedule group GRHydroRHS IN HydroBase_RHS
 {
-  STORAGE:whisky_scalars
+  STORAGE:GRHydro_scalars
 } "Calculate the update terms"
 
 #============================================
 # Uncomment the following lines for debugging
 #
-# schedule Whisky_Scalar_Setup AT CCTK_Initial
+# schedule GRHydro_Scalar_Setup AT CCTK_Initial
 # {
 #   LANG: Fortran
 # } "Set up and check scalars for efficiency"
 # 
-# schedule group WhiskyRHS AT CCTK_Analysis
+# schedule group GRHydroRHS AT CCTK_Analysis
 # {
-#   STORAGE:whisky_scalars
+#   STORAGE:GRHydro_scalars
 #   TRIGGERS: densrhs
 #   TRIGGERS: srhs
 #   TRIGGERS: taurhs
 # } "Calculate the update terms"
 # 
-# STORAGE:whisky_fluxes
-# STORAGE:whisky_con_bext
-# STORAGE:whisky_prim_bext
+# STORAGE:GRHydro_fluxes
+# STORAGE:GRHydro_con_bext
+# STORAGE:GRHydro_prim_bext
 # STORAGE:EOS_temps
 # 
 # schedule Primitive2ConservativeCells AT CCTK_POSTINITIAL AFTER GZPatchSystem_cxform BEFORE MoL_PostStep
@@ -420,13 +420,13 @@ schedule group WhiskyRHS IN HydroBase_RHS
 
 if (number_of_particles)
 {
-  schedule WhiskyParticleInitial AT CCTK_Initial BEFORE HydroBase_Initial
+  schedule GRHydroParticleInitial AT CCTK_Initial BEFORE HydroBase_Initial
   {
     OPTIONS: GLOBAL
     LANG: Fortran
   } "Initial data for the particle arrays"
 
-  schedule WhiskyParticleRHS IN WhiskyRHS
+  schedule GRHydroParticleRHS IN GRHydroRHS
   {
     OPTIONS: GLOBAL
     LANG: Fortran
@@ -438,7 +438,7 @@ if (number_of_particles)
 ### over the different directions                                ###
 ####################################################################
 
-schedule SourceTerms IN WhiskyRHS BEFORE FluxTerms
+schedule SourceTerms IN GRHydroRHS BEFORE FluxTerms
 {
   LANG: Fortran
 } "Source term calculation"
@@ -447,7 +447,7 @@ schedule SourceTerms IN WhiskyRHS BEFORE FluxTerms
 ### Initial setup for the loop over the different directions. ###
 #################################################################
 
-schedule WhiskyStartLoop IN WhiskyRHS BEFORE FluxTerms
+schedule GRHydroStartLoop IN GRHydroRHS BEFORE FluxTerms
 {
   LANG: Fortran
   OPTIONS: level
@@ -471,23 +471,23 @@ if (CCTK_Equals(method_type, "RSA FV"))
 
   if (evolve_tracer)
   {  
-    schedule group FluxTerms IN WhiskyRHS WHILE Whisky::flux_direction
+    schedule group FluxTerms IN GRHydroRHS WHILE GRHydro::flux_direction
     {
-      STORAGE:whisky_prim_bext
-      STORAGE:whisky_con_bext
-      STORAGE:whisky_fluxes
-      STORAGE:whisky_tracer_cons_bext
-      STORAGE:whisky_tracer_prim_bext
-      STORAGE:whisky_tracer_flux
+      STORAGE:GRHydro_prim_bext
+      STORAGE:GRHydro_con_bext
+      STORAGE:GRHydro_fluxes
+      STORAGE:GRHydro_tracer_cons_bext
+      STORAGE:GRHydro_tracer_prim_bext
+      STORAGE:GRHydro_tracer_flux
     } "Calculation of intercell fluxes"
   }
   else
   {
-    schedule group FluxTerms IN WhiskyRHS WHILE Whisky::flux_direction
+    schedule group FluxTerms IN GRHydroRHS WHILE GRHydro::flux_direction
     {
-      STORAGE:whisky_prim_bext
-      STORAGE:whisky_con_bext
-      STORAGE:whisky_fluxes
+      STORAGE:GRHydro_prim_bext
+      STORAGE:GRHydro_con_bext
+      STORAGE:GRHydro_fluxes
     } "Calculation of intercell fluxes"
   }
     
@@ -495,7 +495,7 @@ if (CCTK_Equals(method_type, "RSA FV"))
 ### This is a wrapper call to the reconstruction routines. ###
 ##############################################################
 
-  if (CCTK_Equals(whisky_eos_type,"General")) {
+  if (CCTK_Equals(GRHydro_eos_type,"General")) {
 
     schedule Reconstruction IN FluxTerms AS Reconstruct
     {
@@ -503,7 +503,7 @@ if (CCTK_Equals(method_type, "RSA FV"))
     } "Reconstruct the functions at the cell boundaries"
     
   }
-  else if (CCTK_Equals(whisky_eos_type,"Polytype")) {
+  else if (CCTK_Equals(GRHydro_eos_type,"Polytype")) {
     
     schedule ReconstructionPolytype IN FluxTerms AS Reconstruct
     {
@@ -518,7 +518,7 @@ if (CCTK_Equals(method_type, "RSA FV"))
     IN FluxTerms AFTER Reconstruct
     {
       LANG: C
-      SYNC: whisky_trivial_rp_gf_group
+      SYNC: GRHydro_trivial_rp_gf_group
     } "Set the gridfunction for the trp (for debugging only)"
   }
   
@@ -535,7 +535,7 @@ if (CCTK_Equals(method_type, "RSA FV"))
       STORAGE: RoeAverage_temps
     } "Solve the local Riemann problems"
   }
-  else if (CCTK_Equals(whisky_eos_type,"General")) {
+  else if (CCTK_Equals(GRHydro_eos_type,"General")) {
     
     schedule RiemannSolve IN FluxTerms AFTER Reconstruct AS Riemann
     {
@@ -544,7 +544,7 @@ if (CCTK_Equals(method_type, "RSA FV"))
     } "Solve the local Riemann problems"
     
   }
-  else if (CCTK_Equals(whisky_eos_type,"Polytype")) {
+  else if (CCTK_Equals(GRHydro_eos_type,"Polytype")) {
     
     schedule RiemannSolvePolytype IN FluxTerms AFTER Reconstruct AS Riemann
     {
@@ -562,44 +562,44 @@ else if (CCTK_Equals(method_type, "Flux split FD"))
   if (evolve_tracer)
   {
 
-    schedule group FluxTerms IN WhiskyRHS WHILE Whisky::flux_direction 
+    schedule group FluxTerms IN GRHydroRHS WHILE GRHydro::flux_direction 
     {
-      STORAGE: whisky_fluxes
-      STORAGE: whisky_tracer_flux
+      STORAGE: GRHydro_fluxes
+      STORAGE: GRHydro_tracer_flux
     } "Calculation of intercell fluxes"
 
-    schedule Whisky_FSAlpha IN FluxTerms BEFORE Whisky_SplitFlux
+    schedule GRHydro_FSAlpha IN FluxTerms BEFORE GRHydro_SplitFlux
     {
       LANG: Fortran
     } "Compute the maximum characteristic speeds"
 
-    schedule Whisky_SplitFlux IN FluxTerms AS Reconstruct
+    schedule GRHydro_SplitFlux IN FluxTerms AS Reconstruct
     {
       LANG: Fortran
       STORAGE: flux_splitting
-      STORAGE: whisky_tracer_flux_splitting
-      SYNC: whisky_fluxes
+      STORAGE: GRHydro_tracer_flux_splitting
+      SYNC: GRHydro_fluxes
     } "Compute the fluxes using WENO5 FD + Lax-Friedrichs splitting"
 
   }
   else
   {
 
-    schedule group FluxTerms IN WhiskyRHS WHILE Whisky::flux_direction 
+    schedule group FluxTerms IN GRHydroRHS WHILE GRHydro::flux_direction 
     {
-      STORAGE: whisky_fluxes
+      STORAGE: GRHydro_fluxes
     } "Calculation of intercell fluxes"
 
-    schedule Whisky_FSAlpha IN FluxTerms BEFORE Whisky_SplitFlux
+    schedule GRHydro_FSAlpha IN FluxTerms BEFORE GRHydro_SplitFlux
     {
       LANG: Fortran
     } "Compute the maximum characteristic speeds"
 
-    schedule Whisky_SplitFlux IN FluxTerms AS Reconstruct
+    schedule GRHydro_SplitFlux IN FluxTerms AS Reconstruct
     {
       LANG: Fortran
       STORAGE: flux_splitting
-      SYNC: whisky_fluxes
+      SYNC: GRHydro_fluxes
     } "Compute the fluxes using WENO5 FD + Lax-Friedrichs splitting"
 
   }
@@ -619,7 +619,7 @@ schedule UpdateCalculation IN FluxTerms AFTER Riemann
 ### Advance the loop counter. ###
 #################################
 
-schedule WhiskyAdvanceLoop IN FluxTerms AFTER UpdateCalculation
+schedule GRHydroAdvanceLoop IN FluxTerms AFTER UpdateCalculation
 {
   LANG: Fortran
   OPTIONS: level
@@ -634,7 +634,7 @@ schedule WhiskyAdvanceLoop IN FluxTerms AFTER UpdateCalculation
 ### certain conditions are violated.                    ###
 ###########################################################
 
-schedule WhiskyUpdateAtmosphereMask IN WhiskyRHS AFTER FluxTerms
+schedule GRHydroUpdateAtmosphereMask IN GRHydroRHS AFTER FluxTerms
 {
   LANG: Fortran
 } "Alter the update terms if inside the atmosphere region"
@@ -644,9 +644,9 @@ schedule WhiskyUpdateAtmosphereMask IN WhiskyRHS AFTER FluxTerms
 ###############################################################
 
 # This should not be used anymore and be removed after some time
-schedule group Whisky_PostStep IN HydroBase_PostStep
+schedule group GRHydro_PostStep IN HydroBase_PostStep
 {
-} "Post step tasks for Whisky"
+} "Post step tasks for GRHydro"
 
 #################################################################
 ### After MoL has updated the conserved variables, we need to ###
@@ -658,22 +658,22 @@ schedule group Whisky_PostStep IN HydroBase_PostStep
 ### Find the refinement level that is being computed ###
 ########################################################
 
-schedule Whisky_RefinementLevel IN MoL_PostStep BEFORE (SetMetricTemps,HydroBase_PostStep)
+schedule GRHydro_RefinementLevel IN MoL_PostStep BEFORE (SetMetricTemps,HydroBase_PostStep)
 {
   LANG: Fortran
 } "Calculate current refinement level"
 
-schedule Whisky_RefinementLevel AT CCTK_PostStep
+schedule GRHydro_RefinementLevel AT CCTK_PostStep
 {
   LANG: Fortran
 } "Calculate current refinement level (for the check of the C2P mask)"
 
-schedule Whisky_RefinementLevel AT POSTREGRIDINITIAL 
+schedule GRHydro_RefinementLevel AT POSTREGRIDINITIAL 
 {
   LANG: Fortran
 } "Calculate current refinement level"
 
-schedule Whisky_RefinementLevel AT INITIAL BEFORE HydroBase_Initial
+schedule GRHydro_RefinementLevel AT INITIAL BEFORE HydroBase_Initial
 {
   LANG: Fortran
 } "Calculate current refinement level"
@@ -697,7 +697,7 @@ if (use_eosgeneral)
   } "Set the temporary metric terms"
 
 
-  if (CCTK_Equals(whisky_eos_type,"General")) 
+  if (CCTK_Equals(GRHydro_eos_type,"General")) 
   {
 
     schedule Conservative2PrimitiveGeneral IN HydroBase_Con2Prim AS Con2Prim
@@ -707,7 +707,7 @@ if (use_eosgeneral)
     } "Convert back to primitive variables (general)"
 
   }
-  else if (CCTK_Equals(whisky_eos_type,"Polytype")) 
+  else if (CCTK_Equals(GRHydro_eos_type,"Polytype")) 
   {
 
     schedule Con2PrimPolytypeGeneral IN HydroBase_Con2Prim AS Con2Prim
@@ -719,7 +719,7 @@ if (use_eosgeneral)
   }
 
 }  
-else if (CCTK_Equals(whisky_eos_type,"General")) 
+else if (CCTK_Equals(GRHydro_eos_type,"General")) 
 {
 
   schedule Conservative2Primitive IN HydroBase_Con2Prim AS Con2Prim
@@ -728,7 +728,7 @@ else if (CCTK_Equals(whisky_eos_type,"General"))
   } "Convert back to primitive variables (general)"
 
 }
-else if (CCTK_Equals(whisky_eos_type,"Polytype")) 
+else if (CCTK_Equals(GRHydro_eos_type,"Polytype")) 
 {
   
   schedule Conservative2PrimitivePolytype IN HydroBase_Con2Prim AS Con2Prim
@@ -746,31 +746,31 @@ else if (CCTK_Equals(whisky_eos_type,"Polytype"))
 ### and so synchronization is not necessary.                  ###
 #################################################################
 
-#schedule Whisky_Boundaries IN HydroBase_PostStep AFTER Con2Prim
+#schedule GRHydro_Boundaries IN HydroBase_PostStep AFTER Con2Prim
 
 if (evolve_tracer)
 {
-  STORAGE:whisky_tracers[3]
-  STORAGE:whisky_cons_tracers[3]
-  STORAGE:whisky_tracer_rhs
+  STORAGE:GRHydro_tracers[3]
+  STORAGE:GRHydro_cons_tracers[3]
+  STORAGE:GRHydro_tracer_rhs
 }
 
 if (outflow_boundaries)
 {
-  schedule Whisky_OutflowBoundaries IN HydroBase_PostStep BEFORE Whisky_Boundaries
+  schedule GRHydro_OutflowBoundaries IN HydroBase_PostStep BEFORE GRHydro_Boundaries
   {
     LANG: Fortran
   } "Outflow boundaries over only some of the domain"
 }
 
 # This should not be used anymore and should be removed after some time
-schedule group Do_Whisky_Boundaries IN HydroBase_Boundaries
+schedule group Do_GRHydro_Boundaries IN HydroBase_Boundaries
 {
-} "Whisky Boundary conditions group"
+} "GRHydro Boundary conditions group"
 
 if (evolve_tracer)
 {
-  schedule Whisky_Boundaries IN HydroBase_Select_Boundaries
+  schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries
   {
     LANG: Fortran
     OPTIONS: LEVEL
@@ -782,12 +782,12 @@ if (evolve_tracer)
     SYNC: HydroBase::press
     SYNC: HydroBase::eps
     SYNC: HydroBase::vel
-    SYNC: whisky_cons_tracers
-    SYNC: whisky_tracers
-  } "Select Whisky boundary conditions"
+    SYNC: GRHydro_cons_tracers
+    SYNC: GRHydro_tracers
+  } "Select GRHydro boundary conditions"
 } else
 {
-  schedule Whisky_Boundaries IN HydroBase_Select_Boundaries
+  schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries
   {
     LANG: Fortran
     OPTIONS: LEVEL
@@ -799,7 +799,7 @@ if (evolve_tracer)
     SYNC: HydroBase::press
     SYNC: HydroBase::eps
     SYNC: HydroBase::vel
-  } "Select Whisky boundary conditions"
+  } "Select GRHydro boundary conditions"
 }
 
 ############################################################
@@ -809,14 +809,14 @@ if (evolve_tracer)
 # commented out (2006.08.22) since unused, for the time being
 #STORAGE:DiffRho
 
-#schedule Whisky_DiffRho IN HydroBase_PostStep AFTER Whisky_ApplyBCs
+#schedule GRHydro_DiffRho IN HydroBase_PostStep AFTER GRHydro_ApplyBCs
 #{
 #  LANG: Fortran
 #} "Compute relative differences in rho"
 
 
 # older version
-# schedule Whisky_DiffRho AT POSTREGRID
+# schedule GRHydro_DiffRho AT POSTREGRID
 # {
 #   LANG: Fortran
 # } "Compute relative differences in rho"
@@ -829,7 +829,7 @@ if (evolve_tracer)
 ### move along.                                              ###
 ################################################################
 
-schedule Whisky_AtmosphereReset IN MoL_Evolution AFTER MoL_Step BEFORE HydroBase_Boundaries AFTER MoL_RestoreSandR
+schedule GRHydro_AtmosphereReset IN MoL_Evolution AFTER MoL_Step BEFORE HydroBase_Boundaries AFTER MoL_RestoreSandR
 {
   LANG: Fortran
 } "Reset the atmosphere"
@@ -838,30 +838,30 @@ schedule group HydroBase_Boundaries IN MoL_Evolution AFTER MoL_Step
 {
 } "HydroBase Boundary conditions group"
 
-} # end of  if (CCTK_EQUALS(hydrobase::evolution_method, "whisky"))
+} # end of  if (CCTK_EQUALS(hydrobase::evolution_method, "GRHydro"))
   
 if (set_trivial_rp_grid_function)
 {
-  STORAGE: whisky_trivial_rp_gf_group
+  STORAGE: GRHydro_trivial_rp_gf_group
 }
 
 if (ppm_mppm_debug_eigenvalues)
 {
-  STORAGE: whisky_mppm_eigenvalues
+  STORAGE: GRHydro_mppm_eigenvalues
 }
 
-# Check that rho >= whisky_rho_min
+# Check that rho >= GRHydro_rho_min
 if (Check_Rho_Minimum)
 {
-  schedule Whisky_Check_Rho_Minimum AT ANALYSIS
+  schedule GRHydro_Check_Rho_Minimum AT ANALYSIS
   {
     LANG: Fortran
     TRIGGERS: HydroBase::rho
     TRIGGERS: HydroBase::press
     TRIGGERS: HydroBase::eps
-  } "Check whether somewhere rho(i,j,k) < whisky_rho_min and produce a WARNING"
+  } "Check whether somewhere rho(i,j,k) < GRHydro_rho_min and produce a WARNING"
   
-  schedule Whisky_RefinementLevel AT ANALYSIS BEFORE Whisky_Check_Rho_Minimum
+  schedule GRHydro_RefinementLevel AT ANALYSIS BEFORE GRHydro_Check_Rho_Minimum
   {
     LANG: Fortran
     TRIGGERS: HydroBase::rho
@@ -872,30 +872,30 @@ if (Check_Rho_Minimum)
 
 # set and check a mask containing the failures of C2P; if they occur at points overwritten by finer grids, they can be ignored.
 
-STORAGE: whisky_C2P_failed[1]
+STORAGE: GRHydro_C2P_failed[1]
 
-schedule reset_whisky_C2P_failed AT BASEGRID
+schedule reset_GRHydro_C2P_failed AT BASEGRID
 {
   LANG: Fortran
 } "Initialise the mask function that contains the points where C2P has failed (at BASEGRID)"
 
-schedule reset_whisky_C2P_failed AT CCTK_PRESTEP
+schedule reset_GRHydro_C2P_failed AT CCTK_PRESTEP
 {
   LANG: Fortran
 } "Reset the mask function that contains the points where C2P has failed (at PRESTEP)"
 
-schedule sync_whisky_C2P_failed AT CCTK_EVOL AFTER MoL_Evolution
+schedule sync_GRHydro_C2P_failed AT CCTK_EVOL AFTER MoL_Evolution
 {
   LANG: Fortran
-  SYNC: whisky_C2P_failed
+  SYNC: GRHydro_C2P_failed
 } "Syncronise the mask function that contains the points where C2P has failed"
 
-schedule check_whisky_C2P_failed AT CCTK_POSTSTEP AFTER Whisky_RefinementLevel
+schedule check_GRHydro_C2P_failed AT CCTK_POSTSTEP AFTER GRHydro_RefinementLevel
 {
   LANG: Fortran
 } "Check the mask function that contains the points where C2P has failed and report an error in case a failure is found"
 
-schedule Whisky_Tmunu IN AddToTmunu
+schedule GRHydro_Tmunu IN AddToTmunu
 {
   LANG: Fortran
 } "Compute the energy-momentum tensor"
diff --git a/src/Whisky_Boundaries.F90 b/src/GRHydro_Boundaries.F90
index 7a0b280..5e8c093 100644
--- a/src/Whisky_Boundaries.F90
+++ b/src/GRHydro_Boundaries.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Boundaries.F90
+   @file      GRHydro_Boundaries.F90
    @date      Sat Jan 26 01:01:14 2002
    @author    
    @desc 
@@ -22,7 +22,7 @@
 #define sz(i,j,k) scon(i,j,k,3)
 
  /*@@
-   @routine    Whisky_InitSymBound
+   @routine    GRHydro_InitSymBound
    @date       Sat Jan 26 01:03:04 2002
    @author     Ian Hawke
    @desc 
@@ -37,7 +37,7 @@
 
 @@*/
 
-subroutine Whisky_InitSymBound(CCTK_ARGUMENTS)
+subroutine GRHydro_InitSymBound(CCTK_ARGUMENTS)
 
   implicit none
   
@@ -57,16 +57,16 @@ subroutine Whisky_InitSymBound(CCTK_ARGUMENTS)
   
   call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::rho")
   call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::press")
-  call SetCartSymVN(ierr, cctkGH, sym, "Whisky::dens")
-  call SetCartSymVN(ierr, cctkGH, sym, "Whisky::tau")
-  call SetCartSymVN(ierr, cctkGH, sym, "Whisky::w_lorentz")
+  call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::dens")
+  call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::tau")
+  call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::w_lorentz")
   call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::eps")
-  call SetCartSymVN(ierr, cctkGH, sym, "Whisky::whisky_C2P_failed")
+  call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::GRHydro_C2P_failed")
 
 !!$ handle multiple tracer variables
   if(evolve_tracer.eq.1) then
-     call SetCartSymGN(ierr, cctkGH, sym, "Whisky::whisky_tracers")
-     call SetCartSymGN(ierr, cctkGH, sym, "Whisky::whisky_cons_tracers")
+     call SetCartSymGN(ierr, cctkGH, sym, "GRHydro::GRHydro_tracers")
+     call SetCartSymGN(ierr, cctkGH, sym, "GRHydro::GRHydro_cons_tracers")
   endif 
   
   sym(1) = -1
@@ -74,26 +74,26 @@ subroutine Whisky_InitSymBound(CCTK_ARGUMENTS)
   sym(3) = 1
   
   call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[0]")
-  call SetCartSymVN(ierr, cctkGH, sym, "Whisky::scon[0]")
+  call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[0]")
   
   sym(1) = 1
   sym(2) = -1
   sym(3) = 1
   
   call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[1]")
-  call SetCartSymVN(ierr, cctkGH, sym, "Whisky::scon[1]")
+  call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[1]")
   
   sym(1) = 1
   sym(2) = 1
   sym(3) = -1
   
   call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[2]")
-  call SetCartSymVN(ierr, cctkGH, sym, "Whisky::scon[2]")
+  call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[2]")
   
-end subroutine Whisky_InitSymBound
+end subroutine GRHydro_InitSymBound
 
  /*@@
-   @routine    Whisky_Boundaries
+   @routine    GRHydro_Boundaries
    @date       Sat Jan 26 01:04:04 2002
    @author     
    @desc 
@@ -107,7 +107,7 @@ end subroutine Whisky_InitSymBound
 
 @@*/
 
-subroutine Whisky_Boundaries(CCTK_ARGUMENTS)
+subroutine GRHydro_Boundaries(CCTK_ARGUMENTS)
   
   implicit none
   
@@ -123,60 +123,60 @@ subroutine Whisky_Boundaries(CCTK_ARGUMENTS)
   CCTK_INT, parameter :: faces=CCTK_ALL_FACES
   CCTK_INT, parameter :: ione=1
   
-  sw = Whisky_stencil
+  sw = GRHydro_stencil
 
 !!$Flat boundaries if required  
 
   if (CCTK_EQUALS(bound,"flat")) then
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-         "Whisky::dens", "Flat")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-         "Whisky::tau", "Flat")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-         "Whisky::scon", "Flat")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-         "Whisky::w_lorentz", "Flat")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+         "GRHydro::dens", "Flat")
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+         "GRHydro::tau", "Flat")
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+         "GRHydro::scon", "Flat")
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+         "GRHydro::w_lorentz", "Flat")
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
          "HydroBase::rho", "Flat")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
          "HydroBase::press", "Flat")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
          "HydroBase::eps", "Flat")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
          "HydroBase::vel", "Flat")
 
     if(evolve_tracer .ne. 0) then 
-      ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-            "Whisky::Whisky_tracers", "Flat")
-      ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-            "Whisky::Whisky_cons_tracers", "Flat")
+      ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+            "GRHydro::GRHydro_tracers", "Flat")
+      ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+            "GRHydro::GRHydro_cons_tracers", "Flat")
     endif
 
   endif
 
   if (CCTK_EQUALS(bound,"none")) then
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-         "Whisky::dens", "None")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-         "Whisky::tau", "None")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-         "Whisky::scon", "None")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-         "Whisky::w_lorentz", "None")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+         "GRHydro::dens", "None")
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+         "GRHydro::tau", "None")
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+         "GRHydro::scon", "None")
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+         "GRHydro::w_lorentz", "None")
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
          "HydroBase::rho", "None")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
          "HydroBase::press", "None")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
          "HydroBase::eps", "None")
-    ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
+    ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
          "HydroBase::vel", "None")
 
     if(evolve_tracer .ne. 0) then 
-      ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-            "Whisky::Whisky_tracers", "None")
-      ierr = Boundary_SelectGroupForBC(cctkGH, faces, whisky_stencil, -ione, &
-            "Whisky::Whisky_cons_tracers", "None")
+      ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+            "GRHydro::GRHydro_tracers", "None")
+      ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &
+            "GRHydro::GRHydro_cons_tracers", "None")
     endif
 
   end if
@@ -187,11 +187,11 @@ subroutine Whisky_Boundaries(CCTK_ARGUMENTS)
 
   if (ierr < 0) call CCTK_WARN(0, "problems with applying the chosen boundary condition")
 
-end subroutine Whisky_Boundaries
+end subroutine GRHydro_Boundaries
 
 
  /*@@
-   @routine    Whisky_OutflowBoundaries
+   @routine    GRHydro_OutflowBoundaries
    @date       Tue May 17 16:58:06 2005
    @author     Ian Hawke
    @desc 
@@ -206,7 +206,7 @@ end subroutine Whisky_Boundaries
 
 @@*/
 
-subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS)
+subroutine GRHydro_OutflowBoundaries(CCTK_ARGUMENTS)
   
   implicit none
   
@@ -222,7 +222,7 @@ subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS)
 
   CCTK_REAL :: det,psi4pt
 
-  sw = Whisky_stencil
+  sw = GRHydro_stencil
 
   if (r(1,1,1) < r(1,1,cctk_lsh(3))) then
 
@@ -256,7 +256,7 @@ subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS)
                      psi4pt*gxz(i,j,k),psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),&
                      psi4pt*gzz(i,j,k),det)
               end if
-              call prim2con(whisky_eos_handle,psi4pt*gxx(i,j,k),&
+              call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),&
                    psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),&
                    psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),&
                    det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
@@ -303,7 +303,7 @@ subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS)
                      psi4pt*gxz(i,j,k),psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),&
                      psi4pt*gzz(i,j,k),det)
               end if
-              call prim2con(whisky_eos_handle,psi4pt*gxx(i,j,k),&
+              call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),&
                    psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),&
                    psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),&
                    det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
@@ -320,7 +320,7 @@ subroutine Whisky_OutflowBoundaries(CCTK_ARGUMENTS)
 
   end if
   
-end subroutine Whisky_OutflowBoundaries
+end subroutine GRHydro_OutflowBoundaries
 
 
 
diff --git a/src/Whisky_CalcUpdate.F90 b/src/GRHydro_CalcUpdate.F90
index e10866c..fb6fdd1 100644
--- a/src/Whisky_CalcUpdate.F90
+++ b/src/GRHydro_CalcUpdate.F90
@@ -1,5 +1,5 @@
   /*@@
-   @file      Whisky_CalcUpdate.F90
+   @file      GRHydro_CalcUpdate.F90
    @date      Thu Jan  11 11:03:32 2002
    @author    Ian Hawke
    @desc 
@@ -56,9 +56,9 @@ subroutine UpdateCalculation(CCTK_ARGUMENTS)
     if (use_weighted_fluxes == 0) then
 
       !$OMP PARALLEL DO PRIVATE(i,j,itracer,alp_l, alp_r)
-      do k = whisky_stencil + 1, cctk_lsh(3) - whisky_stencil
-        do j = whisky_stencil + 1, cctk_lsh(2) - whisky_stencil
-          do i = whisky_stencil + 1, cctk_lsh(1) - whisky_stencil
+      do k = GRHydro_stencil + 1, cctk_lsh(3) - GRHydro_stencil
+        do j = GRHydro_stencil + 1, cctk_lsh(2) - GRHydro_stencil
+          do i = GRHydro_stencil + 1, cctk_lsh(1) - GRHydro_stencil
             
             alp_l = 0.5d0 * (alp(i,j,k) + &
                  alp(i-xoffset,j-yoffset,k-zoffset))
@@ -140,9 +140,9 @@ subroutine UpdateCalculation(CCTK_ARGUMENTS)
       
       call CCTK_WARN(0, "Not supported")
       
-!!$    do k = whisky_stencil + 1, cctk_lsh(3) - whisky_stencil
-!!$      do j = whisky_stencil + 1, cctk_lsh(2) - whisky_stencil
-!!$        do i = whisky_stencil + 1, cctk_lsh(1) - whisky_stencil
+!!$    do k = GRHydro_stencil + 1, cctk_lsh(3) - GRHydro_stencil
+!!$      do j = GRHydro_stencil + 1, cctk_lsh(2) - GRHydro_stencil
+!!$        do i = GRHydro_stencil + 1, cctk_lsh(1) - GRHydro_stencil
 !!$          
 !!$          alp_l = 0.5d0 * (alp(i,j,k) + &
 !!$               alp(i-xoffset,j-yoffset,k-zoffset))
@@ -193,9 +193,9 @@ subroutine UpdateCalculation(CCTK_ARGUMENTS)
   
   else if (CCTK_EQUALS(method_type, "Flux split FD")) then
 
-    do k = whisky_stencil + 1, cctk_lsh(3) - whisky_stencil
-      do j = whisky_stencil + 1, cctk_lsh(2) - whisky_stencil
-        do i = whisky_stencil + 1, cctk_lsh(1) - whisky_stencil
+    do k = GRHydro_stencil + 1, cctk_lsh(3) - GRHydro_stencil
+      do j = GRHydro_stencil + 1, cctk_lsh(2) - GRHydro_stencil
+        do i = GRHydro_stencil + 1, cctk_lsh(1) - GRHydro_stencil
           
           densrhs(i,j,k) = densrhs(i,j,k) + &
                (densflux(i-xoffset,j-yoffset,k-zoffset) - &
diff --git a/src/Whisky_CarpetWeights.cc b/src/GRHydro_CarpetWeights.cc
index 8afdd12..3fb7fcf 100644
--- a/src/Whisky_CarpetWeights.cc
+++ b/src/GRHydro_CarpetWeights.cc
@@ -1,9 +1,9 @@
  /*@@
-   @file     Whisky_CarpetWeights.cc
+   @file     GRHydro_CarpetWeights.cc
    @date     Wed Aug 20 23:08:28 2008
    @author   Luca Baiotti
    @desc 
-   Copy the variable CarpetReduce::weight in a Whisky variable.
+   Copy the variable CarpetReduce::weight in a GRHydro variable.
    Written with the help of Thomas.
    @enddesc 
  @@*/
@@ -23,14 +23,14 @@
 #endif
     
     /* Scheduled functions */
-    void Whisky_CarpetWeights(CCTK_ARGUMENTS);
+    void GRHydro_CarpetWeights(CCTK_ARGUMENTS);
 
 #ifdef __cplusplus
   } /* extern "C" */
 #endif
 
 
-void Whisky_CarpetWeights(CCTK_ARGUMENTS)
+void GRHydro_CarpetWeights(CCTK_ARGUMENTS)
 {
 
   DECLARE_CCTK_ARGUMENTS;
@@ -39,26 +39,26 @@ void Whisky_CarpetWeights(CCTK_ARGUMENTS)
   int i;
 
   // Define the variable we will use in Con2Prim (F90) as a pointer to itself
-  Whisky_CarpetWeights = (CCTK_REAL *)(CCTK_VarDataPtr(cctkGH,0,"Whisky::Whisky_CarpetWeights"));
+  GRHydro_CarpetWeights = (CCTK_REAL *)(CCTK_VarDataPtr(cctkGH,0,"GRHydro::GRHydro_CarpetWeights"));
 
 
   if (CCTK_IsThornActive("CarpetReduce")!=0){
     // If we use Carpet then obtain a pointer to rhe carpet variable. This will be CarpetWeights
     const CCTK_REAL *CarpetWeights = (CCTK_REAL *)(CCTK_VarDataPtr(cctkGH,0,"CarpetReduce::weight"));
-    // Then assign the values of the carpet variable to the whisky variable
+    // Then assign the values of the carpet variable to the GRHydro variable
     for (i=0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
       {
-	Whisky_CarpetWeights[i] = CarpetWeights[i];
-	//printf("%13.12e\n",Whisky_CarpetWeights[i]);
+	GRHydro_CarpetWeights[i] = CarpetWeights[i];
+	//printf("%13.12e\n",GRHydro_CarpetWeights[i]);
       }
   }
   else{
-    // Then assign the values of the carpet variable to the whisky variable
-    CCTK_INFO("We are not using Carpet, so I set Whisky_CarpetWeights equal to 1");
+    // Then assign the values of the carpet variable to the GRHydro variable
+    CCTK_INFO("We are not using Carpet, so I set GRHydro_CarpetWeights equal to 1");
     for (i=0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
       {
-	Whisky_CarpetWeights[i] = 1; //if we do not use Carpet then we set this variable to be equal to 1
-	//printf("%13.12e\n",Whisky_CarpetWeights[i]);
+	GRHydro_CarpetWeights[i] = 1; //if we do not use Carpet then we set this variable to be equal to 1
+	//printf("%13.12e\n",GRHydro_CarpetWeights[i]);
       }
   }
 
diff --git a/src/Whisky_Con2Prim.F90 b/src/GRHydro_Con2Prim.F90
index f66eedb..8e13501 100644
--- a/src/Whisky_Con2Prim.F90
+++ b/src/GRHydro_Con2Prim.F90
@@ -1,7 +1,7 @@
 /*@@
-   @file      Whisky_RegisterVars.c
+   @file      GRHydro_RegisterVars.c
    @date      Sat Jan 26 01:06:01 2002
-   @author    The Whisky Developers
+   @author    The GRHydro Developers
    @desc 
    The routines for converting conservative to primitive variables.
    @enddesc 
@@ -31,8 +31,8 @@ module Con2Prim_fortran_interfaces
           det, &
           x, y, z, r, &
           epsnegative, &
-          whisky_rho_min, pmin, epsmin, &
-          whisky_reflevel, whisky_C2P_failed)
+          GRHydro_rho_min, pmin, epsmin, &
+          GRHydro_reflevel, GRHydro_C2P_failed)
        
        implicit none
        CCTK_INT  handle
@@ -48,12 +48,12 @@ module Con2Prim_fortran_interfaces
        CCTK_REAL det
        CCTK_REAL x, y, z, r
        logical  epsnegative
-       CCTK_REAL whisky_rho_min, pmin, epsmin
-       CCTK_INT  whisky_reflevel
-       CCTK_REAL whisky_C2P_failed    
+       CCTK_REAL GRHydro_rho_min, pmin, epsmin
+       CCTK_INT  GRHydro_reflevel
+       CCTK_REAL GRHydro_C2P_failed    
      end subroutine Con2Prim_pt
 
-     subroutine Con2Prim_ptPolytype(whisky_polytrope_handle, &
+     subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, &
           dens, &
           sx, sy, sz, &
           tau, &
@@ -64,11 +64,11 @@ module Con2Prim_fortran_interfaces
           uxx, uxy, uxz, uyy, uyz, uzz, &
           det, &
           x, y, z, r, &
-          whisky_rho_min, &
-          whisky_reflevel, whisky_C2P_failed)
+          GRHydro_rho_min, &
+          GRHydro_reflevel, GRHydro_C2P_failed)
           
        implicit none
-       CCTK_INT  whisky_polytrope_handle
+       CCTK_INT  GRHydro_polytrope_handle
        CCTK_REAL dens
        CCTK_REAL sx, sy, sz
        CCTK_REAL tau
@@ -80,9 +80,9 @@ module Con2Prim_fortran_interfaces
        CCTK_REAL uyy, uyz, uzz
        CCTK_REAL det
        CCTK_REAL x, y, z, r
-       CCTK_REAL whisky_rho_min
-       CCTK_INT  whisky_reflevel
-       CCTK_REAL whisky_C2P_failed
+       CCTK_REAL GRHydro_rho_min
+       CCTK_INT  GRHydro_reflevel
+       CCTK_REAL GRHydro_C2P_failed
      end subroutine Con2Prim_ptPolytype
 
      subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens)
@@ -164,8 +164,8 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS)
     local_min_tracer = 0d0
   end if
            
-  pmin   = EOS_Pressure(whisky_polytrope_handle, whisky_rho_min, 1.0d0)
-  epsmin = EOS_SpecificIntEnergy(whisky_polytrope_handle, whisky_rho_min, pmin)
+  pmin   = EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0)
+  epsmin = EOS_SpecificIntEnergy(GRHydro_polytrope_handle, GRHydro_rho_min, pmin)
 
   !$OMP PARALLEL DO PRIVATE(i,j,itracer,&
   !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, psi4pt, epsnegative)
@@ -214,15 +214,15 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS)
            
          endif
 
-         if ( dens(i,j,k) .le. sqrt(det)*whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) then
+         if ( dens(i,j,k) .le. sqrt(det)*GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then
 
-           dens(i,j,k) = sqrt(det)*whisky_rho_min !/(1.d0+whisky_atmo_tolerance)
-           rho(i,j,k) = whisky_rho_min
+           dens(i,j,k) = sqrt(det)*GRHydro_rho_min !/(1.d0+GRHydro_atmo_tolerance)
+           rho(i,j,k) = GRHydro_rho_min
            scon(i,j,k,:) = 0.d0
            vel(i,j,k,:) = 0.d0
            w_lorentz(i,j,k) = 1.d0
-           press(i,j,k) = EOS_Pressure(whisky_polytrope_handle, rho(i,j,k), eps(i,j,k))
-           eps(i,j,k) = EOS_SpecificIntEnergy(whisky_polytrope_handle, rho(i,j,k), press(i,j,k))
+           press(i,j,k) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,j,k), eps(i,j,k))
+           eps(i,j,k) = EOS_SpecificIntEnergy(GRHydro_polytrope_handle, rho(i,j,k), press(i,j,k))
            ! w_lorentz=1, so the expression for tau reduces to:
            tau(i,j,k)  = sqrt(det) * (rho(i,j,k)+rho(i,j,k)*eps(i,j,k)) - dens(i,j,k)
 
@@ -231,11 +231,11 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS)
          end if
 
 
-        call Con2Prim_pt(whisky_eos_handle, dens(i,j,k),scon(i,j,k,1),scon(i,j,k,2), &
+        call Con2Prim_pt(GRHydro_eos_handle, dens(i,j,k),scon(i,j,k,1),scon(i,j,k,2), &
              scon(i,j,k,3),tau(i,j,k),rho(i,j,k),vel(i,j,k,1),vel(i,j,k,2), &
              vel(i,j,k,3),eps(i,j,k),press(i,j,k),w_lorentz(i,j,k), &
              uxx,uxy,uxz,uyy,uyz,uzz,det,x(i,j,k),y(i,j,k), &
-             z(i,j,k),r(i,j,k),epsnegative,whisky_rho_min,pmin, epsmin, whisky_reflevel, whisky_C2P_failed(i,j,k))
+             z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k))
 
 
         if (epsnegative) then  
@@ -247,28 +247,28 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS)
           ! but will allow the job to continue if it happens in the atmosphere or in a
           ! zone that contains garbage (i.e. boundary, buffer zones)
           ! Ultimately, we want this fixed via a new carpet mask presently under development
-!           whisky_C2P_failed(i,j,k) = 1
+!           GRHydro_C2P_failed(i,j,k) = 1
 
           !$OMP CRITICAL
-          call CCTK_WARN(Whisky_NaN_verbose+2, 'Specific internal energy just went below 0! ')
-          write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
-          call CCTK_WARN(Whisky_NaN_verbose+2,warnline)
+          call CCTK_WARN(GRHydro_NaN_verbose+2, 'Specific internal energy just went below 0! ')
+          write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
+          call CCTK_WARN(GRHydro_NaN_verbose+2,warnline)
           write(warnline,'(a20,3g16.7)') 'xyz location: ',&
                x(i,j,k),y(i,j,k),z(i,j,k)
-          call CCTK_WARN(Whisky_NaN_verbose+2,warnline)
+          call CCTK_WARN(GRHydro_NaN_verbose+2,warnline)
           write(warnline,'(a20,g16.7)') 'radius: ',r(i,j,k)
-          call CCTK_WARN(Whisky_NaN_verbose+2,warnline)
-          call CCTK_WARN(Whisky_NaN_verbose+2,"Setting the point to atmosphere")
+          call CCTK_WARN(GRHydro_NaN_verbose+2,warnline)
+          call CCTK_WARN(GRHydro_NaN_verbose+2,"Setting the point to atmosphere")
           !$OMP END CRITICAL
 
           ! for safety, let's set the point to atmosphere
-          dens(i,j,k) = sqrt(det)*whisky_rho_min !/(1.d0+whisky_atmo_tolerance)
-          rho(i,j,k) = whisky_rho_min
+          dens(i,j,k) = sqrt(det)*GRHydro_rho_min !/(1.d0+GRHydro_atmo_tolerance)
+          rho(i,j,k) = GRHydro_rho_min
           scon(i,j,k,:) = 0.d0
           vel(i,j,k,:) = 0.d0
           w_lorentz(i,j,k) = 1.d0
-          press(i,j,k) = EOS_Pressure(whisky_polytrope_handle, rho(i,j,k), eps(i,j,k))
-          eps(i,j,k) = EOS_SpecificIntEnergy(whisky_polytrope_handle, rho(i,j,k), press(i,j,k))
+          press(i,j,k) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,j,k), eps(i,j,k))
+          eps(i,j,k) = EOS_SpecificIntEnergy(GRHydro_polytrope_handle, rho(i,j,k), press(i,j,k))
           ! w_lorentz=1, so the expression for tau reduces to:
           tau(i,j,k)  = sqrt(det) * (rho(i,j,k)+rho(i,j,k)*eps(i,j,k)) - dens(i,j,k)
 
@@ -278,14 +278,14 @@ subroutine Conservative2Primitive(CCTK_ARGUMENTS)
           ! this happened as having led to failing con2prim.
 
           !$OMP CRITICAL
-          call CCTK_WARN(Whisky_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype.')
+          call CCTK_WARN(GRHydro_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype.')
           !$OMP END CRITICAL
-          call Con2Prim_ptPolytype(whisky_polytrope_handle, &
+          call Con2Prim_ptPolytype(GRHydro_polytrope_handle, &
                dens(i,j,k), scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
                tau(i,j,k), rho(i,j,k), vel(i,j,k,1), vel(i,j,k,2), &
                vel(i,j,k,3), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k), &
                uxx, uxy, uxz, uyy, uyz, uzz, det, x(i,j,k), y(i,j,k), &
-               z(i,j,k), r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k))
+               z(i,j,k), r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k))
 #endif          
 
         end if
@@ -301,7 +301,7 @@ end subroutine Conservative2Primitive
 /*@@
 @routine    Con2Prim_pt
 @date       Sat Jan 26 01:09:39 2002
-@author     The Whisky Develpoers    
+@author     The GRHydro Develpoers    
 @desc 
 Given all the appropriate data, recover the primitive variables at
 a single point.
@@ -315,7 +315,7 @@ a single point.
 
 subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, &
      velz, epsilon, press, w_lorentz, uxx, uxy, uxz, uyy, &
-     uyz, uzz, det, x, y, z, r, epsnegative, whisky_rho_min, pmin, epsmin, whisky_reflevel, whisky_C2P_failed)
+     uyz, uzz, det, x, y, z, r, epsnegative, GRHydro_rho_min, pmin, epsmin, GRHydro_reflevel, GRHydro_C2P_failed)
   
   implicit none
   
@@ -323,10 +323,10 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, &
   
   CCTK_REAL dens, sx, sy, sz, tau, rho, velx, vely, velz, epsilon, &
        press, uxx, uxy, uxz, uyy, uyz, uzz, det, w_lorentz, x, &
-       y, z, r, whisky_rho_min
+       y, z, r, GRHydro_rho_min
   
   CCTK_REAL s2, c0, c1, c2, c3, c4, f, df, ftol, v2, w, vlowx, vlowy, vlowz
-  CCTK_INT count, i, handle, whisky_reflevel, whisky_C2P_failed
+  CCTK_INT count, i, handle, GRHydro_reflevel, GRHydro_C2P_failed
   CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, &
        w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin
   character(len=200) warnline
@@ -359,8 +359,8 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, &
       pold = sqrt(s2 + c2p_reset_pressure_to_value) - utau - udens
     else 
       !$OMP CRITICAL
-      call CCTK_WARN(Whisky_NaN_verbose, "c2p failed and being told not to reset the pressure")
-      whisky_C2P_failed = 1
+      call CCTK_WARN(GRHydro_NaN_verbose, "c2p failed and being told not to reset the pressure")
+      GRHydro_C2P_failed = 1
       !$OMP END CRITICAL
     endif
     
@@ -379,7 +379,7 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, &
   if (rho .ne. rho) then
     !$OMP CRITICAL
     write(warnline,'(a70,7g15.6)') 'NaN produced in sqrt(): (utau, pold, udens, s2, x, y, z)', utau, pold, udens, s2, x, y, z
-    call CCTK_WARN(Whisky_NaN_verbose, warnline)
+    call CCTK_WARN(GRHydro_NaN_verbose, warnline)
     !$OMP END CRITICAL
   endif
 !!$ END: Check for NaN value (1st check)
@@ -392,17 +392,17 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, &
   
   count = 0
   pnew = pold
-  do while ( ((abs(pnew - pold)/abs(pnew) .gt. whisky_perc_ptol) .and. &
-       (abs(pnew - pold) .gt. whisky_del_ptol))  .or. &
-       (count .lt. whisky_countmin))
+  do while ( ((abs(pnew - pold)/abs(pnew) .gt. GRHydro_perc_ptol) .and. &
+       (abs(pnew - pold) .gt. GRHydro_del_ptol))  .or. &
+       (count .lt. GRHydro_countmin))
     count = count + 1
 
-    if (count > whisky_countmax) then
-      whisky_C2P_failed = 1
+    if (count > GRHydro_countmax) then
+      GRHydro_C2P_failed = 1
 
       !$OMP CRITICAL
-      call CCTK_WARN(1, 'count > Whisky_countmax! ')
-      write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+      call CCTK_WARN(1, 'count > GRHydro_countmax! ')
+      write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
       call CCTK_WARN(1,warnline)
       write(warnline,'(a20,3g16.7)') 'xyz location: ',x,y,z
       call CCTK_WARN(1,warnline)
@@ -412,7 +412,7 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, &
       !$OMP END CRITICAL
 
       ! for safety, let's set the point to atmosphere
-      rho = whisky_rho_min
+      rho = GRHydro_rho_min
       udens = rho
       dens = sqrt(det) * rho
       pnew = pmin
@@ -455,7 +455,7 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, &
     if (rho .ne. rho) then      
       !$OMP CRITICAL
       write(warnline,'(a20,g20.7)') 'rho is NaN: ',rho
-      call CCTK_WARN(Whisky_NaN_verbose,warnline)
+      call CCTK_WARN(GRHydro_NaN_verbose,warnline)
       !$OMP END CRITICAL
       goto 51
     end if
@@ -464,7 +464,7 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, &
   
 !!$  Polish the root
 
-  do i=1,whisky_polish
+  do i=1,GRHydro_polish
 
     dpressbydrho = EOS_DPressByDRho(handle,rho,epsilon)
     dpressbydeps = EOS_DPressByDEps(handle,rho,epsilon)
@@ -492,15 +492,15 @@ subroutine Con2Prim_pt(handle, dens, sx, sy, sz, tau, rho, velx, vely, &
   if (rho .ne. rho) then
     !$OMP CRITICAL
     write(warnline,'(a70,7g15.6)') 'NaN produced in sqrt(): (utau, pold, udens, s2, x, y, z)', utau, pold, udens, s2, x, y, z
-    call CCTK_WARN(Whisky_NaN_verbose, warnline)
+    call CCTK_WARN(GRHydro_NaN_verbose, warnline)
     !$OMP END CRITICAL
   endif
 !!$ END: Check for NaN value (2nd check)
  
 !!$  Calculate primitive variables from root
 
-  if (rho .le. whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) then
-    rho = whisky_rho_min
+  if (rho .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then
+    rho = GRHydro_rho_min
     udens = rho
     dens = sqrt(det) * rho
 !    epsilon = (sqrt( (utau + pnew + udens)**2) - pnew -  udens)/udens
@@ -536,7 +536,7 @@ end subroutine Con2Prim_pt
  /*@@
    @routine    Conservative2PrimitiveBoundaries
    @date       Tue Mar 12 18:04:40 2002
-   @author     The Whisky Developers    
+   @author     The GRHydro Developers    
    @desc 
         This routine is used only if the reconstruction is performed on the conserved variables. 
         It computes the primitive variables on cell boundaries.
@@ -581,8 +581,8 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS)
 #endif
 #include "EOS_Base.inc"
 
-  pmin=EOS_Pressure(whisky_polytrope_handle, whisky_rho_min, 1.0d0) 
-  epsmin = EOS_SpecificIntEnergy(whisky_polytrope_handle, whisky_rho_min, pmin)
+  pmin=EOS_Pressure(GRHydro_polytrope_handle, GRHydro_rho_min, 1.0d0) 
+  epsmin = EOS_SpecificIntEnergy(GRHydro_polytrope_handle, GRHydro_rho_min, pmin)
                                                                               
   call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere")
   call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere", "in_atmosphere")
@@ -598,13 +598,13 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS)
     local_min_tracer = 0d0
   end if
   
-  do k = whisky_stencil, nz - whisky_stencil + 1
-    do j = whisky_stencil, ny - whisky_stencil + 1
-      do i = whisky_stencil, nx - whisky_stencil + 1
+  do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+    do j = GRHydro_stencil, ny - GRHydro_stencil + 1
+      do i = GRHydro_stencil, nx - GRHydro_stencil + 1
 
         !do not compute if in atmosphere or in an excised region
         if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
-            whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
+            GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
          
         gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset))
         gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset))
@@ -658,7 +658,7 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS)
 
         endif
 
-        call Con2Prim_pt(whisky_eos_handle, densminus(i,j,k),&
+        call Con2Prim_pt(GRHydro_eos_handle, densminus(i,j,k),&
              sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k),&
              tauminus(i,j,k),rhominus(i,j,k),velxminus(i,j,k),&
              velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),&
@@ -667,12 +667,12 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS)
              x(i,j,k)-0.5d0*CCTK_DELTA_SPACE(1),&
              y(i,j,k)-0.5d0*CCTK_DELTA_SPACE(2), &
              z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),&
-             epsnegative,whisky_rho_min,pmin, epsmin, whisky_reflevel, whisky_C2P_failed(i,j,k))
+             epsnegative,GRHydro_rho_min,pmin, epsmin, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k))
         if (epsnegative) then
           !$OMP CRITICAL
-          call CCTK_WARN(Whisky_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype!')
+          call CCTK_WARN(GRHydro_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype!')
           !$OMP END CRITICAL
-          call Con2Prim_ptPolytype(whisky_polytrope_handle, densminus(i,j,k),&
+          call Con2Prim_ptPolytype(GRHydro_polytrope_handle, densminus(i,j,k),&
                sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k),&
                tauminus(i,j,k),rhominus(i,j,k),velxminus(i,j,k),&
                velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),&
@@ -680,15 +680,15 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS)
                uxxl,uxyl,uxzl,uyyl,uyzl,uzzl,avg_detl,&
                x(i,j,k)-0.5d0*CCTK_DELTA_SPACE(1),&
                y(i,j,k)-0.5d0*CCTK_DELTA_SPACE(2), &
-               z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k))
+               z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k))
         end if
 
         if (epsminus(i,j,k) .lt. 0.0d0) then
-          if (whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then
+          if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then
             !$OMP CRITICAL
             call CCTK_WARN(1,'Con2Prim: stopping the code.')
             call CCTK_WARN(1, '   specific internal energy just went below 0! ')
-            write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+            write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
             call CCTK_WARN(1,warnline)
             write(warnline,'(a20,3g16.7)') 'xyz location: ',&
                  x(i,j,k),y(i,j,k),z(i,j,k)
@@ -698,14 +698,14 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS)
             write(warnline,'(a20,3g16.7)') 'velocities: ',&
                  velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k)
             call CCTK_WARN(1,warnline)
-            call CCTK_WARN(whisky_c2p_warnlevel, "Specific internal energy negative")
+            call CCTK_WARN(GRHydro_c2p_warnlevel, "Specific internal energy negative")
             !$OMP END CRITICAL
             exit
           endif
         endif
 
         epsnegative = .false.
-        call Con2Prim_pt(whisky_eos_handle, densplus(i,j,k),&
+        call Con2Prim_pt(GRHydro_eos_handle, densplus(i,j,k),&
              sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k),&
              tauplus(i,j,k),rhoplus(i,j,k),velxplus(i,j,k),&
              velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),&
@@ -714,12 +714,12 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS)
              x(i,j,k)+0.5d0*CCTK_DELTA_SPACE(1),&
              y(i,j,k)+0.5d0*CCTK_DELTA_SPACE(2), &
              z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),&
-             epsnegative,whisky_rho_min,pmin, epsmin, whisky_reflevel,whisky_C2P_failed(i,j,k))
+             epsnegative,GRHydro_rho_min,pmin, epsmin, GRHydro_reflevel,GRHydro_C2P_failed(i,j,k))
         if (epsnegative) then
           !$OMP CRITICAL
-          call CCTK_WARN(Whisky_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype!!')
+          call CCTK_WARN(GRHydro_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype!!')
           !$OMP END CRITICAL
-          call Con2Prim_ptPolytype(whisky_polytrope_handle, densplus(i,j,k),&
+          call Con2Prim_ptPolytype(GRHydro_polytrope_handle, densplus(i,j,k),&
                sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k),&
                tauplus(i,j,k),rhoplus(i,j,k),velxplus(i,j,k),&
                velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),&
@@ -727,15 +727,15 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS)
                uxxr,uxyr,uxzr,uyyr,uyzr,uzzr,avg_detr,&
                x(i,j,k)+0.5d0*CCTK_DELTA_SPACE(1),&
                y(i,j,k)+0.5d0*CCTK_DELTA_SPACE(2), &
-               z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k))
+               z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k))
         end if
 
         if (epsplus(i,j,k) .lt. 0.0d0) then
-          if (whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then
+          if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then
             !$OMP CRITICAL
             call CCTK_WARN(1,'Con2Prim: stopping the code.')
             call CCTK_WARN(1, '   specific internal energy just went below 0! ')
-            write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+            write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
             call CCTK_WARN(1,warnline)
             write(warnline,'(a20,3g16.7)') 'xyz location: ',&
                  x(i,j,k),y(i,j,k),z(i,j,k)
@@ -745,7 +745,7 @@ subroutine Conservative2PrimitiveBounds(CCTK_ARGUMENTS)
             write(warnline,'(a20,3g16.7)') 'velocities: ',&
                  velxplus(i,j,k),velyplus(i,j,k),velzplus(i,j,k)
             call CCTK_WARN(1,warnline)
-            call CCTK_WARN(whisky_c2p_warnlevel, "Specific internal energy negative")
+            call CCTK_WARN(GRHydro_c2p_warnlevel, "Specific internal energy negative")
             write(warnline,'(a25,4g15.6)') 'coordinates: x,y,z,r:',&
                  x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k)
             call CCTK_WARN(1,warnline)
@@ -807,9 +807,9 @@ subroutine Conservative2PrimitivePolytype(CCTK_ARGUMENTS)
     local_min_tracer = 0d0
   end if
 
-!!$  do k = whisky_stencil + 1, nz - whisky_stencil
-!!$    do j = whisky_stencil + 1, ny - whisky_stencil
-!!$      do i = whisky_stencil + 1, nx - whisky_stencil
+!!$  do k = GRHydro_stencil + 1, nz - GRHydro_stencil
+!!$    do j = GRHydro_stencil + 1, ny - GRHydro_stencil
+!!$      do i = GRHydro_stencil + 1, nx - GRHydro_stencil
   !$OMP PARALLEL DO PRIVATE(i,j,itracer,&
   !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, psi4pt)
   do k = 1, nz
@@ -818,7 +818,7 @@ subroutine Conservative2PrimitivePolytype(CCTK_ARGUMENTS)
 
         !do not compute if in atmosphere or in an excised region
         if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
-            whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
+            GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
 
         if (conformal_state .eq. 0) then
           call SpatialDeterminant(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),&
@@ -850,12 +850,12 @@ subroutine Conservative2PrimitivePolytype(CCTK_ARGUMENTS)
 
         endif
 
-        call Con2Prim_ptPolytype(whisky_eos_handle, dens(i,j,k),&
+        call Con2Prim_ptPolytype(GRHydro_eos_handle, dens(i,j,k),&
              scon(i,j,k,1),scon(i,j,k,2), &
              scon(i,j,k,3),tau(i,j,k),rho(i,j,k),vel(i,j,k,1),vel(i,j,k,2), &
              vel(i,j,k,3),eps(i,j,k),press(i,j,k),w_lorentz(i,j,k), &
              uxx,uxy,uxz,uyy,uyz,uzz,det,x(i,j,k),y(i,j,k), &
-             z(i,j,k),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k))
+             z(i,j,k),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k))
                 
       end do
     end do
@@ -871,7 +871,7 @@ end subroutine Conservative2PrimitivePolytype
 /*@@
 @routine    Con2Prim_ptPolytype
 @date       Sat Jan 26 01:09:39 2002
-@author     The Whisky Developers   
+@author     The GRHydro Developers   
 @desc 
 Given all the appropriate data, recover the primitive variables at
 a single point.
@@ -886,7 +886,7 @@ a single point.
 
 subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
      velx, vely, velz, epsilon, press, w_lorentz, uxx, uxy, uxz, uyy, &
-     uyz, uzz, det, x, y, z, r, whisky_rho_min, whisky_reflevel, whisky_C2P_failed)
+     uyz, uzz, det, x, y, z, r, GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed)
   
   implicit none
   
@@ -894,12 +894,12 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
 
   CCTK_REAL dens, sx, sy, sz, tau, rho, velx, vely, velz, epsilon, &
        press, uxx, uxy, uxz, uyy, uyz, uzz, det, w_lorentz, x, &
-       y, z, r, whisky_rho_min
+       y, z, r, GRHydro_rho_min
   
   CCTK_REAL s2, f, df, vlowx, vlowy, vlowz
-  CCTK_INT count, handle, whisky_reflevel
+  CCTK_INT count, handle, GRHydro_reflevel
   CCTK_REAL udens, usx, usy, usz, rhoold, rhonew, epsold, epsnew, &
-       enthalpy, denthalpy, sqrtdet, invsqrtdet, invfac, whisky_C2P_failed
+       enthalpy, denthalpy, sqrtdet, invsqrtdet, invfac, GRHydro_C2P_failed
   character(len=200) warnline
 
 #ifdef _EOS_BASE_INC_
@@ -920,7 +920,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
 
 !!$  Set initial guess for rho:
 
-  rhoold = max(whisky_rho_min,rho)
+  rhoold = max(GRHydro_rho_min,rho)
   enthalpy = 1.d0 + EOS_SpecificIntEnergy(handle, rhoold, press) + &
        EOS_Pressure(handle, rhoold, epsilon) / rhoold
   w_lorentz = sqrt(1.d0 + s2 / ( (udens*enthalpy)**2 ))
@@ -929,7 +929,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
   if (w_lorentz .ne. w_lorentz) then
     !$OMP CRITICAL
     write(warnline,'(a70,8g15.6)') 'NaN produced in sqrt(): (dens, det, s2, udens, enthalpy, x, y, z)', dens, det, s2, udens, enthalpy, x, y, z
-    call CCTK_WARN(Whisky_NaN_verbose, warnline)
+    call CCTK_WARN(GRHydro_NaN_verbose, warnline)
     !$OMP END CRITICAL
   endif
 !!$ END: Check for NaN value (1st check)
@@ -945,17 +945,17 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
   count = 0
   rhonew = rhoold
 
-  do while ( ((abs(rhonew - rhoold)/abs(rhonew) .gt. whisky_perc_ptol) .and. &
-       (abs(rhonew - rhoold) .gt. whisky_del_ptol))  .or. &
-       (count .lt. whisky_countmin))
+  do while ( ((abs(rhonew - rhoold)/abs(rhonew) .gt. GRHydro_perc_ptol) .and. &
+       (abs(rhonew - rhoold) .gt. GRHydro_del_ptol))  .or. &
+       (count .lt. GRHydro_countmin))
     count = count + 1
 
-    if (count > whisky_countmax) then
-      whisky_C2P_failed = 1
+    if (count > GRHydro_countmax) then
+      GRHydro_C2P_failed = 1
 
       !$OMP CRITICAL
-      call CCTK_WARN(1, 'count > Whisky_countmax! ')
-      write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+      call CCTK_WARN(1, 'count > GRHydro_countmax! ')
+      write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
       call CCTK_WARN(1,warnline)
       write(warnline,'(a20,3g16.7)') 'xyz location: ',x,y,z
       call CCTK_WARN(1,warnline)
@@ -965,7 +965,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
       !$OMP END CRITICAL
 
       ! for safety, let's set the point to atmosphere
-      rhonew = whisky_rho_min
+      rhonew = GRHydro_rho_min
       udens = rhonew
       dens = sqrtdet * rhonew
       press = EOS_Pressure(handle, rhonew, 1.d0)
@@ -995,12 +995,12 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
 
     if (rhonew .lt. 0.d0) then
 #if 0
-      whisky_C2P_failed = 1
+      GRHydro_C2P_failed = 1
       !$OMP CRITICAL
-      call CCTK_WARN(Whisky_NaN_verbose, 'rhonew went below 0')
+      call CCTK_WARN(GRHydro_NaN_verbose, 'rhonew went below 0')
       !$OMP END CRITICAL
 #else
-      rhonew = whisky_rho_min/100;
+      rhonew = GRHydro_rho_min/100;
 #endif
     end if
     
@@ -1019,8 +1019,8 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
 
 !!$  Calculate primitive variables from root
 
-  if (rhonew .le. whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) then
-    rhonew = whisky_rho_min
+  if (rhonew .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then
+    rhonew = GRHydro_rho_min
     udens = rhonew
     ! before 2009/10/07 dens was not reset and was used with its negative value below; this has since been changed, but the change produces significant changes in the results
     dens = sqrtdet * rhonew
@@ -1048,7 +1048,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
   if (w_lorentz .ne. w_lorentz) then
     !$OMP CRITICAL
     write(warnline,'(a70,6g15.6)') 'NaN produced in sqrt(): (s2, udens, enthalpy, x, y, z)', s2, udens, enthalpy, x, y, z
-    call CCTK_WARN(Whisky_NaN_verbose, warnline)
+    call CCTK_WARN(GRHydro_NaN_verbose, warnline)
     !$OMP END CRITICAL
   endif
 !!$ END: Check for NaN value (2nd check)
@@ -1058,11 +1058,11 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
   tau = sqrtdet * ((rho * enthalpy) * w_lorentz**2 - press) - dens
 
   if (epsilon .lt. 0.0d0) then
-    whisky_C2P_failed = 1
+    GRHydro_C2P_failed = 1
 
     !$OMP CRITICAL
     call CCTK_WARN(1, 'epsilon < 0! ')
-    write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+    write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
     call CCTK_WARN(1,warnline)
     write(warnline,'(a20,3g16.7)') 'xyz location: ',x,y,z
     call CCTK_WARN(1,warnline)
@@ -1071,7 +1071,7 @@ subroutine Con2Prim_ptPolytype(handle, dens, sx, sy, sz, tau, rho, &
     call CCTK_WARN(1,"Setting the point to atmosphere")
     !$OMP END CRITICAL
     
-    rho = whisky_rho_min
+    rho = GRHydro_rho_min
     dens = sqrtdet * rho
     press = EOS_Pressure(handle, rhonew, 1.d0)
     epsilon = EOS_SpecificIntEnergy(handle, rhonew, press)
@@ -1100,7 +1100,7 @@ end subroutine Con2Prim_ptPolytype
  /*@@
    @routine    Cons2PrimBoundsPolytype
    @date       Tue Mar 12 18:04:40 2002
-   @author     The Whisky Developers
+   @author     The GRHydro Developers
    @desc 
         This routine is used only if the reconstruction is performed on the conserved variables. 
         It computes the primitive variables on cell boundaries.
@@ -1140,13 +1140,13 @@ subroutine Con2PrimBoundsPolytype(CCTK_ARGUMENTS)
   ny = cctk_lsh(2)
   nz = cctk_lsh(3)
 
-  do k = whisky_stencil, nz - whisky_stencil + 1
-    do j = whisky_stencil, ny - whisky_stencil + 1
-      do i = whisky_stencil, nx - whisky_stencil + 1
+  do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+    do j = GRHydro_stencil, ny - GRHydro_stencil + 1
+      do i = GRHydro_stencil, nx - GRHydro_stencil + 1
         
         !do not compute if in atmosphere or in an excised region
         if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
-            whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
+            GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
         
         gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset))
         gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset))
@@ -1184,7 +1184,7 @@ subroutine Con2PrimBoundsPolytype(CCTK_ARGUMENTS)
                psi4r*gzzr)        
         end if
 
-        call Con2Prim_ptPolytype(whisky_eos_handle, densminus(i,j,k),&
+        call Con2Prim_ptPolytype(GRHydro_eos_handle, densminus(i,j,k),&
              sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k),&
              tauminus(i,j,k),rhominus(i,j,k),velxminus(i,j,k),&
              velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),&
@@ -1192,8 +1192,8 @@ subroutine Con2PrimBoundsPolytype(CCTK_ARGUMENTS)
              uxxl,uxyl,uxzl,uyyl,uyzl,uzzl,avg_detl,&
              x(i,j,k)-0.5d0*CCTK_DELTA_SPACE(1),&
              y(i,j,k)-0.5d0*CCTK_DELTA_SPACE(2), &
-             z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k))
-        call Con2Prim_ptPolytype(whisky_eos_handle, densplus(i,j,k),&
+             z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k))
+        call Con2Prim_ptPolytype(GRHydro_eos_handle, densplus(i,j,k),&
              sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k),&
              tauplus(i,j,k),rhoplus(i,j,k),velxplus(i,j,k),&
              velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),&
@@ -1201,7 +1201,7 @@ subroutine Con2PrimBoundsPolytype(CCTK_ARGUMENTS)
              uxxr,uxyr,uxzr,uyyr,uyzr,uzzr,avg_detr,&
              x(i,j,k)+0.5d0*CCTK_DELTA_SPACE(1),&
              y(i,j,k)+0.5d0*CCTK_DELTA_SPACE(2), &
-             z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),whisky_rho_min, whisky_reflevel, whisky_C2P_failed(i,j,k))
+             z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k))
         
       end do
     end do
@@ -1242,9 +1242,9 @@ subroutine Con2PrimBoundsTracer(CCTK_ARGUMENTS)
   ny = cctk_lsh(2)
   nz = cctk_lsh(3)
   
-  do k = whisky_stencil, nz - whisky_stencil + 1
-    do j = whisky_stencil, ny - whisky_stencil + 1
-      do i = whisky_stencil, nx - whisky_stencil + 1
+  do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+    do j = GRHydro_stencil, ny - GRHydro_stencil + 1
+      do i = GRHydro_stencil, nx - GRHydro_stencil + 1
         
         gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset))
         gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset))
@@ -1404,7 +1404,7 @@ end subroutine Con2Prim_ptBoundsTracer
 
 subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
   
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
   
@@ -1482,43 +1482,43 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
           enddo
         endif
 
-        if ( (dens(i,j,k).le.sqrt(Whisky_Det(i,j,k)) * &
-             whisky_rho_min*(1.0d0+whisky_atmo_tolerance)) &
+        if ( (dens(i,j,k).le.sqrt(GRHydro_Det(i,j,k)) * &
+             GRHydro_rho_min*(1.0d0+GRHydro_atmo_tolerance)) &
              .or.(tau(i,j,k) .le. 0d0)) then
 
-           rho(i,j,k) = whisky_rho_min
-           dens(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k)
+           rho(i,j,k) = GRHydro_rho_min
+           dens(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k)
            scon(i,j,k,:) = 0.d0
            w_lorentz(i,j,k) = 1.d0
            press(i,j,k) = 0.1d0 * eosgeneral_pmin
 !           eps(i,j,k) = press(i,j,k) / rho(i,j,k) ! Note that this should be improved
            eps(i,j,k) = 1.0e-12
-           tau(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k) * eps(i,j,k)
+           tau(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k) * eps(i,j,k)
 
            SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits, atmosphere)
            atmosphere_mask(i,j,k) = 1
 
         end if
         
-        udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k))
-        usx = scon(i,j,k,1) / sqrt(Whisky_det(i,j,k))
-        usy = scon(i,j,k,2) / sqrt(Whisky_det(i,j,k))
-        usz = scon(i,j,k,3) / sqrt(Whisky_det(i,j,k))
-        utau = tau(i,j,k) / sqrt(Whisky_det(i,j,k))
-        s2 = usx*usx*Whisky_uxx(i,j,k) + &
-             usy*usy*Whisky_uyy(i,j,k) + &
-             usz*usz*Whisky_uzz(i,j,k) + &
-             2.d0*usx*usy*Whisky_uxy(i,j,k) + &
-             2.d0*usx*usz*Whisky_uxz(i,j,k) + &
-             2.d0*usy*usz*Whisky_uyz(i,j,k)
+        udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k))
+        usx = scon(i,j,k,1) / sqrt(GRHydro_det(i,j,k))
+        usy = scon(i,j,k,2) / sqrt(GRHydro_det(i,j,k))
+        usz = scon(i,j,k,3) / sqrt(GRHydro_det(i,j,k))
+        utau = tau(i,j,k) / sqrt(GRHydro_det(i,j,k))
+        s2 = usx*usx*GRHydro_uxx(i,j,k) + &
+             usy*usy*GRHydro_uyy(i,j,k) + &
+             usz*usz*GRHydro_uzz(i,j,k) + &
+             2.d0*usx*usy*GRHydro_uxy(i,j,k) + &
+             2.d0*usx*usz*GRHydro_uxz(i,j,k) + &
+             2.d0*usy*usz*GRHydro_uyz(i,j,k)
 
 !!$ Check that the variables have a chance of being physical
   
         if( (utau + press_old(i,j,k) + udens)**2 - s2 .le. 0.0d0) then
-          if(whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then
+          if(GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then
             !$OMP CRITICAL
             call CCTK_WARN(1,'Con2PrimGeneral: variables unphysical!')
-            write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+            write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
             call CCTK_WARN(1,warnline)
             write(warnline,'(a25,g15.6)') 'undensitized energy: ',utau
             call CCTK_WARN(1,warnline)
@@ -1528,17 +1528,17 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
             call CCTK_WARN(1,warnline)
             write(warnline,'(a25,g15.6)') 'pressure guess: ',press_old(i,j,k)
             call CCTK_WARN(1,warnline)
-            write(warnline,'(a25,i4)') 'refinement level: ',whisky_reflevel
+            write(warnline,'(a25,i4)') 'refinement level: ',GRHydro_reflevel
             call CCTK_WARN(1,warnline)
             write(warnline,'(a25,4g15.6)') 'coordinates: x,y,z,r:',&
                  x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k)
             call CCTK_WARN(1,warnline)
-            call CCTK_WARN(whisky_c2p_warnlevel, "Unphysical variables")
+            call CCTK_WARN(GRHydro_c2p_warnlevel, "Unphysical variables")
             !$OMP END CRITICAL
             exit
           else
             !$OMP CRITICAL
-            write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',whisky_reflevel
+            write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',GRHydro_reflevel
             call CCTK_WARN(1,warnline)
             write(warnline,'(a25,4g15.6)') 'coordinates: x,y,z,r:',&
                  x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k)
@@ -1567,15 +1567,15 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
   ierr = EOS_SetGFs(cctkGH, EOS_Con2PrimCall)
   where (press .le. eosgeneral_pmin)
     press = eosgeneral_pmin
-    rho = whisky_rho_min
-    dens = sqrt(Whisky_det) * rho
+    rho = GRHydro_rho_min
+    dens = sqrt(GRHydro_det) * rho
     scon(:,:,:,1) = 0.d0
     scon(:,:,:,2) = 0.d0
     scon(:,:,:,3) = 0.d0
     w_lorentz = 1d0
 !    eps = press / rho
     eps = 1.0e-12
-    tau = sqrt(Whisky_det) * rho * eps
+    tau = sqrt(GRHydro_det) * rho * eps
   end where
   f = press_old - press
   press_new = press_old
@@ -1584,14 +1584,14 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
 
     count = count + 1
 
-    if (count > whisky_countmax) then
-       if(whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then
+    if (count > GRHydro_countmax) then
+       if(GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then
           !$OMP CRITICAL
           call CCTK_WARN(1, 'Con2PrimGeneral: error: did not converge in ')
           write(warnline,'(a20,i12,a10)') '              ',&
-               whisky_countmax,' steps'
+               GRHydro_countmax,' steps'
           call CCTK_WARN(1,warnline)
-          write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+          write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
           call CCTK_WARN(1,warnline)
           maxerr =  maxval(abs(press_new - press_old) & 
                / abs(press_new))
@@ -1616,7 +1616,7 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
        else
          !$OMP CRITICAL
          write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',&
-              whisky_reflevel
+              GRHydro_reflevel
          call CCTK_WARN(1,warnline)
          !$OMP END CRITICAL
          exit
@@ -1629,7 +1629,7 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
 
           !do not compute if in atmosphere or in an excised region
           if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
-             whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) &
+             GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) &
                then
              press_new(i,j,k) = press(i,j,k)
              press_old(i,j,k) = press(i,j,k)
@@ -1639,29 +1639,29 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
 
           ! All right, is this point already converged?!?
           loop_condition = abs(press_new(i,j,k)-press_old(i,j,k)) / abs(press_new(i,j,k)) > &
-               whisky_perc_ptol
+               GRHydro_perc_ptol
 
           loop_condition = loop_condition .and. &
-               abs(press_new(i,j,k)-press_old(i,j,k)) > whisky_del_ptol
+               abs(press_new(i,j,k)-press_old(i,j,k)) > GRHydro_del_ptol
 
-          loop_condition = loop_condition .or. (count < whisky_countmin) &
+          loop_condition = loop_condition .or. (count < GRHydro_countmin) &
                .or. (count < 2)  ! we have to at least go once through c2p.
 
           point_loop_condition(i,j,k) = loop_condition
 
           if(.not.loop_condition) cycle
 
-          udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k))
-          usx   = scon(i,j,k,1)   / sqrt(Whisky_det(i,j,k))
-          usy   = scon(i,j,k,2)   / sqrt(Whisky_det(i,j,k))
-          usz   = scon(i,j,k,3)   / sqrt(Whisky_det(i,j,k))
-          utau  = tau(i,j,k)  / sqrt(Whisky_det(i,j,k))
-          s2 = usx*usx*Whisky_uxx(i,j,k) + &
-               usy*usy*Whisky_uyy(i,j,k) + &
-               usz*usz*Whisky_uzz(i,j,k) + &
-               2.d0*usx*usy*Whisky_uxy(i,j,k) + &
-               2.d0*usx*usz*Whisky_uxz(i,j,k) + &
-               2.d0*usy*usz*Whisky_uyz(i,j,k)
+          udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k))
+          usx   = scon(i,j,k,1)   / sqrt(GRHydro_det(i,j,k))
+          usy   = scon(i,j,k,2)   / sqrt(GRHydro_det(i,j,k))
+          usz   = scon(i,j,k,3)   / sqrt(GRHydro_det(i,j,k))
+          utau  = tau(i,j,k)  / sqrt(GRHydro_det(i,j,k))
+          s2 = usx*usx*GRHydro_uxx(i,j,k) + &
+               usy*usy*GRHydro_uyy(i,j,k) + &
+               usz*usz*GRHydro_uzz(i,j,k) + &
+               2.d0*usx*usy*GRHydro_uxy(i,j,k) + &
+               2.d0*usx*usz*GRHydro_uxz(i,j,k) + &
+               2.d0*usy*usz*GRHydro_uyz(i,j,k)
           
           temp1 = (utau + udens + press_new(i,j,k))
           temp2 = temp1**2 - s2
@@ -1678,12 +1678,12 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
           press_new(i,j,k) = press_old(i,j,k) - f(i,j,k) / df
           if (press_new(i,j,k) .le. eosgeneral_pmin) then
             press_new(i,j,k) = eosgeneral_pmin
-            rho(i,j,k) = whisky_rho_min
-            dens(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k)
+            rho(i,j,k) = GRHydro_rho_min
+            dens(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k)
             scon(i,j,k,:) = 0.d0
             w_lorentz(i,j,k) = 1d0
             eps(i,j,k) = press(i,j,k) / rho(i,j,k)
-            tau(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k) * eps(i,j,k)
+            tau(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k) * eps(i,j,k)
             udens = rho(i,j,k)
             utau = rho(i,j,k) * eps(i,j,k)
             s2 = 0.d0
@@ -1701,10 +1701,10 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
 
           point_loop_condition(i,j,k) = &
                (abs(press_new(i,j,k) - press_old(i,j,k)) / abs(press_new(i,j,k)) > &
-                      whisky_perc_ptol)
+                      GRHydro_perc_ptol)
           point_loop_condition(i,j,k) = point_loop_condition(i,j,k) .and. &
                (abs(press_new(i,j,k) - press_old(i,j,k))  > &
-                      whisky_del_ptol)          
+                      GRHydro_del_ptol)          
           
          end do
       end do
@@ -1718,14 +1718,14 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
     loop_condition = any(point_loop_condition)
 
     loop_condition = loop_condition .or. &
-         (count < whisky_countmin) 
+         (count < GRHydro_countmin) 
 
    end do
 
   deallocate(point_loop_condition)
 
 
-  do count = 1, whisky_polish
+  do count = 1, GRHydro_polish
 
     do k = 1, nz 
       do j = 1, ny 
@@ -1733,21 +1733,21 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
 
           !do not compute if in atmosphere or in an excised region
           if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
-              whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
+              GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
  
           f = press_new(i,j,k) - press(i,j,k)
 
-          udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k))
-          usx   = scon(i,j,k,1)   / sqrt(Whisky_det(i,j,k))
-          usy   = scon(i,j,k,2)   / sqrt(Whisky_det(i,j,k))
-          usz   = scon(i,j,k,3)   / sqrt(Whisky_det(i,j,k))
-          utau  = tau(i,j,k)  / sqrt(Whisky_det(i,j,k))
-          s2 = usx*usx*Whisky_uxx(i,j,k) + &
-               usy*usy*Whisky_uyy(i,j,k) + &
-               usz*usz*Whisky_uzz(i,j,k) + &
-               2.d0*usx*usy*Whisky_uxy(i,j,k) + &
-               2.d0*usx*usz*Whisky_uxz(i,j,k) + &
-               2.d0*usy*usz*Whisky_uyz(i,j,k)
+          udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k))
+          usx   = scon(i,j,k,1)   / sqrt(GRHydro_det(i,j,k))
+          usy   = scon(i,j,k,2)   / sqrt(GRHydro_det(i,j,k))
+          usz   = scon(i,j,k,3)   / sqrt(GRHydro_det(i,j,k))
+          utau  = tau(i,j,k)  / sqrt(GRHydro_det(i,j,k))
+          s2 = usx*usx*GRHydro_uxx(i,j,k) + &
+               usy*usy*GRHydro_uyy(i,j,k) + &
+               usz*usz*GRHydro_uzz(i,j,k) + &
+               2.d0*usx*usy*GRHydro_uxy(i,j,k) + &
+               2.d0*usx*usz*GRHydro_uxz(i,j,k) + &
+               2.d0*usy*usz*GRHydro_uyz(i,j,k)
 
           temp1 = (utau + udens + press_new(i,j,k))
           temp2 = temp1**2 - s2
@@ -1787,18 +1787,18 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
         
         !do not compute if in atmosphere or in an excised region
         if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
-            whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
+            GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
 
 !!$         Note that in the following we enforce eps > 0
 !!$         This makes the later check redundant
        
-        if ( (rho(i,j,k) .le. whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) .or. &
+        if ( (rho(i,j,k) .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) .or. &
              (eps(i,j,k) .lt. 0d0) ) then
             
-          rho(i,j,k) = whisky_rho_min
+          rho(i,j,k) = GRHydro_rho_min
           udens = rho(i,j,k)
-          utau = tau(i,j,k) / sqrt(Whisky_det(i,j,k))
-          dens(i,j,k) = sqrt(Whisky_det(i,j,k)) * rho(i,j,k)
+          utau = tau(i,j,k) / sqrt(GRHydro_det(i,j,k))
+          dens(i,j,k) = sqrt(GRHydro_det(i,j,k)) * rho(i,j,k)
           eps(i,j,k) = utau / udens
           scon(i,j,k,:) = 0.d0
           w_lorentz(i,j,k) = 1.d0
@@ -1808,11 +1808,11 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
 
         else
 
-          udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k))
-          usx   = scon(i,j,k,1)   / sqrt(Whisky_det(i,j,k))
-          usy   = scon(i,j,k,2)   / sqrt(Whisky_det(i,j,k))
-          usz   = scon(i,j,k,3)   / sqrt(Whisky_det(i,j,k))
-          utau  = tau(i,j,k)  / sqrt(Whisky_det(i,j,k))
+          udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k))
+          usx   = scon(i,j,k,1)   / sqrt(GRHydro_det(i,j,k))
+          usy   = scon(i,j,k,2)   / sqrt(GRHydro_det(i,j,k))
+          usz   = scon(i,j,k,3)   / sqrt(GRHydro_det(i,j,k))
+          utau  = tau(i,j,k)  / sqrt(GRHydro_det(i,j,k))
 
         end if
 
@@ -1825,24 +1825,24 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
         vlowz = usz / &
              ( (rho(i,j,k) + rho(i,j,k) * eps(i,j,k) + press(i,j,k)) * &
                w_lorentz(i,j,k)**2)
-        vel(i,j,k,1) = Whisky_uxx(i,j,k) * vlowx + &
-                       Whisky_uxy(i,j,k) * vlowy + &
-                       Whisky_uxz(i,j,k) * vlowz
-        vel(i,j,k,2) = Whisky_uxy(i,j,k) * vlowx + &
-                       Whisky_uyy(i,j,k) * vlowy + &
-                       Whisky_uyz(i,j,k) * vlowz
-        vel(i,j,k,3) = Whisky_uxz(i,j,k) * vlowx + &
-                       Whisky_uyz(i,j,k) * vlowy + &
-                       Whisky_uzz(i,j,k) * vlowz
+        vel(i,j,k,1) = GRHydro_uxx(i,j,k) * vlowx + &
+                       GRHydro_uxy(i,j,k) * vlowy + &
+                       GRHydro_uxz(i,j,k) * vlowz
+        vel(i,j,k,2) = GRHydro_uxy(i,j,k) * vlowx + &
+                       GRHydro_uyy(i,j,k) * vlowy + &
+                       GRHydro_uyz(i,j,k) * vlowz
+        vel(i,j,k,3) = GRHydro_uxz(i,j,k) * vlowx + &
+                       GRHydro_uyz(i,j,k) * vlowy + &
+                       GRHydro_uzz(i,j,k) * vlowz
   
 !!$  If eps negative then complain vociferously
 
         if (eps(i,j,k) .le. 0.d0) then
-          if(whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then          
+          if(GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then          
             !$OMP CRITICAL
             call CCTK_WARN(1,'Con2PrimGeneral: stopping the code.')
             call CCTK_WARN(1, '   specific internal energy just went below 0! ')
-            write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+            write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
             call CCTK_WARN(1,warnline)
             write(warnline,'(a20,3i6)') 'ijk location: ',&
                  i,j,k
@@ -1850,21 +1850,21 @@ subroutine Conservative2PrimitiveGeneral(CCTK_ARGUMENTS)
             write(warnline,'(a20,1P10E15.6)') 'xyz location: ',&
                  x(i,j,k),y(i,j,k),z(i,j,k)
             call CCTK_WARN(1,warnline)
-            write(warnline,'(a25,i5)') 'refinement level: ',whisky_reflevel
+            write(warnline,'(a25,i5)') 'refinement level: ',GRHydro_reflevel
             call CCTK_WARN(1,warnline)
             write(warnline,'(a20,1P1E15.6)') 'radius: ',r(i,j,k)
             call CCTK_WARN(1,warnline)
             write(warnline,'(a20,1P1E15.6)') 'velocities: ',&
                  vel(i,j,k,1),vel(i,j,k,2),vel(i,j,k,3)
             call CCTK_WARN(1,warnline)
-            call CCTK_WARN(whisky_c2p_warnlevel, \
+            call CCTK_WARN(GRHydro_c2p_warnlevel, \
             "Specific internal energy negative")
             !$OMP END CRITICAL
             exit
           else
             !$OMP CRITICAL
             write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but \
-                        I was told to ignore level: ',whisky_reflevel
+                        I was told to ignore level: ',GRHydro_reflevel
             call CCTK_WARN(1,warnline)
             write(warnline,'(a25,4g15.6)') 'coordinates: x,y,z,r:',&
                  x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k)
@@ -1900,7 +1900,7 @@ end subroutine Conservative2PrimitiveGeneral
 
 subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
   
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
   
@@ -1942,7 +1942,7 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
 !!$  In what follows press_temp is really rho_temp
 
   count = 0
-  press_new = max(whisky_rho_min, rho)
+  press_new = max(GRHydro_rho_min, rho)
 
   loop_condition = .true.
   
@@ -1968,16 +1968,16 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
           enddo
         end if
 
-        udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k))
-        usx   = scon(i,j,k,1)   / sqrt(Whisky_det(i,j,k))
-        usy   = scon(i,j,k,2)   / sqrt(Whisky_det(i,j,k))
-        usz   = scon(i,j,k,3)   / sqrt(Whisky_det(i,j,k))
-        s2 = usx*usx*Whisky_uxx(i,j,k) + &
-             usy*usy*Whisky_uyy(i,j,k) + &
-             usz*usz*Whisky_uzz(i,j,k) + &
-             2.d0*usx*usy*Whisky_uxy(i,j,k) + &
-             2.d0*usx*usz*Whisky_uxz(i,j,k) + &
-             2.d0*usy*usz*Whisky_uyz(i,j,k)
+        udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k))
+        usx   = scon(i,j,k,1)   / sqrt(GRHydro_det(i,j,k))
+        usy   = scon(i,j,k,2)   / sqrt(GRHydro_det(i,j,k))
+        usz   = scon(i,j,k,3)   / sqrt(GRHydro_det(i,j,k))
+        s2 = usx*usx*GRHydro_uxx(i,j,k) + &
+             usy*usy*GRHydro_uyy(i,j,k) + &
+             usz*usz*GRHydro_uzz(i,j,k) + &
+             2.d0*usx*usy*GRHydro_uxy(i,j,k) + &
+             2.d0*usx*usz*GRHydro_uxz(i,j,k) + &
+             2.d0*usy*usz*GRHydro_uyz(i,j,k)
 
         enthalpy = 1.d0 + eps(i,j,k) + press(i,j,k) / press_new(i,j,k)
         w_lorentz(i,j,k) = sqrt( 1.d0 + s2 / ( (udens*enthalpy)**2 ) )
@@ -1990,21 +1990,21 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
 
     count = count + 1
 
-    if (count > whisky_countmax) then 
-      if (whisky_reflevel.ge.whisky_c2p_warn_from_reflevel) then
+    if (count > GRHydro_countmax) then 
+      if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then
         !$OMP CRITICAL
         call CCTK_WARN(1, 'Con2PrimPolytypeGeneral: error: did not converge in ')
         write(warnline,'(a20,g12.7,a10)') '              ',&
-             whisky_countmax,' steps'
+             GRHydro_countmax,' steps'
         call CCTK_WARN(1,warnline)
-        write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+        write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
         call CCTK_WARN(1,warnline)
-        call CCTK_WARN(whisky_c2p_warnlevel, "Did not converge")
+        call CCTK_WARN(GRHydro_c2p_warnlevel, "Did not converge")
         !$OMP END CRITICAL
         exit
       else 
         !$OMP CRITICAL
-        write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',whisky_reflevel
+        write(warnline,'(a60,i2)') 'Con2Prim: eps negative, but I was told to ignore level: ',GRHydro_reflevel
         call CCTK_WARN(1,warnline)
         !$OMP END CRITICAL
         exit
@@ -2017,24 +2017,24 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
 
           !do not compute if in atmosphere or in an excised region
           if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
-              whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
+              GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
 
           enthalpy = 1.d0 + eps(i,j,k) + press(i,j,k) / press_new(i,j,k)
 
-          tau(i,j,k) = sqrt(Whisky_det(i,j,k)) * &
+          tau(i,j,k) = sqrt(GRHydro_det(i,j,k)) * &
                ( press_new(i,j,k) * enthalpy * w_lorentz(i,j,k)**2 - &
                  press(i,j,k) ) - dens(i,j,k)
 
-          udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k))
-          usx   = scon(i,j,k,1)   / sqrt(Whisky_det(i,j,k))
-          usy   = scon(i,j,k,2)   / sqrt(Whisky_det(i,j,k))
-          usz   = scon(i,j,k,3)   / sqrt(Whisky_det(i,j,k))
-          s2 = usx*usx*Whisky_uxx(i,j,k) + &
-               usy*usy*Whisky_uyy(i,j,k) + &
-               usz*usz*Whisky_uzz(i,j,k) + &
-               2.d0*usx*usy*Whisky_uxy(i,j,k) + &
-               2.d0*usx*usz*Whisky_uxz(i,j,k) + &
-               2.d0*usy*usz*Whisky_uyz(i,j,k)
+          udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k))
+          usx   = scon(i,j,k,1)   / sqrt(GRHydro_det(i,j,k))
+          usy   = scon(i,j,k,2)   / sqrt(GRHydro_det(i,j,k))
+          usz   = scon(i,j,k,3)   / sqrt(GRHydro_det(i,j,k))
+          s2 = usx*usx*GRHydro_uxx(i,j,k) + &
+               usy*usy*GRHydro_uyy(i,j,k) + &
+               usz*usz*GRHydro_uzz(i,j,k) + &
+               2.d0*usx*usy*GRHydro_uxy(i,j,k) + &
+               2.d0*usx*usz*GRHydro_uxz(i,j,k) + &
+               2.d0*usy*usz*GRHydro_uyz(i,j,k)
 
           f = press_new(i,j,k) * w_lorentz(i,j,k) - udens
 
@@ -2044,7 +2044,7 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
                ( w_lorentz(i,j,k) * (udens**2) * (enthalpy**3) )
 
           rho(i,j,k) = press_new(i,j,k)
-          press_new(i,j,k) = max(press_new(i,j,k) - f / df, whisky_rho_min)
+          press_new(i,j,k) = max(press_new(i,j,k) - f / df, GRHydro_rho_min)
 
           enthalpy = 1.d0 + eps(i,j,k) + press(i,j,k) / press_new(i,j,k)
           w_lorentz(i,j,k) = sqrt( 1.d0 + s2 / ( (udens*enthalpy)**2 ) )
@@ -2056,11 +2056,11 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
     ierr = EOS_SetGFs(cctkGH, EOS_Con2PrimCall)
 
     loop_condition = (maxval(abs(rho - press_new) / abs(press_new)) > &
-                      whisky_perc_ptol)
+                      GRHydro_perc_ptol)
     loop_condition = loop_condition .and. &
-         (maxval(abs(rho - press_new)) > whisky_del_ptol)
+         (maxval(abs(rho - press_new)) > GRHydro_del_ptol)
     loop_condition = loop_condition .or. &
-         (count < whisky_countmin) 
+         (count < GRHydro_countmin) 
   
   end do  
   
@@ -2070,13 +2070,13 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
 
         !do not compute if in atmosphere or in an excised region
         if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. &
-            whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
+            GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle
  
-        udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k))
+        udens = dens(i,j,k) / sqrt(GRHydro_det(i,j,k))
 
-        if (rho(i,j,k) .le. whisky_rho_min*(1.d0+whisky_atmo_tolerance) ) then        
+        if (rho(i,j,k) .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then        
 
-          rho(i,j,k) = whisky_rho_min
+          rho(i,j,k) = GRHydro_rho_min
           scon(i,j,k,:) = 0.d0
           w_lorentz(i,j,k) = 1.d0
           usx = 0.d0
@@ -2086,21 +2086,21 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
           
         else
           
-          usx   = scon(i,j,k,1)   / sqrt(Whisky_det(i,j,k))
-          usy   = scon(i,j,k,2)   / sqrt(Whisky_det(i,j,k))
-          usz   = scon(i,j,k,3)   / sqrt(Whisky_det(i,j,k))
-          s2 = usx*usx*Whisky_uxx(i,j,k) + &
-               usy*usy*Whisky_uyy(i,j,k) + &
-               usz*usz*Whisky_uzz(i,j,k) + &
-               2.d0*usx*usy*Whisky_uxy(i,j,k) + &
-               2.d0*usx*usz*Whisky_uxz(i,j,k) + &
-               2.d0*usy*usz*Whisky_uyz(i,j,k)
+          usx   = scon(i,j,k,1)   / sqrt(GRHydro_det(i,j,k))
+          usy   = scon(i,j,k,2)   / sqrt(GRHydro_det(i,j,k))
+          usz   = scon(i,j,k,3)   / sqrt(GRHydro_det(i,j,k))
+          s2 = usx*usx*GRHydro_uxx(i,j,k) + &
+               usy*usy*GRHydro_uyy(i,j,k) + &
+               usz*usz*GRHydro_uzz(i,j,k) + &
+               2.d0*usx*usy*GRHydro_uxy(i,j,k) + &
+               2.d0*usx*usz*GRHydro_uxz(i,j,k) + &
+               2.d0*usy*usz*GRHydro_uyz(i,j,k)
           
         end if
         
         enthalpy = 1.d0 + eps(i,j,k) + press(i,j,k) / rho(i,j,k)
         w_lorentz(i,j,k) = sqrt( 1.d0 + s2 / ( (udens*enthalpy)**2 ) )
-        tau(i,j,k) = sqrt(Whisky_det(i,j,k)) * &
+        tau(i,j,k) = sqrt(GRHydro_det(i,j,k)) * &
              ( (rho(i,j,k) * enthalpy) * w_lorentz(i,j,k)**2 - &
                 press(i,j,k) ) - dens(i,j,k)
         vlowx = usx / &
@@ -2112,21 +2112,21 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
         vlowz = usz / &
              ( (rho(i,j,k) + rho(i,j,k) * eps(i,j,k) + press(i,j,k)) * &
                w_lorentz(i,j,k)**2)
-        vel(i,j,k,1) = Whisky_uxx(i,j,k) * vlowx + &
-                       Whisky_uxy(i,j,k) * vlowy + &
-                       Whisky_uxz(i,j,k) * vlowz
-        vel(i,j,k,2) = Whisky_uxy(i,j,k) * vlowx + &
-                       Whisky_uyy(i,j,k) * vlowy + &
-                       Whisky_uyz(i,j,k) * vlowz
-        vel(i,j,k,3) = Whisky_uxz(i,j,k) * vlowx + &
-                       Whisky_uyz(i,j,k) * vlowy + &
-                       Whisky_uzz(i,j,k) * vlowz
+        vel(i,j,k,1) = GRHydro_uxx(i,j,k) * vlowx + &
+                       GRHydro_uxy(i,j,k) * vlowy + &
+                       GRHydro_uxz(i,j,k) * vlowz
+        vel(i,j,k,2) = GRHydro_uxy(i,j,k) * vlowx + &
+                       GRHydro_uyy(i,j,k) * vlowy + &
+                       GRHydro_uyz(i,j,k) * vlowz
+        vel(i,j,k,3) = GRHydro_uxz(i,j,k) * vlowx + &
+                       GRHydro_uyz(i,j,k) * vlowy + &
+                       GRHydro_uzz(i,j,k) * vlowz
   
 !!$  If eps negative then complain vociferously
 
         if (eps(i,j,k) .lt. 0.0d0) then
           call CCTK_WARN(1, "c2p failed: eps went negative")
-          whisky_C2P_failed(i,j,k) = 1
+          GRHydro_C2P_failed(i,j,k) = 1
         endif
 
       end do
@@ -2136,31 +2136,31 @@ subroutine Con2PrimPolytypeGeneral(CCTK_ARGUMENTS)
 end subroutine Con2PrimPolytypeGeneral
 
 ! subroutines to manage the C2P failure mask
-subroutine reset_whisky_C2P_failed(CCTK_ARGUMENTS)
+subroutine reset_GRHydro_C2P_failed(CCTK_ARGUMENTS)
   
   implicit none
   
   DECLARE_CCTK_ARGUMENTS
 
-  whisky_C2P_failed = 0
+  GRHydro_C2P_failed = 0
 
   return
 
-end subroutine reset_whisky_C2P_failed
+end subroutine reset_GRHydro_C2P_failed
 
 
-subroutine sync_whisky_C2P_failed(CCTK_ARGUMENTS)
-! a dummy routine to syncronise whisky_C2P_failed
+subroutine sync_GRHydro_C2P_failed(CCTK_ARGUMENTS)
+! a dummy routine to syncronise GRHydro_C2P_failed
   implicit none
   
   DECLARE_CCTK_ARGUMENTS
 
   return
 
-end subroutine sync_whisky_C2P_failed
+end subroutine sync_GRHydro_C2P_failed
 
 
-subroutine check_whisky_C2P_failed(CCTK_ARGUMENTS)
+subroutine check_GRHydro_C2P_failed(CCTK_ARGUMENTS)
   
   implicit none
   
@@ -2180,12 +2180,12 @@ subroutine check_whisky_C2P_failed(CCTK_ARGUMENTS)
     do j = 1, ny 
       do i = 1, nx
 
-        if (whisky_C2P_failed(i,j,k) == 1) then
+        if (GRHydro_C2P_failed(i,j,k) == 1) then
 
           !$OMP CRITICAL
           call CCTK_WARN(1,'Con2Prim failed; stopping the code.')
           call CCTK_WARN(1,'Even with mesh refinement, this point is not restricted from a finer level, so this is really an error')
-          write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+          write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
           call CCTK_WARN(1,warnline)
           write(warnline,'(a20,3g16.7)') 'xyz location: ',&
                x(i,j,k),y(i,j,k),z(i,j,k)
@@ -2206,4 +2206,4 @@ subroutine check_whisky_C2P_failed(CCTK_ARGUMENTS)
 
   return
 
-end subroutine check_whisky_C2P_failed
+end subroutine check_GRHydro_C2P_failed
diff --git a/src/Whisky_Differences.F90 b/src/GRHydro_Differences.F90
index 1cf5a03..91383e5 100644
--- a/src/Whisky_Differences.F90
+++ b/src/GRHydro_Differences.F90
@@ -5,7 +5,7 @@
 #include "SpaceMask.h"
 
  /*@@
-   @routine    Whisky_DiffRho
+   @routine    GRHydro_DiffRho
    @date       Fri Feb 18 10:02:31 2005
    @author     Ian Hawke
    @desc 
@@ -19,7 +19,7 @@
 
 @@*/
 
-subroutine Whisky_DiffRho(CCTK_ARGUMENTS)
+subroutine GRHydro_DiffRho(CCTK_ARGUMENTS)
       
   implicit none
   
@@ -149,4 +149,4 @@ subroutine Whisky_DiffRho(CCTK_ARGUMENTS)
     call CCTK_WARN(0, "Value of gradient_method not recognized")
   end if
 
-end subroutine Whisky_DiffRho
+end subroutine GRHydro_DiffRho
diff --git a/src/Whisky_ENOReconstruct.F90 b/src/GRHydro_ENOReconstruct.F90
index 6e73b21..a4a9e10 100644
--- a/src/Whisky_ENOReconstruct.F90
+++ b/src/GRHydro_ENOReconstruct.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_ENOReconstruct.F90
+   @file      GRHydro_ENOReconstruct.F90
    @date      Sat Apr  6 17:37:56 2002
    @author    Ian Hawke
    @desc 
@@ -13,7 +13,7 @@
 #include "cctk_Arguments.h"
 
  /*@@
-   @routine    Whisky_ENOSetup
+   @routine    GRHydro_ENOSetup
    @date       Sat Apr  6 17:42:13 2002
    @author     Ian Hawke
    @desc 
@@ -31,9 +31,9 @@
 
 @@*/
 
-subroutine Whisky_ENOSetup(CCTK_ARGUMENTS)
+subroutine GRHydro_ENOSetup(CCTK_ARGUMENTS)
 
-  USE Whisky_ENOScalars
+  USE GRHydro_ENOScalars
 
   implicit none
 
@@ -101,10 +101,10 @@ subroutine Whisky_ENOSetup(CCTK_ARGUMENTS)
     end do
   end do
 
-end subroutine Whisky_ENOSetup
+end subroutine GRHydro_ENOSetup
 
  /*@@
-   @routine    Whisky_ENOShutdown
+   @routine    GRHydro_ENOShutdown
    @date       Mon Apr  8 12:40:44 2002
    @author     Ian Hawke
    @desc 
@@ -118,9 +118,9 @@ end subroutine Whisky_ENOSetup
 
 @@*/
 
-subroutine Whisky_ENOShutdown(CCTK_ARGUMENTS)
+subroutine GRHydro_ENOShutdown(CCTK_ARGUMENTS)
 
-  USE Whisky_ENOScalars
+  USE GRHydro_ENOScalars
 
   implicit none
 
@@ -131,10 +131,10 @@ subroutine Whisky_ENOShutdown(CCTK_ARGUMENTS)
   deallocate(eno_coeffs, STAT = deallocstat)
   if (deallocstat .ne. 0) call CCTK_WARN(0, "Failed to deallocate ENO coefficients.")
 
-end subroutine Whisky_ENOShutdown
+end subroutine GRHydro_ENOShutdown
 
  /*@@
-   @routine    Whisky_ENOReconstruct1d
+   @routine    GRHydro_ENOReconstruct1d
    @date       Sat Apr  6 18:15:29 2002
    @author     Ian Hawke
    @desc 
@@ -152,9 +152,9 @@ end subroutine Whisky_ENOShutdown
 #define SpaceMask_CheckStateBitsF90_1D(mask,i,type_bits,state_bits) \
   (iand(mask((i)),(type_bits)).eq.(state_bits))
 
-subroutine Whisky_ENOReconstruct1d(order, nx, v, vminus, vplus, trivial_rp, &
+subroutine GRHydro_ENOReconstruct1d(order, nx, v, vminus, vplus, trivial_rp, &
      hydro_excision_mask)
-  USE Whisky_ENOScalars
+  USE GRHydro_ENOScalars
 
   implicit none
 
@@ -181,7 +181,7 @@ subroutine Whisky_ENOReconstruct1d(order, nx, v, vminus, vplus, trivial_rp, &
 
 !!$    Initialize excision
   do i = 1, nx
-    if (whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i) .ne. 0)) then
+    if (GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i) .ne. 0)) then
       vdiff(1, i) = large * (-1.d0*(1.d0+mod(i,10)))**i
       trivial_rp(i) = .true.
       excise(i) = .true.
@@ -256,4 +256,4 @@ subroutine Whisky_ENOReconstruct1d(order, nx, v, vminus, vplus, trivial_rp, &
     end if
   end do
 
-end subroutine Whisky_ENOReconstruct1d
+end subroutine GRHydro_ENOReconstruct1d
diff --git a/src/Whisky_ENOScalars.F90 b/src/GRHydro_ENOScalars.F90
index 8c8e872..7815347 100644
--- a/src/Whisky_ENOScalars.F90
+++ b/src/GRHydro_ENOScalars.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_ENOScalars.F90
+   @file      GRHydro_ENOScalars.F90
    @date      Sat Apr  6 17:35:42 2002
    @author    Ian Hawke
    @desc 
@@ -11,7 +11,7 @@
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
- module Whisky_ENOScalars
+ module GRHydro_ENOScalars
 
    implicit none
 
@@ -19,4 +19,4 @@
    
    logical, save :: coeffs_allocated = .false.
 
- end module Whisky_ENOScalars
+ end module GRHydro_ENOScalars
diff --git a/src/Whisky_EOS.c b/src/GRHydro_EOS.c
index fd86bb0..4452609 100644
--- a/src/Whisky_EOS.c
+++ b/src/GRHydro_EOS.c
@@ -1,10 +1,10 @@
  /*@@
-   @file      Whisky_EOS.c
+   @file      GRHydro_EOS.c
    @date      Wed Feb  6 18:25:33 2002
    @author    
    @desc 
    Sets the EOS handle number from EOS_Base for use by
-   all the Whisky routines
+   all the GRHydro routines
    @enddesc 
  @@*/
 
@@ -18,7 +18,7 @@
 #include "EOS_Base.h"
 
  /*@@
-   @routine    Whisky_EOSHandle
+   @routine    GRHydro_EOSHandle
    @date       Wed Feb  6 18:28:01 2002
    @author     Ian Hawke
    @desc 
@@ -32,7 +32,7 @@
 
 @@*/
 
-void Whisky_EOSHandle(CCTK_ARGUMENTS)
+void GRHydro_EOSHandle(CCTK_ARGUMENTS)
 {
 
   DECLARE_CCTK_ARGUMENTS;
@@ -41,27 +41,27 @@ void Whisky_EOSHandle(CCTK_ARGUMENTS)
   int ierr = 0;
   char *infoline;
   
-  *whisky_eos_handle = EOS_Handle(whisky_eos_table);
+  *GRHydro_eos_handle = EOS_Handle(GRHydro_eos_table);
   
-  if (*whisky_eos_handle < 0) {
-    ierr = *whisky_eos_handle;
+  if (*GRHydro_eos_handle < 0) {
+    ierr = *GRHydro_eos_handle;
     CCTK_WARN(0, "Table handle is incorrect");
   }
 
-  *whisky_polytrope_handle = EOS_Handle("2D_Polytrope");
+  *GRHydro_polytrope_handle = EOS_Handle("2D_Polytrope");
   
-  if (*whisky_polytrope_handle < 0) {
-      ierr = *whisky_polytrope_handle;
-      CCTK_WARN(0, "Whisky requires the 2D_Polytrope or the 2D_HybridPolytrope EoSs to be registered, for the atmosphere");
+  if (*GRHydro_polytrope_handle < 0) {
+      ierr = *GRHydro_polytrope_handle;
+      CCTK_WARN(0, "GRHydro requires the 2D_Polytrope or the 2D_HybridPolytrope EoSs to be registered, for the atmosphere");
     }
 
   infoline = (char *)malloc(100*sizeof(char));
   if (!infoline) {
-    CCTK_WARN(0, "Failed to malloc an array of 100 chars in Whisky_EOS.");
+    CCTK_WARN(0, "Failed to malloc an array of 100 chars in GRHydro_EOS.");
   }
   else {
-    sprintf(infoline,"Whisky will use the %s equation of state.",
-            whisky_eos_table);
+    sprintf(infoline,"GRHydro will use the %s equation of state.",
+            GRHydro_eos_table);
     CCTK_INFO(infoline);
   }
   free(infoline);
diff --git a/src/Whisky_Eigenproblem.F90 b/src/GRHydro_Eigenproblem.F90
index e971e1d..194ba72 100644
--- a/src/Whisky_Eigenproblem.F90
+++ b/src/GRHydro_Eigenproblem.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Eigenproblem.F90
+   @file      GRHydro_Eigenproblem.F90
    @date      Sat Jan 26 01:25:44 2002
    @author    Ian Hawke, Pedro Montero, Joachim Frieben
    @desc
@@ -19,7 +19,7 @@
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
-module Whisky_Eigenproblem
+module GRHydro_Eigenproblem
   implicit none
 
 
@@ -123,7 +123,7 @@ subroutine eigenproblem(handle,rho,velx,vely,velz,eps,&
      alp,beta,qdiff1,qdiff2,qdiff3,qdiff4,qdiff5,&
      roeflux1,roeflux2,roeflux3,roeflux4,roeflux5)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
 
@@ -191,7 +191,7 @@ subroutine eigenproblem(handle,rho,velx,vely,velz,eps,&
 !!$ BEGIN: Check for NaN value (1st check)
   if (lamm_nobeta .ne. lamm_nobeta) then
     write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (1st check)
 
@@ -224,7 +224,7 @@ subroutine eigenproblem(handle,rho,velx,vely,velz,eps,&
 !!$ BEGIN: Check for NaN value (2nd check)
   if (kappa .ne. kappa) then
     write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (dpdeps, rho, cs2)', dpdeps, rho, cs2
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (2nd check)
 
@@ -492,7 +492,7 @@ subroutine eigenproblem_leftright(handle,rho,velx,vely,velz,eps,&
      w_lorentz,gxx,gxy,gxz,gyy,gyz,gzz,u,&
      alp,beta,lambda,levec,revec)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
 
@@ -556,7 +556,7 @@ subroutine eigenproblem_leftright(handle,rho,velx,vely,velz,eps,&
 !!$ BEGIN: Check for NaN value (1st check)
   if (lamm_nobeta .ne. lamm_nobeta) then
     write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (1st check)
 
@@ -589,7 +589,7 @@ subroutine eigenproblem_leftright(handle,rho,velx,vely,velz,eps,&
 !!$ BEGIN: Check for NaN value (2nd check)
   if (kappa .ne. kappa) then
     write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (dpdeps, rho, cs2)', dpdeps, rho, cs2
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (2nd check)
 
@@ -745,7 +745,7 @@ subroutine eigenvalues_general(&
 !!$ BEGIN: Check for NaN value (1st check)
   if (w .ne. w) then
     write(NaN_WarnLine,'(a50,2g15.6)') 'NaN produced: (one, v2)', one, v2
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (1st check)
 
@@ -762,7 +762,7 @@ subroutine eigenvalues_general(&
 !!$ BEGIN: Check for NaN value (2nd check)
   if (lamm_nobeta .ne. lamm_nobeta) then
     write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (2nd check)
 
@@ -801,7 +801,7 @@ subroutine eigenproblem_general(&
      qdiff1,qdiff2,qdiff3,qdiff4,qdiff5,&
      roeflux1,roeflux2,roeflux3,roeflux4,roeflux5)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
 
@@ -843,7 +843,7 @@ subroutine eigenproblem_general(&
 !!$ BEGIN: Check for NaN value (1st check)
   if (w .ne. w) then
     write(NaN_WarnLine,'(a50,2g15.6)') 'NaN produced: (one, v2)', one, v2
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (1st check)
 
@@ -861,7 +861,7 @@ subroutine eigenproblem_general(&
 !!$ BEGIN: Check for NaN value (2nd check)
   if (lamm_nobeta .ne. lamm_nobeta) then
     write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (2nd check)
 
@@ -1136,5 +1136,5 @@ subroutine eigenproblem_general(&
 
 end subroutine eigenproblem_general
 
-end module Whisky_Eigenproblem
+end module GRHydro_Eigenproblem
 
diff --git a/src/Whisky_Eigenproblem_Marquina.F90 b/src/GRHydro_Eigenproblem_Marquina.F90
index c618c2a..443329e 100644
--- a/src/Whisky_Eigenproblem_Marquina.F90
+++ b/src/GRHydro_Eigenproblem_Marquina.F90
@@ -1,5 +1,5 @@
 /*@@
-  @file    Whisky_Eigenproblem_Marquina.F90
+  @file    GRHydro_Eigenproblem_Marquina.F90
   @date    Wed Feb 13 12:30 2002
   @author  Pedro Montero, Toni Font, Joachim Frieben
   @desc
@@ -43,7 +43,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,&
      gyy,gyz,gzz,u,det,alp,beta,densl,sxl,syl,szl,taul,&
      densr,sxr,syr,szr,taur,flux1,flux2,flux3,flux4,flux5)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
 
@@ -130,7 +130,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,&
 !!$ BEGIN: Check for NaN value (1st check)
   if (wl .ne. wl) then
     write(NaN_WarnLine,'(a100,2g15.6)') 'NaN produced: (one, v2l)', one, v2l
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (1st check)
 
@@ -151,7 +151,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,&
 !!$ BEGIN: Check for NaN value (2nd check)
   if (lamp_nobetal .ne. lamp_nobetal) then
     write(NaN_WarnLine,'(a150,5g15.6)') 'NaN produced: (cs2l, one, v2l, u, velxl)', cs2l, one, v2l, u, velxl
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (2nd check)
 
@@ -185,7 +185,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,&
 !!$ BEGIN: Check for NaN value (3rd check)
   if (wr .ne. wr) then
     write(NaN_WarnLine,'(a100,2g15.6)') 'NaN produced: (one, v2r)', one, v2r
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (3rd check)
 
@@ -205,7 +205,7 @@ subroutine eigenproblem_marquina(handle,rhor,velxr,velyr,&
 !!$ BEGIN: Check for NaN value (4th check)
   if (lamp_nobetar .ne. lamp_nobetar) then
     write(NaN_WarnLine,'(a150,5g15.6)') 'NaN produced: (cs2r, one, v2r, u, velxr)', cs2r, one, v2r, u, velxr
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value (4th check)
 
@@ -801,7 +801,7 @@ subroutine eigenproblem_marquina_general(&
      densr,sxr,syr,szr,taur,&
      flux1,flux2,flux3,flux4,flux5)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
 
diff --git a/src/Whisky_EoSChangeGamma.F90 b/src/GRHydro_EoSChangeGamma.F90
index fba28a9..5c854a6 100644
--- a/src/Whisky_EoSChangeGamma.F90
+++ b/src/GRHydro_EoSChangeGamma.F90
@@ -1,5 +1,5 @@
 /*@@
-@file      Whisky_EOSResetHydro.F90
+@file      GRHydro_EOSResetHydro.F90
 @date      Sat Jan 26 01:36:57 2002
 @author     Ian Hawke
 @desc 
@@ -21,7 +21,7 @@
 #define sz(i,j,k) scon(i,j,k,3)
 
  /*@@
-   @routine    Whisky_EOSResetHydro
+   @routine    GRHydro_EOSResetHydro
    @date       Sat Jan 26 01:38:12 2002
    @author     Ian Hawke
    @desc 
@@ -36,7 +36,7 @@
 @@*/
 
 
-subroutine Whisky_EoSChangeGamma(CCTK_ARGUMENTS)
+subroutine GRHydro_EoSChangeGamma(CCTK_ARGUMENTS)
 
   USE EOS_Polytrope_Scalars
 
@@ -54,8 +54,8 @@ subroutine Whisky_EoSChangeGamma(CCTK_ARGUMENTS)
 
 !!$  Set up the fluid constants
 
-  local_Gamma = 1.d0 + EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0) / &
-       EOS_SpecificIntEnergy(whisky_polytrope_handle, 1.d0, 1.d0)
+  local_Gamma = 1.d0 + EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0) / &
+       EOS_SpecificIntEnergy(GRHydro_polytrope_handle, 1.d0, 1.d0)
 
 !!$  Change the pressure and specific internal energy
 
@@ -72,7 +72,7 @@ subroutine Whisky_EoSChangeGamma(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 prim2conpolytype(whisky_polytrope_handle,gxx(i,j,k),gxy(i,j,k),&
+        call prim2conpolytype(GRHydro_polytrope_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),&
@@ -83,10 +83,10 @@ subroutine Whisky_EoSChangeGamma(CCTK_ARGUMENTS)
   end do
 
 
-end subroutine Whisky_EoSChangeGamma
+end subroutine GRHydro_EoSChangeGamma
 
  /*@@
-   @routine    Whisky_EoSChangeK
+   @routine    GRHydro_EoSChangeK
    @date       Mon Oct 20 12:56:14 2003
    @author     Ian Hawke
    @desc 
@@ -106,7 +106,7 @@ end subroutine Whisky_EoSChangeGamma
 
 @@*/
 
-subroutine Whisky_EoSChangeK(CCTK_ARGUMENTS)
+subroutine GRHydro_EoSChangeK(CCTK_ARGUMENTS)
 
   USE EOS_Polytrope_Scalars
 
@@ -126,10 +126,10 @@ subroutine Whisky_EoSChangeK(CCTK_ARGUMENTS)
 
 !!$  Set up the fluid constants
 
-  local_Gamma = 1.d0 + EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0) / &
-       EOS_SpecificIntEnergy(whisky_polytrope_handle, 1.d0, 1.d0)
+  local_Gamma = 1.d0 + EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0) / &
+       EOS_SpecificIntEnergy(GRHydro_polytrope_handle, 1.d0, 1.d0)
 
-  local_K = EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0)
+  local_K = EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0)
 
   if (abs(local_Gamma - 2.d0) < 1.d-10) then
 
@@ -156,12 +156,12 @@ subroutine Whisky_EoSChangeK(CCTK_ARGUMENTS)
 
   call Primitive2ConservativePolyCells(CCTK_ARGUMENTS)
 
-end subroutine Whisky_EoSChangeK
+end subroutine GRHydro_EoSChangeK
 
 
 
  /*@@
-   @routine    Whisky_EoSChangeGammaK_Shibata
+   @routine    GRHydro_EoSChangeGammaK_Shibata
    @date       Jan. 2005
    @author     Christian D. Ott
    @desc 
@@ -182,7 +182,7 @@ end subroutine Whisky_EoSChangeK
 
 @@*/
 
-subroutine Whisky_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS)
+subroutine GRHydro_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS)
 
   USE EOS_Polytrope_Scalars
 
@@ -206,10 +206,10 @@ subroutine Whisky_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS)
 
   call CCTK_INFO("Pulling the rug...by changing K and Gamma")
 
-  local_Gamma = 1.d0 + EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0) / &
-       EOS_SpecificIntEnergy(whisky_polytrope_handle, 1.d0, 1.d0)
+  local_Gamma = 1.d0 + EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0) / &
+       EOS_SpecificIntEnergy(GRHydro_polytrope_handle, 1.d0, 1.d0)
 
-  local_K = EOS_Pressure(whisky_polytrope_handle, 1.d0, 1.d0)
+  local_K = EOS_Pressure(GRHydro_polytrope_handle, 1.d0, 1.d0)
 
   eos_k_initial_cgs = initial_k * rho_geom_factor**initial_Gamma / p_geom_factor
 
@@ -226,7 +226,7 @@ subroutine Whisky_EoSChangeGammaK_Shibata(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),&
@@ -237,4 +237,4 @@ subroutine Whisky_EoSChangeGammaK_Shibata(CCTK_ARGUMENTS)
   end do
 
 
-end subroutine Whisky_EoSChangeGammaK_Shibata
+end subroutine GRHydro_EoSChangeGammaK_Shibata
diff --git a/src/Whisky_Flux.F90 b/src/GRHydro_Flux.F90
index 62866d2..f467e1c 100644
--- a/src/Whisky_Flux.F90
+++ b/src/GRHydro_Flux.F90
@@ -1,5 +1,5 @@
 /*@@
-@file      Whisky_Flux.F90
+@file      GRHydro_Flux.F90
 @date      Sat Jan 26 01:36:57 2002
 @author    Pedro Montero, Ian Hawke
 @desc 
diff --git a/src/Whisky_FluxSplit.F90 b/src/GRHydro_FluxSplit.F90
index f08c301..c5fe6d7 100644
--- a/src/Whisky_FluxSplit.F90
+++ b/src/GRHydro_FluxSplit.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_FluxSplit.F90
+   @file      GRHydro_FluxSplit.F90
    @date      Wed Mar  3 22:16:00 2004
    @author    Ian Hawke
    @desc 
@@ -13,7 +13,7 @@
 #include "cctk_Functions.h"
 
  /*@@
-   @routine    Whisky_FSAlpha
+   @routine    GRHydro_FSAlpha
    @date       Sun Jan  9 12:25:43 2005
    @author     Ian Hawke
    @desc 
@@ -28,9 +28,9 @@
 @@*/
 
 
-subroutine Whisky_FSAlpha(CCTK_ARGUMENTS)
+subroutine GRHydro_FSAlpha(CCTK_ARGUMENTS)
 
-  use Whisky_Eigenproblem
+  use GRHydro_Eigenproblem
 
   implicit none
   
@@ -89,7 +89,7 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS)
             beta = betax(i,j,k)
           end if
           
-          call eigenvalues(whisky_eos_handle, &
+          call eigenvalues(GRHydro_eos_handle, &
                rho      (i,j,k), &
                vel      (i,j,k,1), &
                vel      (i,j,k,2), &
@@ -146,7 +146,7 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS)
             beta = betay(i,j,k)
           end if
           
-          call eigenvalues(whisky_eos_handle, &
+          call eigenvalues(GRHydro_eos_handle, &
                rho      (i,j,k), &
                vel      (i,j,k,1), &
                vel      (i,j,k,2), &
@@ -203,7 +203,7 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS)
             beta = betaz(i,j,k)
           end if
           
-          call eigenvalues(whisky_eos_handle, &
+          call eigenvalues(GRHydro_eos_handle, &
                rho      (i,j,k), &
                vel      (i,j,k,1), &
                vel      (i,j,k,2), &
@@ -301,10 +301,10 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS)
 
 !!$  write(*,*) 'fs_alpha: final',fs_alpha1,fs_alpha2,fs_alpha3,fs_alpha4,fs_alpha5
   
-end subroutine Whisky_FSAlpha
+end subroutine GRHydro_FSAlpha
 
  /*@@
-   @routine    Whisky_SplitFlux
+   @routine    GRHydro_SplitFlux
    @date       Wed Mar  3 22:17:14 2004
    @author     Ian Hawke
    @desc 
@@ -320,7 +320,7 @@ end subroutine Whisky_FSAlpha
 @@*/
 
 
-subroutine Whisky_SplitFlux(CCTK_ARGUMENTS)
+subroutine GRHydro_SplitFlux(CCTK_ARGUMENTS)
 
   implicit none
   
@@ -339,8 +339,8 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS)
 
   if (flux_direction == 1) then
     allocate(upper(nx), det(nx), dummy(nx))
-    do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 2
-      do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 2
+    do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 2
+      do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 2
 
         if (shift_state .eq. 0) then
           dummy = 0.d0
@@ -370,7 +370,7 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS)
           end do
         end if
 
-        call Whisky_SplitFlux_1D(whisky_eos_handle, nx,&
+        call GRHydro_SplitFlux_1D(GRHydro_eos_handle, nx,&
              fs_alpha1, fs_alpha2, fs_alpha3, fs_alpha4, fs_alpha5, &
              gxx(:,j,k),gxy(:,j,k),gxz(:,j,k),&
              gyy(:,j,k),gyz(:,j,k),gzz(:,j,k),&
@@ -390,8 +390,8 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS)
     deallocate(upper, det, dummy)
   else if (flux_direction == 2) then
     allocate(upper(ny), det(ny), dummy(ny))
-    do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 2
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 2
+    do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 2
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 2
 
         if (shift_state .eq. 0) then
           dummy = 0.d0
@@ -421,7 +421,7 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS)
           end do
         end if
 
-        call Whisky_SplitFlux_1D(whisky_eos_handle, ny,&
+        call GRHydro_SplitFlux_1D(GRHydro_eos_handle, ny,&
              fs_alpha1, fs_alpha2, fs_alpha3, fs_alpha4, fs_alpha5, &
              gyy(i,:,k),gyz(i,:,k),gxy(i,:,k),&
              gzz(i,:,k),gxz(i,:,k),gxx(i,:,k),&
@@ -441,8 +441,8 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS)
     deallocate(upper, det, dummy)
   else if (flux_direction == 3) then
     allocate(upper(nz), det(nz), dummy(nz))
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 2
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 2
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 2
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 2
 
         if (shift_state .eq. 0) then
           dummy = 0.d0
@@ -473,7 +473,7 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS)
           end do
         end if
 
-        call Whisky_SplitFlux_1D(whisky_eos_handle, nz,&
+        call GRHydro_SplitFlux_1D(GRHydro_eos_handle, nz,&
              fs_alpha1, fs_alpha2, fs_alpha3, fs_alpha4, fs_alpha5, &
              gzz(i,j,:),gxz(i,j,:),gyz(i,j,:),&
              gxx(i,j,:),gxy(i,j,:),gyy(i,j,:),&
@@ -497,10 +497,10 @@ subroutine Whisky_SplitFlux(CCTK_ARGUMENTS)
 
   return
 
-end subroutine Whisky_SplitFlux
+end subroutine GRHydro_SplitFlux
 
  /*@@
-   @routine    Whisky_SplitFlux_1D
+   @routine    GRHydro_SplitFlux_1D
    @date       Wed Mar  3 22:55:36 2004
    @author     Ian Hawke
    @desc 
@@ -517,7 +517,7 @@ end subroutine Whisky_SplitFlux
 
 @@*/
 
-subroutine Whisky_SplitFlux_1D(handle, nx, &
+subroutine GRHydro_SplitFlux_1D(handle, nx, &
      alpha1, alpha2, alpha3, alpha4, alpha5, &
      gxx, gxy, gxz, gyy, gyz, gzz, u, det, alp, beta, &
      rho, velx1, vely1, velz1, press, w_lorentz, eps, &
@@ -526,7 +526,7 @@ subroutine Whisky_SplitFlux_1D(handle, nx, &
      densfminus, sxfminus, syfminus, szfminus, taufminus, &
      densflux, sxflux, syflux, szflux, tauflux)
 
-  use Whisky_Eigenproblem
+  use GRHydro_Eigenproblem
 
   implicit none
 
@@ -707,33 +707,33 @@ subroutine Whisky_SplitFlux_1D(handle, nx, &
 !!$    Reconstruct the characteristic split fluxes
 !!$    After reconstruction, combine to get the characteristic flux
 
-    call Whisky_WENO5_Left(5, char_f1_plus(i-2:i+2), tmp(i-2:i+2))
+    call GRHydro_WENO5_Left(5, char_f1_plus(i-2:i+2), tmp(i-2:i+2))
     char_f1(i) = tmp(i)
-    call Whisky_WENO5_Right(5, char_f1_minus(i-1:i+3), &
+    call GRHydro_WENO5_Right(5, char_f1_minus(i-1:i+3), &
          tmp(i-1:i+3))
     char_f1(i) = char_f1(i) + tmp(i+1)
     
-    call Whisky_WENO5_Left(5, char_f2_plus(i-2:i+2), tmp(i-2:i+2))
+    call GRHydro_WENO5_Left(5, char_f2_plus(i-2:i+2), tmp(i-2:i+2))
     char_f2(i) = tmp(i)
-    call Whisky_WENO5_Right(5, char_f2_minus(i-1:i+3), &
+    call GRHydro_WENO5_Right(5, char_f2_minus(i-1:i+3), &
          tmp(i-1:i+3))
     char_f2(i) = char_f2(i) + tmp(i+1)
     
-    call Whisky_WENO5_Left(5, char_f3_plus(i-2:i+2), tmp(i-2:i+2))
+    call GRHydro_WENO5_Left(5, char_f3_plus(i-2:i+2), tmp(i-2:i+2))
     char_f3(i) = tmp(i)
-    call Whisky_WENO5_Right(5, char_f3_minus(i-1:i+3), &
+    call GRHydro_WENO5_Right(5, char_f3_minus(i-1:i+3), &
          tmp(i-1:i+3))
     char_f3(i) = char_f3(i) + tmp(i+1)
     
-    call Whisky_WENO5_Left(5, char_f4_plus(i-2:i+2), tmp(i-2:i+2))
+    call GRHydro_WENO5_Left(5, char_f4_plus(i-2:i+2), tmp(i-2:i+2))
     char_f4(i) = tmp(i)
-    call Whisky_WENO5_Right(5, char_f4_minus(i-1:i+3), &
+    call GRHydro_WENO5_Right(5, char_f4_minus(i-1:i+3), &
          tmp(i-1:i+3))
     char_f4(i) = char_f4(i) + tmp(i+1)
     
-    call Whisky_WENO5_Left(5, char_f5_plus(i-2:i+2), tmp(i-2:i+2))
+    call GRHydro_WENO5_Left(5, char_f5_plus(i-2:i+2), tmp(i-2:i+2))
     char_f5(i) = tmp(i)
-    call Whisky_WENO5_Right(5, char_f5_minus(i-1:i+3), &
+    call GRHydro_WENO5_Right(5, char_f5_minus(i-1:i+3), &
          tmp(i-1:i+3))
     char_f5(i) = char_f5(i) + tmp(i+1)
 
@@ -770,10 +770,10 @@ subroutine Whisky_SplitFlux_1D(handle, nx, &
 
   deallocate(evals, levecs, revecs, tmp)
 
-end subroutine Whisky_SplitFlux_1D
+end subroutine GRHydro_SplitFlux_1D
 
  /*@@
-   @routine    Whisky_WENO5_Left
+   @routine    GRHydro_WENO5_Left
    @date       Wed Mar  3 22:57:54 2004
    @author     Ian Hawke
    @desc 
@@ -787,7 +787,7 @@ end subroutine Whisky_SplitFlux_1D
 
 @@*/
 
-subroutine Whisky_WENO5_Left(nx, v, vminus)
+subroutine GRHydro_WENO5_Left(nx, v, vminus)
 
   implicit none
 
@@ -861,10 +861,10 @@ subroutine Whisky_WENO5_Left(nx, v, vminus)
   
   end do
   
-end subroutine Whisky_WENO5_Left
+end subroutine GRHydro_WENO5_Left
 
  /*@@
-   @routine    Whisky_WENO5_Right
+   @routine    GRHydro_WENO5_Right
    @date       Wed Mar  3 22:58:10 2004
    @author     Ian Hawke
    @desc 
@@ -878,7 +878,7 @@ end subroutine Whisky_WENO5_Left
 
 @@*/
 
-subroutine Whisky_WENO5_Right(nx, v, vplus)
+subroutine GRHydro_WENO5_Right(nx, v, vplus)
 
   implicit none
 
@@ -953,4 +953,4 @@ subroutine Whisky_WENO5_Right(nx, v, vplus)
   
   end do
   
-end subroutine Whisky_WENO5_Right
+end subroutine GRHydro_WENO5_Right
diff --git a/src/Whisky_HLLE.F90 b/src/GRHydro_HLLE.F90
index 2e4fd68..d32f4a7 100644
--- a/src/Whisky_HLLE.F90
+++ b/src/GRHydro_HLLE.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_HLLE.F90
+   @file      GRHydro_HLLE.F90
    @date      Sat Jan 26 01:40:14 2002
    @author    Ian Hawke, Pedro Montero, Toni Font
    @desc 
@@ -16,7 +16,7 @@
 #include "SpaceMask.h"
 
  /*@@
-   @routine    Whisky_HLLEGeneral
+   @routine    GRHydro_HLLEGeneral
    @date       Sat Jan 26 01:41:02 2002
    @author     Ian Hawke, Pedro Montero, Toni Font
    @desc 
@@ -31,9 +31,9 @@
 
 @@*/
 
-subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS)
+subroutine GRHydro_HLLEGeneral(CCTK_ARGUMENTS)
 
-  USE Whisky_Eigenproblem
+  USE GRHydro_Eigenproblem
   implicit none
   
   DECLARE_CCTK_ARGUMENTS
@@ -77,9 +77,9 @@ subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS)
     call CCTK_WARN(0, "Flux direction not x,y,z")
   end if
 
-  do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+  do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
         
         f1 = 0.d0
         lamminus = 0.d0
@@ -338,12 +338,12 @@ subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS)
     end do
   end do
       
-end subroutine Whisky_HLLEGeneral
+end subroutine GRHydro_HLLEGeneral
 
 
-subroutine Whisky_HLLE_TracerGeneral(CCTK_ARGUMENTS)
+subroutine GRHydro_HLLE_TracerGeneral(CCTK_ARGUMENTS)
 
-  USE Whisky_Eigenproblem
+  USE GRHydro_Eigenproblem
 
   implicit none
   
@@ -370,9 +370,9 @@ subroutine Whisky_HLLE_TracerGeneral(CCTK_ARGUMENTS)
   endif
     
 
-  do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+  do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
         
         f1 = 0.d0
         lamminus = 0.d0
@@ -572,5 +572,5 @@ subroutine Whisky_HLLE_TracerGeneral(CCTK_ARGUMENTS)
     end do
   end do
 
-end subroutine Whisky_HLLE_TracerGeneral
+end subroutine GRHydro_HLLE_TracerGeneral
 
diff --git a/src/Whisky_HLLEPoly.F90 b/src/GRHydro_HLLEPoly.F90
index ad250f7..084fb33 100644
--- a/src/Whisky_HLLEPoly.F90
+++ b/src/GRHydro_HLLEPoly.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_HLLE.F90
+   @file      GRHydro_HLLE.F90
    @date      Sat Jan 26 01:40:14 2002
    @author    Ian Hawke, Pedro Montero, Toni Font
    @desc 
@@ -16,7 +16,7 @@
 #include "SpaceMask.h"
 
  /*@@
-   @routine    Whisky_HLLE
+   @routine    GRHydro_HLLE
    @date       Sat Jan 26 01:41:02 2002
    @author     Ian Hawke, Pedro Montero, Toni Font
    @desc 
@@ -30,8 +30,8 @@
 
 @@*/
 
-subroutine Whisky_HLLE(CCTK_ARGUMENTS)
-  USE Whisky_Eigenproblem
+subroutine GRHydro_HLLE(CCTK_ARGUMENTS)
+  USE GRHydro_Eigenproblem
 
   implicit none
   
@@ -64,9 +64,9 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
     call CCTK_WARN(0, "Flux direction not x,y,z")
   end if
 
-  do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+  do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
         
         f1 = 0.d0
         lamminus = 0.d0
@@ -184,7 +184,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
 !!$        Eigenvalues and fluxes either side of the cell interface
           
           if (flux_direction == 1) then
-            call eigenvalues(whisky_eos_handle,&
+            call eigenvalues(GRHydro_eos_handle,&
                  rhominus(i+xoffset,j+yoffset,k+zoffset),&
                  velxminus(i+xoffset,j+yoffset,k+zoffset),&
                  velyminus(i+xoffset,j+yoffset,k+zoffset),&
@@ -194,7 +194,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
                  lamminus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,&
                  psi4h*gyzh,psi4h*gzzh,&
                  usendh,avg_alp,avg_beta)
-            call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),&
+            call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),&
                  velxplus(i,j,k),velyplus(i,j,k),&
                  velzplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),&
                  lamplus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,&
@@ -211,7 +211,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
                  pressminus(i+xoffset,j+yoffset,k+zoffset),&
                  avg_det,avg_alp,avg_beta)
           else if (flux_direction == 2) then
-            call eigenvalues(whisky_eos_handle,&
+            call eigenvalues(GRHydro_eos_handle,&
                  rhominus(i+xoffset,j+yoffset,k+zoffset),&
                  velyminus(i+xoffset,j+yoffset,k+zoffset),&
                  velzminus(i+xoffset,j+yoffset,k+zoffset),&
@@ -221,7 +221,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
                  lamminus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,&
                  psi4h*gxzh,psi4h*gxxh,&
                  usendh,avg_alp,avg_beta)
-            call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),&
+            call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),&
                  velyplus(i,j,k),velzplus(i,j,k),&
                  velxplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),&
                  lamplus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,&
@@ -238,7 +238,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
                  pressminus(i+xoffset,j+yoffset,k+zoffset),&
                  avg_det,avg_alp,avg_beta)
           else if (flux_direction == 3) then
-            call eigenvalues(whisky_eos_handle,&
+            call eigenvalues(GRHydro_eos_handle,&
                  rhominus(i+xoffset,j+yoffset,k+zoffset),&
                  velzminus(i+xoffset,j+yoffset,k+zoffset),&
                  velxminus(i+xoffset,j+yoffset,k+zoffset),&
@@ -248,7 +248,7 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
                  lamminus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
                  usendh,avg_alp,avg_beta)
-            call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),&
+            call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),&
                  velzplus(i,j,k),velxplus(i,j,k),&
                  velyplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),&
                  lamplus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
@@ -303,10 +303,10 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
     end do
   end do
       
-end subroutine Whisky_HLLE
+end subroutine GRHydro_HLLE
 
  /*@@
-   @routine    Whisky_HLLE_Tracer
+   @routine    GRHydro_HLLE_Tracer
    @date       Mon Mar  8 13:47:13 2004
    @author     Ian Hawke
    @desc 
@@ -320,9 +320,9 @@ end subroutine Whisky_HLLE
 
 @@*/
 
-subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
+subroutine GRHydro_HLLE_Tracer(CCTK_ARGUMENTS)
 
-  USE Whisky_Eigenproblem
+  USE GRHydro_Eigenproblem
 
   implicit none
   
@@ -355,9 +355,9 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
     call CCTK_WARN(0, "Flux direction not x,y,z")
   end if
 
-  do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+  do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
         
         f1 = 0.d0
         lamminus = 0.d0
@@ -434,7 +434,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
 !!$        Eigenvalues and fluxes either side of the cell interface
           
         if (flux_direction == 1) then
-          call eigenvalues(whisky_eos_handle,&
+          call eigenvalues(GRHydro_eos_handle,&
                rhominus(i+xoffset,j+yoffset,k+zoffset),&
                velxminus(i+xoffset,j+yoffset,k+zoffset),&
                velyminus(i+xoffset,j+yoffset,k+zoffset),&
@@ -444,7 +444,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
                lamminus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,&
                psi4h*gyzh,psi4h*gzzh,&
                usendh,avg_alp,avg_beta)
-          call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),&
+          call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),&
                velxplus(i,j,k),velyplus(i,j,k),&
                velzplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),&
                lamplus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,&
@@ -455,7 +455,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
           fminus(:) = (velxminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * &
                cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:)
         else if (flux_direction == 2) then
-          call eigenvalues(whisky_eos_handle,&
+          call eigenvalues(GRHydro_eos_handle,&
                rhominus(i+xoffset,j+yoffset,k+zoffset),&
                velyminus(i+xoffset,j+yoffset,k+zoffset),&
                velzminus(i+xoffset,j+yoffset,k+zoffset),&
@@ -465,7 +465,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
                lamminus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,&
                psi4h*gxzh,psi4h*gxxh,&
                usendh,avg_alp,avg_beta)
-          call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),&
+          call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),&
                velyplus(i,j,k),velzplus(i,j,k),&
                velxplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),&
                lamplus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,&
@@ -476,7 +476,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
           fminus(:) = (velyminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * &
                cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:)
         else if (flux_direction == 3) then
-          call eigenvalues(whisky_eos_handle,&
+          call eigenvalues(GRHydro_eos_handle,&
                rhominus(i+xoffset,j+yoffset,k+zoffset),&
                velzminus(i+xoffset,j+yoffset,k+zoffset),&
                velxminus(i+xoffset,j+yoffset,k+zoffset),&
@@ -486,7 +486,7 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
                lamminus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
                psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
                usendh,avg_alp,avg_beta)
-          call eigenvalues(whisky_eos_handle,rhoplus(i,j,k),&
+          call eigenvalues(GRHydro_eos_handle,rhoplus(i,j,k),&
                velzplus(i,j,k),velxplus(i,j,k),&
                velyplus(i,j,k),epsplus(i,j,k),w_lorentzplus(i,j,k),&
                lamplus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
@@ -537,5 +537,5 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
   end do
 
       
-end subroutine Whisky_HLLE_Tracer
+end subroutine GRHydro_HLLE_Tracer
 
diff --git a/src/Whisky_Loop.F90 b/src/GRHydro_Loop.F90
index 7dd3a90..bd7e948 100644
--- a/src/Whisky_Loop.F90
+++ b/src/GRHydro_Loop.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Loop.F90
+   @file      GRHydro_Loop.F90
    @date      Sat Jan 26 01:50:14 2002
    @author    
    @desc 
@@ -12,7 +12,7 @@
 #include "cctk_Arguments.h"
 
  /*@@
-   @routine    WhiskyStartLoop
+   @routine    GRHydroStartLoop
    @date       Sat Jan 26 01:50:46 2002
    @author     Ian Hawke
    @desc 
@@ -26,7 +26,7 @@
 
 @@*/
 
-subroutine WhiskyStartLoop(CCTK_ARGUMENTS)
+subroutine GRHydroStartLoop(CCTK_ARGUMENTS)
   
   implicit none
   
@@ -38,7 +38,7 @@ subroutine WhiskyStartLoop(CCTK_ARGUMENTS)
   yoffset = 0
   zoffset = 1
   
-end subroutine WhiskyStartLoop
+end subroutine GRHydroStartLoop
 
  /*@@
    @routine    Advance the counters whilst in the loop
@@ -55,7 +55,7 @@ end subroutine WhiskyStartLoop
 
 @@*/
 
-subroutine WhiskyAdvanceLoop(CCTK_ARGUMENTS)
+subroutine GRHydroAdvanceLoop(CCTK_ARGUMENTS)
   
   implicit none
   
@@ -83,4 +83,4 @@ subroutine WhiskyAdvanceLoop(CCTK_ARGUMENTS)
     
   end if
   
-end subroutine WhiskyAdvanceLoop
+end subroutine GRHydroAdvanceLoop
diff --git a/src/Whisky_Marquina.F90 b/src/GRHydro_Marquina.F90
index 35b240a..a4196cf 100644
--- a/src/Whisky_Marquina.F90
+++ b/src/GRHydro_Marquina.F90
@@ -1,5 +1,5 @@
   /*@@
-   @file      Whisky_Marquina.f90
+   @file      GRHydro_Marquina.f90
    @date      Thu Jan  11 11:03:32 2002
    @author    Pedro Montero, Toni Font    
    @desc 
@@ -18,7 +18,7 @@
 #include "SpaceMask.h"
 
  /*@@
-   @routine    Whisky_Marquina.f90 
+   @routine    GRHydro_Marquina.f90 
    @date       Wed Feb 13 11:03:32 2002
    @author     Pedro Montero, Toni Font
    @desc 
@@ -33,7 +33,7 @@
 @@*/
 
 
-subroutine Whisky_Marquina(CCTK_ARGUMENTS)
+subroutine GRHydro_Marquina(CCTK_ARGUMENTS)
     
     implicit none
 
@@ -80,9 +80,9 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS)
     !$OMP psi4h,f_marquina,uxxh,uxyh,uxzh,uyyh,uyzh,uzzh,usendh,&
     !$OMP tmp_w_lorentzp, tmp_w_lorentzm_i,w_lorentzp,w_lorentzm_i,&
     !$OMP fplus,fminus,m,avg_det)
-    do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-      do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-        do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+    do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+      do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+        do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
 
 !!$        Set the left (p for plus) and right (m_i for minus, i+1) states
 
@@ -205,7 +205,7 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS)
                  2*gxyh*primp(2)*primp(3) + 2*gxzh*primp(2) *primp(4) + &
                  2*gyzh*primp(3)*primp(4)
             if (tmp_w_lorentzp .ge. 1.d0) then
-              w_lorentzp = Whisky_lorentz_overshoot_cutoff
+              w_lorentzp = GRHydro_lorentz_overshoot_cutoff
             else
               w_lorentzp = 1.d0 / sqrt(1.d0 - tmp_w_lorentzp);
             endif
@@ -215,12 +215,12 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS)
   if (w_lorentzp .ne. w_lorentzp) then
     !$OMP CRITICAL
     write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (primp(2), primp(3), primp(4))', primp(2), primp(3), primp(4)
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
     !$OMP END CRITICAL
   endif
 !!$ END: Check for NaN value (1st check)
 
-!!$            pressp = EOS_Pressure(whisky_eos_handle,primp(1),primp(5))
+!!$            pressp = EOS_Pressure(GRHydro_eos_handle,primp(1),primp(5))
         
 !!$right state
 
@@ -230,7 +230,7 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS)
                  2*gxzh*primm_i(2) *primm_i(4)+ &
                  2*gyzh*primm_i(3)*primm_i(4)
             if (tmp_w_lorentzm_i .ge. 1.d0) then
-              w_lorentzm_i = Whisky_lorentz_overshoot_cutoff
+              w_lorentzm_i = GRHydro_lorentz_overshoot_cutoff
             else
               w_lorentzm_i = 1.d0 / sqrt(1.d0 - tmp_w_lorentzm_i);
             endif
@@ -239,18 +239,18 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS)
   if (w_lorentzm_i .ne. w_lorentzm_i) then
     !$OMP CRITICAL
     write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (primm_i(2), primm_i(3), primm_i(4))', primm_i(2), primm_i(3), primm_i(4)
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
     !$OMP END CRITICAL
   endif
 !!$ END: Check for NaN value (2nd check)
 
-!!$            pressm_i = EOS_Pressure(whisky_eos_handle,primm_i(1),primm_i(5))
+!!$            pressm_i = EOS_Pressure(GRHydro_eos_handle,primm_i(1),primm_i(5))
             
 !!$eigenvalues and right eigenvectors
             
             if (flux_direction == 1) then
               
-              call eigenproblem_marquina(whisky_eos_handle,&
+              call eigenproblem_marquina(GRHydro_eos_handle,&
                    primm_i(1),primm_i(2), & 
                    primm_i(3),primm_i(4),primm_i(5),primp(1), &
                    primp(2),primp(3),primp(4),primp(5), &
@@ -263,7 +263,7 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS)
               
             else if (flux_direction == 2) then
               
-              call eigenproblem_marquina(whisky_eos_handle,&
+              call eigenproblem_marquina(GRHydro_eos_handle,&
                    primm_i(1),primm_i(3), & 
                    primm_i(4),primm_i(2),primm_i(5),primp(1), &
                    primp(3),primp(4),primp(2),primp(5), &
@@ -276,7 +276,7 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS)
               
             else
               
-              call eigenproblem_marquina(whisky_eos_handle,&
+              call eigenproblem_marquina(GRHydro_eos_handle,&
                    primm_i(1),primm_i(4), & 
                    primm_i(2),primm_i(3),primm_i(5),primp(1), &
                    primp(4),primp(2),primp(3),primp(5), &
@@ -362,9 +362,9 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS)
     if (evolve_tracer .ne. 0) then
 
       !$OMP PARALLEL DO PRIVATE(i,j)
-      do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-        do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-          do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+      do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+        do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+          do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
 
             if (densflux(i, j, k) > 0.d0) then
 
@@ -388,10 +388,10 @@ subroutine Whisky_Marquina(CCTK_ARGUMENTS)
     end if
     
     return
-end subroutine Whisky_Marquina
+end subroutine GRHydro_Marquina
 
  /*@@
-   @routine    Whisky_MarquinaGeneral 
+   @routine    GRHydro_MarquinaGeneral 
    @date       Wed Feb 13 11:03:32 2002
    @author     Pedro Montero, Toni Font
    @desc 
@@ -406,7 +406,7 @@ end subroutine Whisky_Marquina
 @@*/
 
 
-subroutine Whisky_MarquinaGeneral(CCTK_ARGUMENTS)
+subroutine GRHydro_MarquinaGeneral(CCTK_ARGUMENTS)
     
   implicit none
 
@@ -441,9 +441,9 @@ subroutine Whisky_MarquinaGeneral(CCTK_ARGUMENTS)
     call CCTK_WARN(0, "Flux direction not x,y,z")
   end if
   
-  do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+  do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
         
 !!$        Set the left (p for plus) and right (m_i for minus, i+1) states
         
@@ -620,9 +620,9 @@ subroutine Whisky_MarquinaGeneral(CCTK_ARGUMENTS)
 
   if (evolve_tracer .ne. 0) then
 
-    do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-      do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-        do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+    do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+      do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+        do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
           
           if (densflux(i, j, k) > 0.d0) then
             
@@ -644,7 +644,7 @@ subroutine Whisky_MarquinaGeneral(CCTK_ARGUMENTS)
       
   end if
       
-end subroutine Whisky_MarquinaGeneral
+end subroutine GRHydro_MarquinaGeneral
 
 
 
diff --git a/src/Whisky_Minima.F90 b/src/GRHydro_Minima.F90
index df13600..d3e2897 100644
--- a/src/Whisky_Minima.F90
+++ b/src/GRHydro_Minima.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Minima.F90
+   @file      GRHydro_Minima.F90
    @date      Mon Feb 25 11:43:36 2002
    @author    
    @desc 
@@ -12,11 +12,11 @@
 #include "cctk_Arguments.h"
 
  /*@@
-   @routine    Whisky_Minima_Setup
+   @routine    GRHydro_Minima_Setup
    @date       Mon Feb 25 11:25:27 2002
    @author     Ian Hawke
    @desc 
-   Before initial data, set up the scalar whisky_rho_min used for the atmosphere.
+   Before initial data, set up the scalar GRHydro_rho_min used for the atmosphere.
    This is computed only from parameters.
    @enddesc 
    @calls     
@@ -27,7 +27,7 @@
 
 @@*/
 
-subroutine Whisky_Rho_Minima_Setup(CCTK_ARGUMENTS)
+subroutine GRHydro_Rho_Minima_Setup(CCTK_ARGUMENTS)
 
   implicit none
 
@@ -35,28 +35,28 @@ subroutine Whisky_Rho_Minima_Setup(CCTK_ARGUMENTS)
   DECLARE_CCTK_PARAMETERS
 
   if (initial_rho_abs_min > 0.0) then
-    whisky_rho_min = initial_rho_abs_min
+    GRHydro_rho_min = initial_rho_abs_min
   else if (initial_rho_rel_min > 0.0) then 
-    whisky_rho_min = whisky_rho_central * initial_rho_rel_min
+    GRHydro_rho_min = GRHydro_rho_central * initial_rho_rel_min
   else if (rho_abs_min > 0.d0) then
-    whisky_rho_min = rho_abs_min
+    GRHydro_rho_min = rho_abs_min
   else
-    whisky_rho_min = whisky_rho_central * rho_rel_min
+    GRHydro_rho_min = GRHydro_rho_central * rho_rel_min
   end if
 
-  if (initial_atmosphere_factor > 0.0) whisky_rho_min = whisky_rho_min * initial_atmosphere_factor
+  if (initial_atmosphere_factor > 0.0) GRHydro_rho_min = GRHydro_rho_min * initial_atmosphere_factor
 
   return
 
-end subroutine Whisky_Rho_Minima_Setup
+end subroutine GRHydro_Rho_Minima_Setup
 
 
  /*@@
-   @routine    Whisky_Check_Rho_Minimum
+   @routine    GRHydro_Check_Rho_Minimum
    @date       Mon Jul 7 16:35:45 2008
    @author     Luca Baiotti 
    @desc 
-   Check whether at some point rho < whisky_rho_min and print a warning in case.
+   Check whether at some point rho < GRHydro_rho_min and print a warning in case.
    @enddesc 
    @calls     
    @calledby   
@@ -64,7 +64,7 @@ end subroutine Whisky_Rho_Minima_Setup
    @endhistory 
 @@*/
 
-subroutine Whisky_Check_Rho_Minimum(CCTK_ARGUMENTS)
+subroutine GRHydro_Check_Rho_Minimum(CCTK_ARGUMENTS)
 
   implicit none
 
@@ -78,11 +78,11 @@ subroutine Whisky_Check_Rho_Minimum(CCTK_ARGUMENTS)
     do j=1,cctk_lsh(2)
       do k=1,cctk_lsh(3)
 
-        if (rho(i,j,k) < whisky_rho_min) then
-          call CCTK_WARN(2,"rho<whisky_rho_min!!!")
-          write(warnline,'(a28,i2)') 'on carpet reflevel: ',whisky_reflevel
+        if (rho(i,j,k) < GRHydro_rho_min) then
+          call CCTK_WARN(2,"rho<GRHydro_rho_min!!!")
+          write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel
           call CCTK_WARN(2,warnline)
-          write(warnline,'(a25,g15.6)') 'whisky_rho_min: ',whisky_rho_min
+          write(warnline,'(a25,g15.6)') 'GRHydro_rho_min: ',GRHydro_rho_min
           call CCTK_WARN(2,warnline)
           write(warnline,'(a25,g15.6)') 'rho: ',rho(i,j,k)
           call CCTK_WARN(2,warnline)
@@ -96,15 +96,15 @@ subroutine Whisky_Check_Rho_Minimum(CCTK_ARGUMENTS)
 
   return
 
-end subroutine Whisky_Check_Rho_Minimum
+end subroutine GRHydro_Check_Rho_Minimum
 
 
  /*@@
-   @routine    Whisky__Change_Rho_Minimum_At_Recovery
+   @routine    GRHydro__Change_Rho_Minimum_At_Recovery
    @date       Thu Aug 14 17:11:32 2008
    @author     Luca Baiotti 
    @desc 
-   Change, via a parameter, the value of whisky_rho_min at recovery.
+   Change, via a parameter, the value of GRHydro_rho_min at recovery.
    @enddesc 
    @calls     
    @calledby   
@@ -112,15 +112,15 @@ end subroutine Whisky_Check_Rho_Minimum
    @endhistory 
 @@*/
 
-subroutine Whisky_Change_Rho_Minimum_At_Recovery(CCTK_ARGUMENTS)
+subroutine GRHydro_Change_Rho_Minimum_At_Recovery(CCTK_ARGUMENTS)
 
   implicit none
 
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
 
-  whisky_rho_min = rho_abs_min_after_recovery
+  GRHydro_rho_min = rho_abs_min_after_recovery
 
   return
 
-end subroutine Whisky_Change_Rho_Minimum_At_Recovery
+end subroutine GRHydro_Change_Rho_Minimum_At_Recovery
diff --git a/src/Whisky_Minima.cc b/src/GRHydro_Minima.cc
index da33a3f..08a06b9 100644
--- a/src/Whisky_Minima.cc
+++ b/src/GRHydro_Minima.cc
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Minima.cc
+   @file      GRHydro_Minima.cc
    @date      Tue Aug 29 18:52:10 2006
    @author    
    @desc 
@@ -23,20 +23,20 @@ using namespace Carpet;
 #endif
     
     /* Scheduled functions */
-    void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS);
+    void GRHydro_Rho_Minima_Setup_Final(CCTK_ARGUMENTS);
 
-    void Whisky_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS);
+    void GRHydro_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS);
     
 #ifdef __cplusplus
   } /* extern "C" */
 #endif
 
  /*@@
-   @routine    Whisky_Rho_Minima_Setup_Final
+   @routine    GRHydro_Rho_Minima_Setup_Final
    @date       Tue Aug 29 18:54:05 2006
    @author     Luca Baiotti
    @desc 
-        After initial data, set up the scalar whisky_rho_min used for checking the atmosphere.
+        After initial data, set up the scalar GRHydro_rho_min used for checking the atmosphere.
         This is computed taking into account the actual maximum rest-mass density on the grid.
 	Version for Carpet.
    @enddesc 
@@ -47,7 +47,7 @@ using namespace Carpet;
    @endhistory 
 @@*/
 
-void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS)
+void GRHydro_Rho_Minima_Setup_Final(CCTK_ARGUMENTS)
 {
 
 #ifdef HAVE_CARPET
@@ -63,7 +63,7 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS)
     {
       if (rho_abs_min > 0.0)
 	{
-	  *whisky_rho_min = rho_abs_min;
+	  *GRHydro_rho_min = rho_abs_min;
 	}
       else
 	{	  
@@ -91,7 +91,7 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS)
 		CCTK_WARN(0, "Failed to compute the global maximum of rho");
 	      }
 	    
-            *whisky_rho_min = max_rho * rho_rel_min;
+            *GRHydro_rho_min = max_rho * rho_rel_min;
 	    
             // Go back to local mode
 	  } END_GLOBAL_MODE;
@@ -110,12 +110,12 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS)
   //Debug stuff
   // char warnline;
 
-  //CCTK_VInfo (CCTK_THORNSTRING, "STEP 2: compute rho max; rho min: %13.12e \n",*whisky_rho_min);
+  //CCTK_VInfo (CCTK_THORNSTRING, "STEP 2: compute rho max; rho min: %13.12e \n",*GRHydro_rho_min);
 
- //  printf(warnline,"STEP 2: compute rho max; rho min: %13.12e \n",*whisky_rho_min);
+ //  printf(warnline,"STEP 2: compute rho max; rho min: %13.12e \n",*GRHydro_rho_min);
  //CCTK_WARN(1,warnline);
 
-  //  printf(warnline,"STEP 3: recompute ID with new atmosphere; rho min: ', whisky_rho_min, 'reflev: ',%i), whisky_rho_min, whisky_reflevel);
+  //  printf(warnline,"STEP 3: recompute ID with new atmosphere; rho min: ', GRHydro_rho_min, 'reflev: ',%i), GRHydro_rho_min, GRHydro_reflevel);
 
 
 
@@ -123,7 +123,7 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS)
 
 
  /*@@
-   @routine    Whisky_Rho_Minima_Setup_Final_PUGH
+   @routine    GRHydro_Rho_Minima_Setup_Final_PUGH
    @date       Tue Aug 29 18:57:42 2006
    @author     Luca Baiotti
    @desc 
@@ -136,7 +136,7 @@ void Whisky_Rho_Minima_Setup_Final(CCTK_ARGUMENTS)
    @endhistory 
 @@*/
 
-void Whisky_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS)
+void GRHydro_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS)
 { 
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -145,7 +145,7 @@ void Whisky_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS)
   
   if (rho_abs_min > 0.0)
     {
-      *whisky_rho_min = rho_abs_min;
+      *GRHydro_rho_min = rho_abs_min;
     }
   else
     {      
@@ -169,7 +169,7 @@ void Whisky_Rho_Minima_Setup_Final_PUGH(CCTK_ARGUMENTS)
 	  CCTK_WARN(0, "Failed to compute the global maximum of rho");
 	}
       
-      *whisky_rho_min = max_rho * rho_rel_min;     
+      *GRHydro_rho_min = max_rho * rho_rel_min;     
     }
 }
 
diff --git a/src/Whisky_PPM.F90 b/src/GRHydro_PPM.F90
index 4dbeb97..dc40274 100644
--- a/src/Whisky_PPM.F90
+++ b/src/GRHydro_PPM.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_PPM.F90
+   @file      GRHydro_PPM.F90
    @date      Sun Feb 10 16:53:29 2002
    @author    Ian Hawke, Toni Font, Luca Baiotti, Frank Loeffler
    @desc 
@@ -57,8 +57,8 @@ subroutine SimplePPM_1d(handle,poly,&
      gxx, gxy, gxz, gyy, gyz, gzz, psi4, beta, alp, w_lorentz, &
      dir, ni, nj, nrx, nry, nrz, ev_l, ev_r, xw)
 
-  USE Whisky_Scalars
-  USE Whisky_Eigenproblem
+  USE GRHydro_Scalars
+  USE GRHydro_Eigenproblem
 
   implicit none
 
@@ -388,7 +388,7 @@ trivial_rp = .true.
 
 !!$ Monotonicity. See (1.10) of C&W.
 
-do i = whisky_stencil, nx - whisky_stencil + 1
+do i = GRHydro_stencil, nx - GRHydro_stencil + 1
 #define MON(xminus,x,xplus)                                       \
     if (.not.( (xplus(i).eq.x(i)) .and. (x(i).eq.xminus(i)) )     \
         .and. ((xplus(i)-x(i))*(x(i)-xminus(i)) .le. 0.d0)) then&&\
@@ -420,7 +420,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1
     MON(velzminus,velz,velzplus)
   end do
   if (poly .eq. 0) then
-    do i = whisky_stencil, nx - whisky_stencil + 1
+    do i = GRHydro_stencil, nx - GRHydro_stencil + 1
       MON(epsminus,eps,epsplus)
     end do
   end if
@@ -431,7 +431,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1
 
   !!$ excision
   do i = 1, nx
-    if (whisky_enable_internal_excision /= 0 .and. &
+    if (GRHydro_enable_internal_excision /= 0 .and. &
         (hydro_excision_mask(i) .ne. 0)) then
       if (i .gt. 1) then
         trivial_rp(i-1)=.true.
@@ -442,7 +442,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1
       !!$  have to follow the order of sub-expressions given here and might
       !!$  access outside the array range
       cond = i .gt. 1
-      if (cond .and. whisky_enable_internal_excision /= 0) then
+      if (cond .and. GRHydro_enable_internal_excision /= 0) then
         cond = hydro_excision_mask(i-1) .ne. 0
       end if
       if (cond) then
@@ -470,7 +470,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1
         end if
       else
         cond = (i.gt.2) .and. (i.lt.nx)
-        if (cond .and. whisky_enable_internal_excision /= 0) then
+        if (cond .and. GRHydro_enable_internal_excision /= 0) then
             cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i-2) .ne. 0)
         end if
         if (cond) then
@@ -484,7 +484,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1
         end if
       end if
       cond = i.lt.nx
-      if (cond .and. whisky_enable_internal_excision /= 0) then
+      if (cond .and. GRHydro_enable_internal_excision /= 0) then
           cond = hydro_excision_mask(i+1) .ne. 0
       end if
       if (cond) then
@@ -512,7 +512,7 @@ do i = whisky_stencil, nx - whisky_stencil + 1
         endif
       else
         cond = (i.lt.nx-1) .and. (i.gt.1)
-        if (cond .and. whisky_enable_internal_excision /= 0) then
+        if (cond .and. GRHydro_enable_internal_excision /= 0) then
             cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i+2) .ne. 0)
         end if
         if (cond) then
@@ -536,7 +536,7 @@ end subroutine SimplePPM_1d
 subroutine SimplePPM_tracer_1d(nx,dx,rho,velx,vely,velz, &
      tracer,tracerminus,tracerplus,press)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
 
@@ -724,7 +724,7 @@ subroutine SimplePPM_tracer_1d(nx,dx,rho,velx,vely,velz, &
 
 
   do itracer=1,number_of_tracers
-     do i = whisky_stencil, nx - whisky_stencil + 1
+     do i = GRHydro_stencil, nx - GRHydro_stencil + 1
         if (((tracerplus(i,itracer)-tracer(i,itracer))*      &
            (tracer(i,itracer)-tracerminus(i,itracer)) .le. 0.d0)) then
            tracerminus(i,itracer) = tracer(i,itracer)
diff --git a/src/Whisky_ParamCheck.F90 b/src/GRHydro_ParamCheck.F90
index a6032de..51da4f0 100644
--- a/src/Whisky_ParamCheck.F90
+++ b/src/GRHydro_ParamCheck.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_ParamCheck.F90
+   @file      GRHydro_ParamCheck.F90
    @date      Sat Feb  9 23:48:01 2002
    @author    
    @desc 
@@ -13,7 +13,7 @@
 #include "cctk_Functions.h"
 
  /*@@
-   @routine    Whisky_ParamCheck
+   @routine    GRHydro_ParamCheck
    @date       Sat Feb  9 23:48:43 2002
    @author     Ian Hawke
    @desc 
@@ -27,7 +27,7 @@
 
 @@*/
 
-subroutine Whisky_ParamCheck(CCTK_ARGUMENTS)
+subroutine GRHydro_ParamCheck(CCTK_ARGUMENTS)
 
   implicit none
 
@@ -35,49 +35,49 @@ subroutine Whisky_ParamCheck(CCTK_ARGUMENTS)
   DECLARE_CCTK_PARAMETERS
   DECLARE_CCTK_FUNCTIONS
 
-  if (whisky_stencil > minval(cctk_nghostzones)) then
+  if (GRHydro_stencil > minval(cctk_nghostzones)) then
     call CCTK_PARAMWARN("The stencil is larger than the number of ghost zones. Answer will be dependent on processor number...")
   end if
 
-  if (CCTK_EQUALS(recon_method,"tvd").and.(whisky_stencil < 2)) then
+  if (CCTK_EQUALS(recon_method,"tvd").and.(GRHydro_stencil < 2)) then
     call CCTK_PARAMWARN("The stencil size must be at least 2 to use TVD reconstruction")
   end if
   
   if (CCTK_EQUALS(recon_method,"ppm")) then
-    if (CCTK_EQUALS(ppm_flatten,"stencil_3").and.(whisky_stencil < 3)) then
+    if (CCTK_EQUALS(ppm_flatten,"stencil_3").and.(GRHydro_stencil < 3)) then
       call CCTK_PARAMWARN("The stencil size must be at least 3 to use PPM reconstruction with the stencil-3 variant of the flattening procedure")
-    else if (CCTK_EQUALS(ppm_flatten,"stencil_4").and.(whisky_stencil < 4)) then
+    else if (CCTK_EQUALS(ppm_flatten,"stencil_4").and.(GRHydro_stencil < 4)) then
       call CCTK_PARAMWARN("The stencil size must be at least 4 to use PPM reconstruction with the stencil-4 (original) flattening procedure")
     end if
   end if
 
-  if (CCTK_EQUALS(recon_method,"eno").and.(whisky_stencil < eno_order)) then
+  if (CCTK_EQUALS(recon_method,"eno").and.(GRHydro_stencil < eno_order)) then
     call CCTK_PARAMWARN("The stencil size must be at least the order of the reconstruction to use ENO reconstruction")
   end if
 
-  if (CCTK_EQUALS(whisky_eos_table,"2D_Polytrope").and.&
-       (.not.CCTK_EQUALS(whisky_eos_type,"Polytype"))) then
+  if (CCTK_EQUALS(GRHydro_eos_table,"2D_Polytrope").and.&
+       (.not.CCTK_EQUALS(GRHydro_eos_type,"Polytype"))) then
     call CCTK_PARAMWARN("When using the 2D_Polytrope EOS you need to set eos_type to Polytype")
   end if
 
-  if (CCTK_EQUALS(whisky_eos_table,"Ideal_Fluid").and.&
-       (.not.CCTK_EQUALS(whisky_eos_type,"General"))) then
+  if (CCTK_EQUALS(GRHydro_eos_table,"Ideal_Fluid").and.&
+       (.not.CCTK_EQUALS(GRHydro_eos_type,"General"))) then
     call CCTK_PARAMWARN("When using the Ideal_Fluid EOS you need to set eos_type to General")
   end if
 
   if (.not.(CCTK_EQUALS(metric_type, "Physical").or.&
        CCTK_EQUALS(metric_type, "Static Conformal"))) then
-    call CCTK_PARAMWARN("Whisky only knows how to deal with physical metric type at the moment. Complain to the maintainers...")
+    call CCTK_PARAMWARN("GRHydro only knows how to deal with physical metric type at the moment. Complain to the maintainers...")
   end if
   
   if (.not.CCTK_EQUALS(metric_type, "Static Conformal")) then
-    call CCTK_INFO("Whisky will use the physical metric and set conformal_state=0.")
+    call CCTK_INFO("GRHydro will use the physical metric and set conformal_state=0.")
     conformal_state = 0
   end if
   
   
   if (use_mask .eq. 0) then
-    call CCTK_PARAMWARN("Whisky now requires you to set SpaceMask::use_mask = ""yes""")
+    call CCTK_PARAMWARN("GRHydro now requires you to set SpaceMask::use_mask = ""yes""")
   end if
 
   if (number_of_particles .gt. 0) then
@@ -88,7 +88,7 @@ subroutine Whisky_ParamCheck(CCTK_ARGUMENTS)
   ! This check and 'static' as valid keyword option can be removed after the
   ! year 2010
   if (CCTK_EQUALS(bound,"static")) then
-    call CCTK_PARAMWARN("Whisky::bound = 'static' is no longer supported, use 'none' instead");
+    call CCTK_PARAMWARN("GRHydro::bound = 'static' is no longer supported, use 'none' instead");
   end if
-end subroutine Whisky_ParamCheck
+end subroutine GRHydro_ParamCheck
 
diff --git a/src/Whisky_Particle.F90 b/src/GRHydro_Particle.F90
index 9e78004..464bf78 100644
--- a/src/Whisky_Particle.F90
+++ b/src/GRHydro_Particle.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Particle.F90
+   @file      GRHydro_Particle.F90
    @date      Wed Mar 31 11:10:52 2004
    @author    Ian Hawke
    @desc 
@@ -13,7 +13,7 @@
 #include "cctk_Functions.h"
 
  /*@@
-   @routine    WhiskyParticleRHS
+   @routine    GRHydroParticleRHS
    @date       Wed Mar 31 11:11:26 2004
    @author     Ian Hawke
    @desc 
@@ -28,7 +28,7 @@
 
 @@*/
 
-subroutine WhiskyParticleRHS(CCTK_ARGUMENTS)
+subroutine GRHydroParticleRHS(CCTK_ARGUMENTS)
 
   implicit none
 
@@ -92,7 +92,7 @@ subroutine WhiskyParticleRHS(CCTK_ARGUMENTS)
   endif
 
 ! Find out how many interpolation points are located on this processor.
-  call CCTK_GrouplshGN ( status, cctkGH, 1, lsh, 'whisky::particles' )
+  call CCTK_GrouplshGN ( status, cctkGH, 1, lsh, 'GRHydro::particles' )
   if ( status .lt. 0 ) then
     call CCTK_WARN ( 0, 'cannot get local size for particles' )
   end if
@@ -112,9 +112,9 @@ subroutine WhiskyParticleRHS(CCTK_ARGUMENTS)
   interp_coords(3) = CCTK_PointerTo(particle_z)
 
 !   Set the indices to the input grid functions.
-  call CCTK_VarIndex ( in_arrays(1), 'whisky::velx' )
-  call CCTK_VarIndex ( in_arrays(2), 'whisky::vely' )
-  call CCTK_VarIndex ( in_arrays(3), 'whisky::velz' )
+  call CCTK_VarIndex ( in_arrays(1), 'GRHydro::velx' )
+  call CCTK_VarIndex ( in_arrays(2), 'GRHydro::vely' )
+  call CCTK_VarIndex ( in_arrays(3), 'GRHydro::velz' )
   call CCTK_VarIndex ( in_arrays(4), 'admbase::alp' )
   call CCTK_VarIndex ( in_arrays(5), 'admbase::betax' )
   call CCTK_VarIndex ( in_arrays(6), 'admbase::betay' )
@@ -162,10 +162,10 @@ subroutine WhiskyParticleRHS(CCTK_ARGUMENTS)
   
   return
 
-end subroutine WhiskyParticleRHS
+end subroutine GRHydroParticleRHS
 
 /*@@
-   @routine    WhiskyParticleInitial
+   @routine    GRHydroParticleInitial
    @date       Wed Mar 31 11:53:25 2004
    @author     Ian Hawke
    @desc 
@@ -180,7 +180,7 @@ end subroutine WhiskyParticleRHS
 
 @@*/
 
-subroutine WhiskyParticleInitial(CCTK_ARGUMENTS)
+subroutine GRHydroParticleInitial(CCTK_ARGUMENTS)
 
   implicit none
 
@@ -197,11 +197,11 @@ subroutine WhiskyParticleInitial(CCTK_ARGUMENTS)
   if (number_of_particles .gt. 0) then
 
 ! Find out how many interpolation points are located on this processor.
-    call CCTK_GrouplshGN ( status, cctkGH, 1, lsh, 'whisky::particles' )
+    call CCTK_GrouplshGN ( status, cctkGH, 1, lsh, 'GRHydro::particles' )
     if ( status .lt. 0 ) then
       call CCTK_WARN ( 0, 'cannot get local size for particles' )
     end if
-    call CCTK_GrouplbndGN ( status, cctkGH, 1, lbnd, 'whisky::particles' )
+    call CCTK_GrouplbndGN ( status, cctkGH, 1, lbnd, 'GRHydro::particles' )
     if ( status .lt. 0 ) then
       call CCTK_WARN ( 0, 'cannot get lower bounds for particles' )
     end if
@@ -245,4 +245,4 @@ subroutine WhiskyParticleInitial(CCTK_ARGUMENTS)
     
   end if
   
-end subroutine WhiskyParticleInitial
+end subroutine GRHydroParticleInitial
diff --git a/src/Whisky_PreLoop.F90 b/src/GRHydro_PreLoop.F90
index c2c5366..4750840 100644
--- a/src/Whisky_PreLoop.F90
+++ b/src/GRHydro_PreLoop.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_PreLoop.F90
+   @file      GRHydro_PreLoop.F90
    @date      Mon Feb 25 11:43:36 2002
    @author    
    @desc 
@@ -13,7 +13,7 @@
 #include "cctk_Functions.h"
 
  /*@@
-   @routine    Whisky_Scalar_Setup
+   @routine    GRHydro_Scalar_Setup
    @date       Mon Feb 25 11:25:27 2002
    @author     
    @desc 
@@ -28,9 +28,9 @@
 
 @@*/
 
-subroutine Whisky_Scalar_Setup(CCTK_ARGUMENTS)
+subroutine GRHydro_Scalar_Setup(CCTK_ARGUMENTS)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
 
@@ -92,4 +92,4 @@ subroutine Whisky_Scalar_Setup(CCTK_ARGUMENTS)
     call CCTK_WARN(0, "Numerical Viscosity Mode not recognized!")
   end if
 
-end subroutine Whisky_Scalar_Setup
+end subroutine GRHydro_Scalar_Setup
diff --git a/src/Whisky_Prim2Con.F90 b/src/GRHydro_Prim2Con.F90
index b93c618..9710a60 100644
--- a/src/Whisky_Prim2Con.F90
+++ b/src/GRHydro_Prim2Con.F90
@@ -46,9 +46,9 @@ subroutine primitive2conservative(CCTK_ARGUMENTS)
   CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
        gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4l,psi4r
   
-  do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1
-    do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1
-      do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1
+  do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
+    do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1
+      do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1
         
         gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset))
         gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset))
@@ -83,13 +83,13 @@ subroutine primitive2conservative(CCTK_ARGUMENTS)
         call SpatialDeterminant(gxxl,gxyl,gxzl,gyyl, gyzl,gzzl,avg_detl)
         call SpatialDeterminant(gxxr,gxyr,gxzr,gyyr, gyzr,gzzr,avg_detr)
 
-        call prim2con(whisky_eos_handle, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, &
+        call prim2con(GRHydro_eos_handle, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, &
              avg_detl,densminus(i,j,k),sxminus(i,j,k),&
              syminus(i,j,k),szminus(i,j,k),tauminus(i,j,k),rhominus(i,j,k), &
              velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),&
              epsminus(i,j,k),pressminus(i,j,k),w_lorentzminus(i, j, k))
  
-        call prim2con(whisky_eos_handle, gxxr,gxyr,gxzr,gyyr,gyzr,gzzr, &
+        call prim2con(GRHydro_eos_handle, gxxr,gxyr,gxzr,gyyr,gyzr,gzzr, &
              avg_detr, densplus(i,j,k),sxplus(i,j,k),&
              syplus(i,j,k),szplus(i,j ,k),tauplus(i,j,k),&
              rhoplus(i,j,k),velxplus(i,j,k),velyplus(i,j,k),&
@@ -140,7 +140,7 @@ subroutine prim2con(handle, gxx, gxy, gxz, gyy, gyz, gzz, det, ddens, &
   if (w .ne. w) then
     !$OMP CRITICAL
     write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (dvelx,dvely,dvelz)', dvelx, dvely, dvelz
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
     !$OMP END CRITICAL
   endif
 !!$ END: Check for NaN value
@@ -187,9 +187,9 @@ subroutine Primitive2ConservativeCells(CCTK_ARGUMENTS)
   CCTK_INT :: i, j, k
   CCTK_REAL :: det,psi4pt
   
-  do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1
-    do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1
-      do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1
+  do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
+    do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1
+      do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1
         
         if (conformal_state .eq. 0) then
           psi4pt = 1d0
@@ -201,7 +201,7 @@ subroutine Primitive2ConservativeCells(CCTK_ARGUMENTS)
                psi4pt*gxz(i,j,k),psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),&
                psi4pt*gzz(i,j,k),det)
         end if
-        call prim2con(whisky_eos_handle,psi4pt*gxx(i,j,k),&
+        call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),&
              psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),&
              psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),&
              det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),&
@@ -244,9 +244,9 @@ subroutine Prim2ConservativePolytype(CCTK_ARGUMENTS)
   
   !$OMP PARALLEL DO PRIVATE(i, j, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
   !$OMP gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4r,psi4l)
-  do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1
-    do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1
-      do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1
+  do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
+    do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1
+      do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1
         
         gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset))
         gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset))
@@ -281,14 +281,14 @@ subroutine Prim2ConservativePolytype(CCTK_ARGUMENTS)
         call SpatialDeterminant(gxxl,gxyl,gxzl,gyyl, gyzl,gzzl,avg_detl)
         call SpatialDeterminant(gxxr,gxyr,gxzr,gyyr, gyzr,gzzr,avg_detr)
 
-        call prim2conpolytype(whisky_eos_handle, gxxl,gxyl,gxzl,&
+        call prim2conpolytype(GRHydro_eos_handle, gxxl,gxyl,gxzl,&
              gyyl,gyzl,gzzl, &
              avg_detl,densminus(i,j,k),sxminus(i,j,k),&
              syminus(i,j,k),szminus(i,j,k),tauminus(i,j,k),rhominus(i,j,k), &
              velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),&
              epsminus(i,j,k),pressminus(i,j,k),w_lorentzminus(i, j, k))
  
-        call prim2conpolytype(whisky_eos_handle, gxxr,gxyr,gxzr,&
+        call prim2conpolytype(GRHydro_eos_handle, gxxr,gxyr,gxzr,&
              gyyr,gyzr,gzzr, &
              avg_detr, densplus(i,j,k),sxplus(i,j,k),&
              syplus(i,j,k),szplus(i,j ,k),tauplus(i,j,k),&
@@ -351,7 +351,7 @@ subroutine prim2conpolytype(handle, gxx, gxy, gxz, gyy, gyz, &
     ! all bad choices.
     !$OMP CRITICAL
     write(NaN_WarnLine,'(a80,2g15.6)') 'Infinite Lorentz factor reset. rho, w_tmp: ', drho, w_tmp
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
     !$OMP END CRITICAL
     w = 1.d-20
   else
@@ -404,13 +404,13 @@ subroutine Primitive2ConservativePolyCells(CCTK_ARGUMENTS)
   CCTK_INT :: i, j, k
   CCTK_REAL :: det
   
-  do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1
-    do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1
-      do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1
+  do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
+    do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1
+      do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1
         
         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 prim2conpolytype(whisky_eos_handle,gxx(i,j,k),gxy(i,j,k),&
+        call prim2conpolytype(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),&
@@ -448,9 +448,9 @@ subroutine Prim2ConservativeTracer(CCTK_ARGUMENTS)
   CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
        gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4r,psi4l
   
-  do k = whisky_stencil,cctk_lsh(3)-whisky_stencil+1
-    do j = whisky_stencil,cctk_lsh(2)-whisky_stencil+1
-      do i = whisky_stencil,cctk_lsh(1)-whisky_stencil+1
+  do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1
+    do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1
+      do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1
         
         gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset))
         gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset))
@@ -527,7 +527,7 @@ end subroutine Prim2ConservativeTracer
 
 subroutine primitive2conservativegeneral(CCTK_ARGUMENTS)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
   
@@ -545,9 +545,9 @@ subroutine primitive2conservativegeneral(CCTK_ARGUMENTS)
 
   !$OMP PARALLEL DO PRIVATE(i, j, gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,&
   !$OMP gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr,psi4r,psi4l)
-  do k = whisky_stencil , cctk_lsh(3) - whisky_stencil + 1
-    do j = whisky_stencil , cctk_lsh(2) - whisky_stencil + 1
-      do i = whisky_stencil , cctk_lsh(1) - whisky_stencil + 1
+  do k = GRHydro_stencil , cctk_lsh(3) - GRHydro_stencil + 1
+    do j = GRHydro_stencil , cctk_lsh(2) - GRHydro_stencil + 1
+      do i = GRHydro_stencil , cctk_lsh(1) - GRHydro_stencil + 1
         
         gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset))
         gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset))
@@ -625,7 +625,7 @@ end subroutine primitive2conservativegeneral
 
 subroutine Primitive2ConservativeCellsGeneral(CCTK_ARGUMENTS)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
   
@@ -639,9 +639,9 @@ subroutine Primitive2ConservativeCellsGeneral(CCTK_ARGUMENTS)
   
   ierr = EOS_SetGFs(cctkGH, EOS_Prim2ConCellsCall)
 
-  do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1
+  do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
         
         gxxpt = gxx(i,j,k)
         gxypt = gxy(i,j,k)
diff --git a/src/Whisky_Reconstruct.F90 b/src/GRHydro_Reconstruct.F90
index 7b2365d..d7af59a 100644
--- a/src/Whisky_Reconstruct.F90
+++ b/src/GRHydro_Reconstruct.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Reconstruct.F90
+   @file      GRHydro_Reconstruct.F90
    @date      Sat Jan 26 02:13:25 2002
    @author    
    @desc 
@@ -202,9 +202,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
 
     if (flux_direction == 1) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, nz - whisky_stencil + 1
-        do j = whisky_stencil, ny - whisky_stencil + 1
-          call SimplePPM_1d(whisky_eos_handle,0,nx,CCTK_DELTA_SPACE(1),&
+      do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+        do j = GRHydro_stencil, ny - GRHydro_stencil + 1
+          call SimplePPM_1d(GRHydro_eos_handle,0,nx,CCTK_DELTA_SPACE(1),&
                rho(:,j,k),velx(:,j,k),vely(:,j,k),velz(:,j,k),eps(:,j,k),&
                press(:,j,k),rhominus(:,j,k),velxminus(:,j,k),velyminus(:,j,k),&
                velzminus(:,j,k),epsminus(:,j,k),rhoplus(:,j,k),&
@@ -213,9 +213,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
                gxx(:,j,k), gxy(:,j,k), gxz(:,j,k), gyy(:,j,k), gyz(:,j,k), &
                gzz(:,j,k), psi4(:,j,k), lbetax(:,j,k), alp(:,j,k),&
                w_lorentz(:,j,k), &
-               1, j, k, nx, ny, nz, whisky_mppm_eigenvalue_x_left, &
-                                    whisky_mppm_eigenvalue_x_right, &
-                                    whisky_mppm_xwind)
+               1, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_x_left, &
+                                    GRHydro_mppm_eigenvalue_x_right, &
+                                    GRHydro_mppm_xwind)
           do i = 1, nx
             if (trivial_rp(i,j,k)) then
               SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bitsx, trivialx)
@@ -228,8 +228,8 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
          !$OMP PARALLEL DO PRIVATE(j)
-         do k = whisky_stencil, nz - whisky_stencil + 1
-            do j = whisky_stencil, ny - whisky_stencil + 1
+         do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+            do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
                     velx(:,j,k),vely(:,j,k),velz(:,j,k), &
                     tracer(:,j,k,:),tracerminus(:,j,k,:),tracerplus(:,j,k,:), &
@@ -241,9 +241,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
 
     else if (flux_direction == 2) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, nz - whisky_stencil + 1
-        do j = whisky_stencil, nx - whisky_stencil + 1
-          call SimplePPM_1d(whisky_eos_handle,0,ny,CCTK_DELTA_SPACE(2),&
+      do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+        do j = GRHydro_stencil, nx - GRHydro_stencil + 1
+          call SimplePPM_1d(GRHydro_eos_handle,0,ny,CCTK_DELTA_SPACE(2),&
                rho(j,:,k),vely(j,:,k),velz(j,:,k),velx(j,:,k),eps(j,:,k),&
                press(j,:,k),rhominus(j,:,k),velyminus(j,:,k),velzminus(j,:,k),&
                velxminus(j,:,k),epsminus(j,:,k),rhoplus(j,:,k),&
@@ -252,9 +252,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
                gyy(j,:,k), gyz(j,:,k), gxy(j,:,k), gzz(j,:,k), gxz(j,:,k), &
                gxx(j,:,k), psi4(j,:,k), lbetay(j,:,k), alp(j,:,k),&
                w_lorentz(j,:,k), &
-               2, j, k, nx, ny, nz, whisky_mppm_eigenvalue_y_left, &
-                                    whisky_mppm_eigenvalue_y_right, &
-                                    whisky_mppm_xwind)
+               2, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_y_left, &
+                                    GRHydro_mppm_eigenvalue_y_right, &
+                                    GRHydro_mppm_xwind)
           do i = 1, ny
             if (trivial_rp(j,i,k)) then
               SpaceMask_SetStateBitsF90(space_mask, j, i, k, type_bitsy, trivialy)
@@ -267,8 +267,8 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
          !$OMP PARALLEL DO PRIVATE(j)
-         do k = whisky_stencil, nz - whisky_stencil + 1
-            do j = whisky_stencil, nx - whisky_stencil + 1
+         do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+            do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
                    vely(j,:,k),velz(j,:,k),velx(j,:,k), &
                    tracer(j,:,k,:),tracerminus(j,:,k,:),tracerplus(j,:,k,:), &
@@ -280,9 +280,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
 
     else if (flux_direction == 3) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, ny - whisky_stencil + 1
-        do j = whisky_stencil, nx - whisky_stencil + 1
-          call SimplePPM_1d(whisky_eos_handle,0,nz,CCTK_DELTA_SPACE(3),&
+      do k = GRHydro_stencil, ny - GRHydro_stencil + 1
+        do j = GRHydro_stencil, nx - GRHydro_stencil + 1
+          call SimplePPM_1d(GRHydro_eos_handle,0,nz,CCTK_DELTA_SPACE(3),&
                rho(j,k,:),velz(j,k,:),velx(j,k,:),vely(j,k,:),eps(j,k,:),&
                press(j,k,:),rhominus(j,k,:),velzminus(j,k,:),velxminus(j,k,:),&
                velyminus(j,k,:),epsminus(j,k,:),rhoplus(j,k,:),&
@@ -291,9 +291,9 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
                gzz(j,k,:), gxz(j,k,:), gyz(j,k,:), gxx(j,k,:), gxy(j,k,:), &
                gyy(j,k,:), psi4(j,k,:), lbetaz(j,k,:), alp(j,k,:),&
                w_lorentz(j,k,:), &
-               3, j, k, nx, ny, nz, whisky_mppm_eigenvalue_z_left, &
-                                    whisky_mppm_eigenvalue_z_right, &
-                                    whisky_mppm_xwind)
+               3, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_z_left, &
+                                    GRHydro_mppm_eigenvalue_z_right, &
+                                    GRHydro_mppm_xwind)
           do i = 1, nz
             if (trivial_rp(j,k,i)) then
               SpaceMask_SetStateBitsF90(space_mask, j, k, i, type_bitsz, trivialz)
@@ -306,8 +306,8 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
          !$OMP PARALLEL DO PRIVATE(j)
-         do k = whisky_stencil, ny - whisky_stencil + 1
-            do j = whisky_stencil, nx - whisky_stencil + 1
+         do k = GRHydro_stencil, ny - GRHydro_stencil + 1
+            do j = GRHydro_stencil, nx - GRHydro_stencil + 1
 
                call SimplePPM_tracer_1d(nz,CCTK_DELTA_SPACE(3),rho(j,k,:), &
                     velz(j,k,:),velx(j,k,:),vely(j,k,:), &
@@ -334,38 +334,38 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
 
     if (flux_direction == 1) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1
-        do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1
+      do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
+        do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  rho(:,j,k),rhominus(:,j,k),rhoplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  velx(:,j,k),velxminus(:,j,k),velxplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  vely(:,j,k),velyminus(:,j,k),velyplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  velz(:,j,k),velzminus(:,j,k),velzplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  eps(:,j,k),epsminus(:,j,k),epsplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
           else if (CCTK_EQUALS(recon_vars,"conservative")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  dens(:,j,k),densminus(:,j,k),densplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  sx(:,j,k),sxminus(:,j,k),sxplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  sy(:,j,k),syminus(:,j,k),syplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  sz(:,j,k),szminus(:,j,k),szplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  tau(:,j,k),tauminus(:,j,k),tauplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
           else
@@ -385,38 +385,38 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
     else if (flux_direction == 2) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1
-        do j = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1
+      do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
+        do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  rho(j,:,k),rhominus(j,:,k),rhoplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  velx(j,:,k),velxminus(j,:,k),velxplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  vely(j,:,k),velyminus(j,:,k),velyplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  velz(j,:,k),velzminus(j,:,k),velzplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  eps(j,:,k),epsminus(j,:,k),epsplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
           else if (CCTK_EQUALS(recon_vars,"conservative")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  dens(j,:,k),densminus(j,:,k),densplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  sx(j,:,k),sxminus(j,:,k),sxplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  sy(j,:,k),syminus(j,:,k),syplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  sz(j,:,k),szminus(j,:,k),szplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  tau(j,:,k),tauminus(j,:,k),tauplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
           else
@@ -436,38 +436,38 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
     else if (flux_direction == 3) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1
-        do j = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1
+      do k = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
+        do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  rho(j,k,:),rhominus(j,k,:),rhoplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  velx(j,k,:),velxminus(j,k,:),velxplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  vely(j,k,:),velyminus(j,k,:),velyplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  velz(j,k,:),velzminus(j,k,:),velzplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  eps(j,k,:),epsminus(j,k,:),epsplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
           else if (CCTK_EQUALS(recon_vars,"conservative")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  dens(j,k,:),densminus(j,k,:),densplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  sx(j,k,:),sxminus(j,k,:),sxplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  sy(j,k,:),syminus(j,k,:),syplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  sz(j,k,:),szminus(j,k,:),szplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  tau(j,k,:),tauminus(j,k,:),tauplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
           else
@@ -496,7 +496,7 @@ subroutine Reconstruction(CCTK_ARGUMENTS)
   deallocate(psi4, lbetax, lbetay, lbetaz)
 
   !$OMP WORKSHARE
-  where ( (rhoplus < whisky_rho_min).or.(rhominus < whisky_rho_min).or.&
+  where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min).or.&
           (epsplus < 0.d0).or.(epsminus < 0.d0) )
     rhoplus = rho
     rhominus = rho
diff --git a/src/Whisky_ReconstructPoly.F90 b/src/GRHydro_ReconstructPoly.F90
index c7a5dfa..0467c27 100644
--- a/src/Whisky_ReconstructPoly.F90
+++ b/src/GRHydro_ReconstructPoly.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_ReconstructPoly.F90
+   @file      GRHydro_ReconstructPoly.F90
    @date      Sat Jan 26 02:13:25 2002
    @author    
    @desc 
@@ -201,9 +201,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
 
     if (flux_direction == 1) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, nz - whisky_stencil + 1
-        do j = whisky_stencil, ny - whisky_stencil + 1
-          call SimplePPM_1d(whisky_eos_handle,1,nx,CCTK_DELTA_SPACE(1),&
+      do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+        do j = GRHydro_stencil, ny - GRHydro_stencil + 1
+          call SimplePPM_1d(GRHydro_eos_handle,1,nx,CCTK_DELTA_SPACE(1),&
                rho(:,j,k),velx(:,j,k),vely(:,j,k),velz(:,j,k),eps(:,j,k),&
                press(:,j,k),rhominus(:,j,k),velxminus(:,j,k),velyminus(:,j,k),&
                velzminus(:,j,k),epsminus(:,j,k),rhoplus(:,j,k),&
@@ -212,9 +212,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
                gxx(:,j,k), gxy(:,j,k), gxz(:,j,k), gyy(:,j,k), gyz(:,j,k), &
                gzz(:,j,k), psi4(:,j,k), lbetax(:,j,k), alp(:,j,k),&
                w_lorentz(:,j,k), &
-               1, j, k, nx, ny, nz, whisky_mppm_eigenvalue_x_left, &
-                                    whisky_mppm_eigenvalue_x_right, &
-                                    whisky_mppm_xwind)
+               1, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_x_left, &
+                                    GRHydro_mppm_eigenvalue_x_right, &
+                                    GRHydro_mppm_xwind)
           do i = 1, nx
             if (trivial_rp(i,j,k)) then
               SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bitsx, trivialx)
@@ -227,8 +227,8 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
          !$OMP PARALLEL DO PRIVATE(j)
-         do k = whisky_stencil, nz - whisky_stencil + 1
-            do j = whisky_stencil, ny - whisky_stencil + 1
+         do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+            do j = GRHydro_stencil, ny - GRHydro_stencil + 1
                call SimplePPM_tracer_1d(nx,CCTK_DELTA_SPACE(1),rho(:,j,k), &
                     velx(:,j,k),vely(:,j,k),velz(:,j,k), &
                     tracer(:,j,k,:),tracerminus(:,j,k,:),tracerplus(:,j,k,:), &
@@ -240,9 +240,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
 
     else if (flux_direction == 2) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, nz - whisky_stencil + 1
-        do j = whisky_stencil, nx - whisky_stencil + 1
-          call SimplePPM_1d(whisky_eos_handle,1,ny,CCTK_DELTA_SPACE(2),&
+      do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+        do j = GRHydro_stencil, nx - GRHydro_stencil + 1
+          call SimplePPM_1d(GRHydro_eos_handle,1,ny,CCTK_DELTA_SPACE(2),&
                rho(j,:,k),vely(j,:,k),velz(j,:,k),velx(j,:,k),eps(j,:,k),&
                press(j,:,k),rhominus(j,:,k),velyminus(j,:,k),velzminus(j,:,k),&
                velxminus(j,:,k),epsminus(j,:,k),rhoplus(j,:,k),&
@@ -251,9 +251,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
                gyy(j,:,k), gyz(j,:,k), gxy(j,:,k), gzz(j,:,k), gxz(j,:,k), &
                gxx(j,:,k), psi4(j,:,k), lbetay(j,:,k), alp(j,:,k),&
                w_lorentz(j,:,k), &
-               2, j, k, nx, ny, nz, whisky_mppm_eigenvalue_y_left, &
-                                    whisky_mppm_eigenvalue_y_right, &
-                                    whisky_mppm_xwind)
+               2, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_y_left, &
+                                    GRHydro_mppm_eigenvalue_y_right, &
+                                    GRHydro_mppm_xwind)
           do i = 1, ny
             if (trivial_rp(j,i,k)) then
               SpaceMask_SetStateBitsF90(space_mask, j, i, k, type_bitsy, trivialy)
@@ -266,8 +266,8 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
          !$OMP PARALLEL DO PRIVATE(j)
-         do k = whisky_stencil, nz - whisky_stencil + 1
-            do j = whisky_stencil, nx - whisky_stencil + 1
+         do k = GRHydro_stencil, nz - GRHydro_stencil + 1
+            do j = GRHydro_stencil, nx - GRHydro_stencil + 1
               call SimplePPM_tracer_1d(ny,CCTK_DELTA_SPACE(2),rho(j,:,k), &
                    vely(j,:,k),velz(j,:,k),velx(j,:,k), &
                    tracer(j,:,k,:),tracerminus(j,:,k,:),tracerplus(j,:,k,:), &
@@ -279,9 +279,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
 
     else if (flux_direction == 3) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, ny - whisky_stencil + 1
-        do j = whisky_stencil, nx - whisky_stencil + 1
-          call SimplePPM_1d(whisky_eos_handle,1,nz,CCTK_DELTA_SPACE(3),&
+      do k = GRHydro_stencil, ny - GRHydro_stencil + 1
+        do j = GRHydro_stencil, nx - GRHydro_stencil + 1
+          call SimplePPM_1d(GRHydro_eos_handle,1,nz,CCTK_DELTA_SPACE(3),&
                rho(j,k,:),velz(j,k,:),velx(j,k,:),vely(j,k,:),eps(j,k,:),&
                press(j,k,:),rhominus(j,k,:),velzminus(j,k,:),velxminus(j,k,:),&
                velyminus(j,k,:),epsminus(j,k,:),rhoplus(j,k,:),&
@@ -290,9 +290,9 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
                gzz(j,k,:), gxz(j,k,:), gyz(j,k,:), gxx(j,k,:), gxy(j,k,:), &
                gyy(j,k,:), psi4(j,k,:), lbetaz(j,k,:), alp(j,k,:),&
                w_lorentz(j,k,:), &
-               3, j, k, nx, ny, nz, whisky_mppm_eigenvalue_z_left, &
-                                    whisky_mppm_eigenvalue_z_right, &
-                                    whisky_mppm_xwind)
+               3, j, k, nx, ny, nz, GRHydro_mppm_eigenvalue_z_left, &
+                                    GRHydro_mppm_eigenvalue_z_right, &
+                                    GRHydro_mppm_xwind)
           do i = 1, nz
             if (trivial_rp(j,k,i)) then
               SpaceMask_SetStateBitsF90(space_mask, j, k, i, type_bitsz, trivialz)
@@ -305,8 +305,8 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
       if(evolve_tracer.ne.0) then
          !$OMP PARALLEL DO PRIVATE(j)
-         do k = whisky_stencil, ny - whisky_stencil + 1
-            do j = whisky_stencil, nx - whisky_stencil + 1
+         do k = GRHydro_stencil, ny - GRHydro_stencil + 1
+            do j = GRHydro_stencil, nx - GRHydro_stencil + 1
 
                call SimplePPM_tracer_1d(nz,CCTK_DELTA_SPACE(3),rho(j,k,:), &
                     velz(j,k,:),velx(j,k,:),vely(j,k,:), &
@@ -333,32 +333,32 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
 
     if (flux_direction == 1) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1
-        do j = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1
+      do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
+        do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  rho(:,j,k),rhominus(:,j,k),rhoplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  velx(:,j,k),velxminus(:,j,k),velxplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  vely(:,j,k),velyminus(:,j,k),velyplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  velz(:,j,k),velzminus(:,j,k),velzplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
           else if (CCTK_EQUALS(recon_vars,"conservative")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  dens(:,j,k),densminus(:,j,k),densplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  sx(:,j,k),sxminus(:,j,k),sxplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  sy(:,j,k),syminus(:,j,k),syplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(1),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(1),&
                  sz(:,j,k),szminus(:,j,k),szplus(:,j,k),&
                  trivial_rp(:,j,k), hydro_excision_mask(:,j,k))
           else
@@ -378,32 +378,32 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
     else if (flux_direction == 2) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, cctk_lsh(3) - whisky_stencil + 1
-        do j = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1
+      do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1
+        do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  rho(j,:,k),rhominus(j,:,k),rhoplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  velx(j,:,k),velxminus(j,:,k),velxplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  vely(j,:,k),velyminus(j,:,k),velyplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  velz(j,:,k),velzminus(j,:,k),velzplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
           else if (CCTK_EQUALS(recon_vars,"conservative")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  dens(j,:,k),densminus(j,:,k),densplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  sx(j,:,k),sxminus(j,:,k),sxplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  sy(j,:,k),syminus(j,:,k),syplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(2),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(2),&
                  sz(j,:,k),szminus(j,:,k),szplus(j,:,k),&
                  trivial_rp(j,:,k), hydro_excision_mask(j,:,k))
           else
@@ -423,32 +423,32 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
       !$OMP END PARALLEL DO
     else if (flux_direction == 3) then
       !$OMP PARALLEL DO PRIVATE(i, j)
-      do k = whisky_stencil, cctk_lsh(2) - whisky_stencil + 1
-        do j = whisky_stencil, cctk_lsh(1) - whisky_stencil + 1
+      do k = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1
+        do j = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1
           if (CCTK_EQUALS(recon_vars,"primitive")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  rho(j,k,:),rhominus(j,k,:),rhoplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  velx(j,k,:),velxminus(j,k,:),velxplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  vely(j,k,:),velyminus(j,k,:),velyplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  velz(j,k,:),velzminus(j,k,:),velzplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
           else if (CCTK_EQUALS(recon_vars,"conservative")) then
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  dens(j,k,:),densminus(j,k,:),densplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  sx(j,k,:),sxminus(j,k,:),sxplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  sy(j,k,:),syminus(j,k,:),syplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
-            call Whisky_ENOReconstruct1d(eno_order,cctk_lsh(3),&
+            call GRHydro_ENOReconstruct1d(eno_order,cctk_lsh(3),&
                  sz(j,k,:),szminus(j,k,:),szplus(j,k,:),&
                  trivial_rp(j,k,:), hydro_excision_mask(j,k,:))
           else
@@ -477,7 +477,7 @@ subroutine ReconstructionPolytype(CCTK_ARGUMENTS)
   deallocate(psi4, lbetax, lbetay, lbetaz)
 
   !$OMP WORKSHARE
-  where ( (rhoplus < whisky_rho_min).or.(rhominus < whisky_rho_min).or.&
+  where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min).or.&
           (epsplus < 0.d0).or.(epsminus < 0.d0) )
     rhoplus = rho
     rhominus = rho
diff --git a/src/Whisky_RegisterGZ.cc b/src/GRHydro_RegisterGZ.cc
index e525d52..30fe5a4 100644
--- a/src/Whisky_RegisterGZ.cc
+++ b/src/GRHydro_RegisterGZ.cc
@@ -1,7 +1,7 @@
 // register.cc -- register variables with various thorns that need-to-know
 // $Header$
 //
-// Whisky_register_GZPatchSystem - register with GZPatchSystem
+// GRHydro_register_GZPatchSystem - register with GZPatchSystem
 //
 // Cut 'n paste job from BackgroundWaveToy, author J Thornburg...
 
@@ -24,7 +24,7 @@ using namespace std;
 //
 // If we're using Carpet, this function must be called in meta mode.
 //
-extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS)
+extern "C"void GRHydro_register_GZPatchSystem(CCTK_ARGUMENTS)
 {
 
   if (CCTK_IsFunctionAliased("GZPatchSystem_register_sync"))
@@ -35,8 +35,8 @@ extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS)
 
     string var[8] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
                      "HydroBase::vel",
-                     "Whisky::dens", "Whisky::tau", "Whisky::w_lorentz",
-                     "Whisky::scon"};
+                     "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+                     "GRHydro::scon"};
     for (int i = 0; i < 8; i++)
     {
       int status = 
@@ -44,7 +44,7 @@ extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS)
       if (status < 0)
       {
         CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING,
-                   "***** Whisky_register_GZPatchSystem():\n"
+                   "***** GRHydro_register_GZPatchSystem():\n"
                    "        error registering var group %s to be "
                    "interpatch-synchronized!\n"
                    "        (GZPatchSystem_register_sync() error code %d)\n",
@@ -65,8 +65,8 @@ extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS)
 
     string var[11] = {"HydroBase::rho", "HydroBase::press", "HydroBase::eps",
                       "HydroBase::vel",
-                      "Whisky::dens", "Whisky::tau", "Whisky::w_lorentz",
-                      "Whisky::scon",
+                      "GRHydro::dens", "GRHydro::tau", "GRHydro::w_lorentz",
+                      "GRHydro::scon",
                       "ADMBase::metric", "ADMBase::curv", "ADMBase::shift"};
     for (int i = 0; i < 11; i++)
      for (int j = 0; j < 3; j++)
@@ -76,7 +76,7 @@ extern "C"void Whisky_register_GZPatchSystem(CCTK_ARGUMENTS)
       if (ps_status < 0)
       {
         CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING,
-                   "***** Whisky_register_GZPatchSystem():\n"
+                   "***** GRHydro_register_GZPatchSystem():\n"
                    "        error registering var group %s to be "
                    "interpatch-cxformhronized!\n"
                    "        (GZPatchSystem_register_cxform() error code %d)\n",
diff --git a/src/Whisky_RegisterMask.c b/src/GRHydro_RegisterMask.c
index a89a150..d440d4b 100644
--- a/src/Whisky_RegisterMask.c
+++ b/src/GRHydro_RegisterMask.c
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_RegisterMask.c
+   @file      GRHydro_RegisterMask.c
    @date      Sun Jan 26 01:55:25 2003
    @author    Ian Hawke
    @desc 
@@ -17,7 +17,7 @@
 #include <stdlib.h>
 
  /*@@
-   @routine    Whisky_RegisterMask
+   @routine    GRHydro_RegisterMask
    @date       Sun Jan 26 01:56:06 2003
    @author     
    @desc 
@@ -37,7 +37,7 @@
 
 @@*/
 
-int Whisky_RegisterMask(void)
+int GRHydro_RegisterMask(void)
 {
   
   DECLARE_CCTK_PARAMETERS;
@@ -74,7 +74,7 @@ int Whisky_RegisterMask(void)
   return 0;
 }
 
-void Whisky_SetupDescriptors(CCTK_ARGUMENTS)
+void GRHydro_SetupDescriptors(CCTK_ARGUMENTS)
 {
   
   DECLARE_CCTK_ARGUMENTS;
diff --git a/src/Whisky_RegisterVars.cc b/src/GRHydro_RegisterVars.cc
index 981b759..8720f74 100644
--- a/src/Whisky_RegisterVars.cc
+++ b/src/GRHydro_RegisterVars.cc
@@ -1,4 +1,4 @@
-// Whisky_RegisterVars.cc
+// GRHydro_RegisterVars.cc
 //
 // converted from F90 to improve readability and maintainability
 //
@@ -32,7 +32,7 @@ static void register_saveandrestore(string v1)
 
 // Main function called by Cactus to register variables with MoL
 
-extern "C"void Whisky_Register(CCTK_ARGUMENTS)
+extern "C"void GRHydro_Register(CCTK_ARGUMENTS)
 {
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
@@ -54,19 +54,19 @@ extern "C"void Whisky_Register(CCTK_ARGUMENTS)
   register_constrained("HydroBase::press");
   register_constrained("HydroBase::eps");
   register_constrained("HydroBase::vel");
-  register_constrained("Whisky::w_lorentz");
+  register_constrained("GRHydro::w_lorentz");
 
-  if (CCTK_EQUALS(evolution_method, "whisky"))
+  if (CCTK_EQUALS(evolution_method, "GRHydro"))
   {
     // dens and scon
-    register_evolved("whisky::dens", "whisky::densrhs");
-    register_evolved("whisky::scon", "whisky::srhs");
+    register_evolved("GRHydro::dens", "GRHydro::densrhs");
+    register_evolved("GRHydro::scon", "GRHydro::srhs");
 
     // tau
-    if (CCTK_EQUALS(whisky_eos_type, "General"))
-      register_evolved("whisky::tau" , "whisky::taurhs");
-    else if (CCTK_EQUALS(whisky_eos_type, "Polytype"))
-      register_constrained("whisky::tau");
+    if (CCTK_EQUALS(GRHydro_eos_type, "General"))
+      register_evolved("GRHydro::tau" , "GRHydro::taurhs");
+    else if (CCTK_EQUALS(GRHydro_eos_type, "Polytype"))
+      register_constrained("GRHydro::tau");
     else
       CCTK_WARN(0, "Don't recognize the type of EOS!");
 
@@ -81,7 +81,7 @@ extern "C"void Whisky_Register(CCTK_ARGUMENTS)
       if (CCTK_EQUALS(shift_evolution_method, "Comoving"))
       {
         register_constrained("admbase::shift");
-        register_evolved("Whisky::whisky_coords", "Whisky::whisky_coords_rhs");
+        register_evolved("GRHydro::GRHydro_coords", "GRHydro::GRHydro_coords_rhs");
       }
       else
         register_saveandrestore("admbase::shift");
@@ -89,17 +89,17 @@ extern "C"void Whisky_Register(CCTK_ARGUMENTS)
 
     // tracer
     if (evolve_tracer != 0)
-      register_evolved("whisky::whisky_cons_tracers", "whisky::whisky_tracer_rhs");
+      register_evolved("GRHydro::GRHydro_cons_tracers", "GRHydro::GRHydro_tracer_rhs");
 
     // particles
     if (number_of_particles > 0)
-      register_evolved("whisky::particles", "whisky::particle_rhs");
+      register_evolved("GRHydro::particles", "GRHydro::particle_rhs");
   }
   else if (CCTK_EQUALS(evolution_method, "none"))
   {
-    register_constrained("whisky::dens");
-    register_constrained("whisky::scon");
-    register_constrained("whisky::tau");
+    register_constrained("GRHydro::dens");
+    register_constrained("GRHydro::scon");
+    register_constrained("GRHydro::tau");
   }
 }
 
diff --git a/src/Whisky_RiemannSolve.F90 b/src/GRHydro_RiemannSolve.F90
index 8288b70..76739a3 100644
--- a/src/Whisky_RiemannSolve.F90
+++ b/src/GRHydro_RiemannSolve.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_RiemannSolve.F90
+   @file      GRHydro_RiemannSolve.F90
    @date      Sat Jan 26 02:20:25 2002
    @author    
    @desc 
@@ -39,27 +39,27 @@ subroutine RiemannSolve(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(riemann_solver,"HLLE")) then
     
-    call Whisky_HLLE(CCTK_PASS_FTOF)
+    call GRHydro_HLLE(CCTK_PASS_FTOF)
 
     if (evolve_tracer .ne. 0) then
     
-      call Whisky_HLLE_Tracer(CCTK_PASS_FTOF)
+      call GRHydro_HLLE_Tracer(CCTK_PASS_FTOF)
 
     end if
     
   else if (CCTK_EQUALS(riemann_solver,"Roe")) then   
     
-    call Whisky_RoeSolve(CCTK_PASS_FTOF)
+    call GRHydro_RoeSolve(CCTK_PASS_FTOF)
 
     if (evolve_tracer .ne. 0) then
     
-      call Whisky_HLLE_Tracer(CCTK_PASS_FTOF)
+      call GRHydro_HLLE_Tracer(CCTK_PASS_FTOF)
 
     end if
     
   else if (CCTK_EQUALS(riemann_solver,"Marquina")) then   
     
-    call Whisky_Marquina(CCTK_PASS_FTOF)
+    call GRHydro_Marquina(CCTK_PASS_FTOF)
 
 !!$    Tracers are built directly in to the Marquina solver
 
@@ -96,27 +96,27 @@ subroutine RiemannSolvePolytype(CCTK_ARGUMENTS)
   
   if (CCTK_EQUALS(riemann_solver,"HLLE")) then
     
-    call Whisky_HLLE(CCTK_PASS_FTOF)
+    call GRHydro_HLLE(CCTK_PASS_FTOF)
 
     if (evolve_tracer .ne. 0) then
     
-      call Whisky_HLLE_Tracer(CCTK_PASS_FTOF)
+      call GRHydro_HLLE_Tracer(CCTK_PASS_FTOF)
 
     end if
     
   else if (CCTK_EQUALS(riemann_solver,"Roe")) then   
     
-    call Whisky_RoeSolve(CCTK_PASS_FTOF)
+    call GRHydro_RoeSolve(CCTK_PASS_FTOF)
 
     if (evolve_tracer .ne. 0) then
     
-      call Whisky_HLLE_Tracer(CCTK_PASS_FTOF)
+      call GRHydro_HLLE_Tracer(CCTK_PASS_FTOF)
 
     end if
     
   else if (CCTK_EQUALS(riemann_solver,"Marquina")) then   
     
-    call Whisky_Marquina(CCTK_PASS_FTOF)
+    call GRHydro_Marquina(CCTK_PASS_FTOF)
 
 !!$    Tracers are built directly in to the Marquina solver
 
@@ -147,7 +147,7 @@ end subroutine RiemannSolvePolytype
 
 subroutine RiemannSolveGeneral(CCTK_ARGUMENTS)
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
   
@@ -175,19 +175,19 @@ subroutine RiemannSolveGeneral(CCTK_ARGUMENTS)
 
   if (CCTK_EQUALS(riemann_solver,"HLLE")) then
     
-    call Whisky_HLLEGeneral(CCTK_PASS_FTOF)
+    call GRHydro_HLLEGeneral(CCTK_PASS_FTOF)
     
     if (evolve_tracer .ne. 0) then
     
-      call Whisky_HLLE_TracerGeneral(CCTK_PASS_FTOF)
+      call GRHydro_HLLE_TracerGeneral(CCTK_PASS_FTOF)
 
     end if
 
   else
           
-    do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-      do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-        do i = whisky_stencil, cctk_lsh(1) - whisky_stencil        
+    do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+      do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+        do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil        
           
 !!$        Set the left (p for plus) and right (m for minus, i+1) states
 
@@ -349,17 +349,17 @@ subroutine RiemannSolveGeneral(CCTK_ARGUMENTS)
     
     if (CCTK_EQUALS(riemann_solver,"Roe")) then   
       
-      call Whisky_RoeSolveGeneral(CCTK_PASS_FTOF)
+      call GRHydro_RoeSolveGeneral(CCTK_PASS_FTOF)
   
       if (evolve_tracer .ne. 0) then
     
-        call Whisky_HLLE_TracerGeneral(CCTK_PASS_FTOF)
+        call GRHydro_HLLE_TracerGeneral(CCTK_PASS_FTOF)
 
       end if
       
     else if (CCTK_EQUALS(riemann_solver,"Marquina")) then   
       
-      call Whisky_MarquinaGeneral(CCTK_PASS_FTOF)
+      call GRHydro_MarquinaGeneral(CCTK_PASS_FTOF)
       
 !!$    Tracers are built directly in to the Marquina solver
 
diff --git a/src/Whisky_RoeAverage.F90 b/src/GRHydro_RoeAverage.F90
index 0725667..b25adc2 100644
--- a/src/Whisky_RoeAverage.F90
+++ b/src/GRHydro_RoeAverage.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_RoeAverage.F90
+   @file      GRHydro_RoeAverage.F90
    @date      Sat Jan 26 01:54:09 2002
    @author    
    @desc 
diff --git a/src/Whisky_RoeSolver.F90 b/src/GRHydro_RoeSolver.F90
index aaf31c2..c661ed1 100644
--- a/src/Whisky_RoeSolver.F90
+++ b/src/GRHydro_RoeSolver.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_RoeSolver.F90
+   @file      GRHydro_RoeSolver.F90
    @date      Sat Jan 26 01:55:27 2002
    @author    
    @desc 
@@ -15,7 +15,7 @@
 #include "SpaceMask.h"
 
  /*@@
-   @routine    Whisky_RoeSolve
+   @routine    GRHydro_RoeSolve
    @date       Sat Jan 26 01:55:55 2002
    @author     Pedro Montero, Ian Hawke
    @desc 
@@ -30,9 +30,9 @@
 
 @@*/
 
-subroutine Whisky_RoeSolve(CCTK_ARGUMENTS)
+subroutine GRHydro_RoeSolve(CCTK_ARGUMENTS)
   
-  USE Whisky_Eigenproblem
+  USE GRHydro_Eigenproblem
   implicit none
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
@@ -67,9 +67,9 @@ subroutine Whisky_RoeSolve(CCTK_ARGUMENTS)
   
   f_roe = 0.d0
   
-  do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+  do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
 
 !!$        Set the left (p for plus) and right (m_i for minus, i+1) states
         
@@ -225,38 +225,38 @@ subroutine Whisky_RoeSolve(CCTK_ARGUMENTS)
 !!$ BEGIN: Check for NaN value
   if (w_lorentzave .ne. w_lorentzave) then
     write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (velxave, velyave, velzave))', velxave, velyave, velzave
-    call CCTK_WARN(Whisky_NaN_verbose, NaN_WarnLine)
+    call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine)
   endif
 !!$ END: Check for NaN value
 
           if (flux_direction == 1) then
-!!$            call prim2con(whisky_eos_handle,gxxh, gxyh, gxzh, gyyh, &
+!!$            call prim2con(GRHydro_eos_handle,gxxh, gxyh, gxzh, gyyh, &
 !!$                 gyzh, gzzh, avg_det, &
 !!$                 consh(1), consh(2), consh(3), consh(4), consh(5), rhoave, &
 !!$                 velxave, velyave, velzave, epsave, pressave, w_lorentzave)
-            call eigenproblem(whisky_eos_handle,rhoave, velxave, &
+            call eigenproblem(GRHydro_eos_handle,rhoave, velxave, &
                  velyave, velzave, epsave, w_lorentzave, &
                  gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, &
                  usendh, avg_alp,avg_beta,qdiff(1),qdiff(2), &
                  qdiff(3),qdiff(4),qdiff(5),roeflux(1),roeflux(2),&
                  roeflux(3),roeflux(4),roeflux(5))
           else if (flux_direction == 2) then
-!!$            call prim2con(whisky_eos_handle,gyyh, gyzh, gxyh, gzzh, &
+!!$            call prim2con(GRHydro_eos_handle,gyyh, gyzh, gxyh, gzzh, &
 !!$                 gxzh, gxxh, avg_det, &
 !!$                 consh(1), consh(3), consh(4), consh(2), consh(5), rhoave, &
 !!$                 velyave, velzave, velxave, epsave, pressave, w_lorentzave)
-            call eigenproblem(whisky_eos_handle,rhoave, velyave, &
+            call eigenproblem(GRHydro_eos_handle,rhoave, velyave, &
                  velzave, velxave, epsave, w_lorentzave, &
                  gyyh,gyzh,gxyh,gzzh,gxzh,gxxh, &
                  usendh, avg_alp,avg_beta,qdiff(1),qdiff(3), &
                  qdiff(4),qdiff(2),qdiff(5),roeflux(1),roeflux(3),&
                  roeflux(4),roeflux(2),roeflux(5))
           else if (flux_direction == 3) then
-!!$            call prim2con(whisky_eos_handle,gzzh, gxzh, gyzh, gxxh, &
+!!$            call prim2con(GRHydro_eos_handle,gzzh, gxzh, gyzh, gxxh, &
 !!$                 gxyh, gyyh, avg_det, &
 !!$                 consh(1), consh(4), consh(2), consh(3), consh(5), rhoave, &
 !!$                 velzave, velxave, velyave, epsave, pressave, w_lorentzave)
-            call eigenproblem(whisky_eos_handle,rhoave, velzave, &
+            call eigenproblem(GRHydro_eos_handle,rhoave, velzave, &
                  velxave, velyave, epsave, w_lorentzave, &
                  gzzh,gxzh,gyzh,gxxh,gxyh,gyyh, &
                  usendh, avg_alp,avg_beta,qdiff(1),qdiff(4), &
@@ -328,10 +328,10 @@ subroutine Whisky_RoeSolve(CCTK_ARGUMENTS)
     enddo
   enddo
     
-end subroutine Whisky_RoeSolve
+end subroutine GRHydro_RoeSolve
 
  /*@@
-   @routine    Whisky_RoeSolveGeneral
+   @routine    GRHydro_RoeSolveGeneral
    @date       Sat Jan 26 01:55:55 2002
    @author     Pedro Montero, Ian Hawke
    @desc 
@@ -346,10 +346,10 @@ end subroutine Whisky_RoeSolve
 
 @@*/
 
-subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS)
+subroutine GRHydro_RoeSolveGeneral(CCTK_ARGUMENTS)
   
-  USE Whisky_Scalars
-  use Whisky_Eigenproblem
+  USE GRHydro_Scalars
+  use GRHydro_Eigenproblem
 
   implicit none
 
@@ -383,9 +383,9 @@ subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS)
     call CCTK_WARN(0, "Flux direction not x,y,z")
   end if
   
-  do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+  do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
 
 !!$        Set the left (p for plus) and right (m_i for minus, i+1) states
         
@@ -433,9 +433,9 @@ subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS)
   
   ierr = EOS_SetGFs(cctkGH, EOS_RoeAverageCall)
   
-  do k = whisky_stencil, cctk_lsh(3) - whisky_stencil
-    do j = whisky_stencil, cctk_lsh(2) - whisky_stencil
-      do i = whisky_stencil, cctk_lsh(1) - whisky_stencil
+  do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil
+    do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil
+      do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil
 
 !!$        Set the left (p for plus) and right (m_i for minus, i+1) states
         
@@ -584,4 +584,4 @@ subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS)
     enddo
   enddo
     
-end subroutine Whisky_RoeSolveGeneral
+end subroutine GRHydro_RoeSolveGeneral
diff --git a/src/Whisky_Scalars.F90 b/src/GRHydro_Scalars.F90
index d2dfb8c..2cc245e 100644
--- a/src/Whisky_Scalars.F90
+++ b/src/GRHydro_Scalars.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Scalars.F90
+   @file      GRHydro_Scalars.F90
    @date      Mon Feb 25 11:11:23 2002
    @author    
    @desc 
@@ -12,7 +12,7 @@
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
- module Whisky_Scalars
+ module GRHydro_Scalars
 
    implicit none
 
@@ -27,4 +27,4 @@
 
    CCTK_REAL :: eosgeneral_pmin
    
- end module Whisky_Scalars
+ end module GRHydro_Scalars
diff --git a/src/Whisky_Set_TP_GF.c b/src/GRHydro_Set_TP_GF.c
index f8c1ed7..6e9fd1a 100644
--- a/src/Whisky_Set_TP_GF.c
+++ b/src/GRHydro_Set_TP_GF.c
@@ -39,11 +39,11 @@ void Set_Trivial_Riemann_Problem_Grid_Function(CCTK_ARGUMENTS)
           point = CCTK_GFINDEX3D(cctkGH,i,j,k);
           if (SpaceMask_CheckStateBits(space_mask, point, type, state))
           {
-            whisky_trivial_rp_gf_x[point]=1;
+            GRHydro_trivial_rp_gf_x[point]=1;
           }
           else
           {
-            whisky_trivial_rp_gf_x[point]=0;
+            GRHydro_trivial_rp_gf_x[point]=0;
           }
         }
   }
@@ -58,11 +58,11 @@ void Set_Trivial_Riemann_Problem_Grid_Function(CCTK_ARGUMENTS)
           point = CCTK_GFINDEX3D(cctkGH,i,j,k);
           if (SpaceMask_CheckStateBits(space_mask, point, type, state))
           {
-            whisky_trivial_rp_gf_y[point]=1;
+            GRHydro_trivial_rp_gf_y[point]=1;
           }
           else
           {
-            whisky_trivial_rp_gf_y[point]=0;
+            GRHydro_trivial_rp_gf_y[point]=0;
           }
         }
   }
@@ -77,11 +77,11 @@ void Set_Trivial_Riemann_Problem_Grid_Function(CCTK_ARGUMENTS)
           point = CCTK_GFINDEX3D(cctkGH,i,j,k);
           if (SpaceMask_CheckStateBits(space_mask, point, type, state))
           {
-            whisky_trivial_rp_gf_z[point]=1;
+            GRHydro_trivial_rp_gf_z[point]=1;
           }
           else
           {
-            whisky_trivial_rp_gf_z[point]=0;
+            GRHydro_trivial_rp_gf_z[point]=0;
           }
         }
   }
diff --git a/src/Whisky_Shift.F90 b/src/GRHydro_Shift.F90
index 075c189..415da4f 100644
--- a/src/Whisky_Shift.F90
+++ b/src/GRHydro_Shift.F90
@@ -1,5 +1,5 @@
 /*@@
-  @file      Whisky_Shift.F90
+  @file      GRHydro_Shift.F90
   @date      Fri Mar 14 17:36:37 2003
   @author    Ian Hawke
   @desc 
@@ -14,7 +14,7 @@
 #include "cctk_Functions.h"
 
  /*@@
-   @routine    Whisky_ComovingShift
+   @routine    GRHydro_ComovingShift
    @date       Fri Mar 14 17:37:30 2003
    @author     Ian Hawke
    @desc 
@@ -28,7 +28,7 @@
 
 @@*/
 
-subroutine Whisky_ComovingShift(CCTK_ARGUMENTS)
+subroutine GRHydro_ComovingShift(CCTK_ARGUMENTS)
       
   implicit none
   
@@ -64,7 +64,7 @@ subroutine Whisky_ComovingShift(CCTK_ARGUMENTS)
     
     if (CCTK_EQUALS(comoving_v_method,"projected")) then
       
-      where (rho > 10.d0 * whisky_rho_min)
+      where (rho > 10.d0 * GRHydro_rho_min)
         
         betax = -comoving_factor*x*alp*(x*vel(:,:,:,1) + y*vel(:,:,:,2) + z*vel(:,:,:,3)) / &
              (r**2 + 1.d-10) * attenuate
@@ -83,7 +83,7 @@ subroutine Whisky_ComovingShift(CCTK_ARGUMENTS)
       
     else if (CCTK_EQUALS(comoving_v_method,"components")) then
       
-      where (rho > 10.d0 * whisky_rho_min)
+      where (rho > 10.d0 * GRHydro_rho_min)
         
         betax = comoving_factor * alp * x / (r + 1.d-10) * sqrt( (&
              (vel_p(:,:,:,1) - betax_p / alp_p)**2 + &
@@ -116,10 +116,10 @@ subroutine Whisky_ComovingShift(CCTK_ARGUMENTS)
     
   end if
   
-end subroutine Whisky_ComovingShift
+end subroutine GRHydro_ComovingShift
 
  /*@@
-   @routine    Whisky_SetUpCoords
+   @routine    GRHydro_SetUpCoords
    @date       Fri Mar 14 19:11:13 2003
    @author     Ian Hawke
    @desc 
@@ -134,20 +134,20 @@ end subroutine Whisky_ComovingShift
 
 @@*/
 
-subroutine Whisky_SetUpCoords(CCTK_ARGUMENTS)
+subroutine GRHydro_SetUpCoords(CCTK_ARGUMENTS)
       
   implicit none
   
   DECLARE_CCTK_ARGUMENTS
 
-  whisky_x = x
-  whisky_y = y
-  whisky_z = z
+  GRHydro_x = x
+  GRHydro_y = y
+  GRHydro_z = z
 
-end subroutine Whisky_SetUpCoords
+end subroutine GRHydro_SetUpCoords
 
  /*@@
-   @routine    Whisky_EvolveCoords
+   @routine    GRHydro_EvolveCoords
    @date       Wed Mar 19 12:04:20 2003
    @author     Ian Hawke
    @desc 
@@ -161,14 +161,14 @@ end subroutine Whisky_SetUpCoords
 
 @@*/
 
-subroutine Whisky_EvolveCoords(CCTK_ARGUMENTS)
+subroutine GRHydro_EvolveCoords(CCTK_ARGUMENTS)
       
   implicit none
   
   DECLARE_CCTK_ARGUMENTS
 
-  whisky_x_rhs = -betax
-  whisky_y_rhs = -betay
-  whisky_z_rhs = -betaz
+  GRHydro_x_rhs = -betax
+  GRHydro_y_rhs = -betay
+  GRHydro_z_rhs = -betaz
 
-end subroutine Whisky_EvolveCoords
+end subroutine GRHydro_EvolveCoords
diff --git a/src/Whisky_SlopeLimiter.F90 b/src/GRHydro_SlopeLimiter.F90
index e0d1b41..ffdfc3a 100644
--- a/src/Whisky_SlopeLimiter.F90
+++ b/src/GRHydro_SlopeLimiter.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_SlopeLimiter.F90
+   @file      GRHydro_SlopeLimiter.F90
    @date      Sat Jan 26 02:00:32 2002
    @author    
    @desc 
@@ -32,7 +32,7 @@
 
 subroutine slopelimiter(r, delta)
   
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
   
diff --git a/src/Whisky_Source.F90 b/src/GRHydro_Source.F90
index e6400cb..b2833a8 100644
--- a/src/Whisky_Source.F90
+++ b/src/GRHydro_Source.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Source.F90
+   @file      GRHydro_Source.F90
    @date      Sat Jan 26 02:03:56 2002
    @author    Ian Hawke
    @desc 
@@ -110,9 +110,9 @@ subroutine SourceTerms(CCTK_ARGUMENTS)
   
   if (spatial_order > 2) then
     !$OMP PARALLEL DO PRIVATE(i, j)
-    do k = 1 + whisky_stencil, nz - whisky_stencil
-      do j = 1 + whisky_stencil, ny - whisky_stencil
-        do i = 1 + whisky_stencil, nx - whisky_stencil
+    do k = 1 + GRHydro_stencil, nz - GRHydro_stencil
+      do j = 1 + GRHydro_stencil, ny - GRHydro_stencil
+        do i = 1 + GRHydro_stencil, nx - GRHydro_stencil
           if ((i < 3).or.(i > cctk_lsh(1) - 2).or. &
                (j < 3).or.(j > cctk_lsh(2) - 2).or. &
                (k < 3).or.(k > cctk_lsh(3) - 2) ) then
@@ -142,9 +142,9 @@ subroutine SourceTerms(CCTK_ARGUMENTS)
   !$OMP dx_psi4,dy_psi4,dz_psi4,shiftshiftk,shiftkx,shiftky,shiftkz,&
   !$OMP sumTK,halfshiftdgx,halfshiftdgy,halfshiftdgz,&
   !$OMP halfTdgx,halfTdgy,halfTdgz,invalp,invalp2)
-  do k=1 + whisky_stencil,nz - whisky_stencil
-    do j=1 + whisky_stencil,ny - whisky_stencil
-      do i=1 + whisky_stencil,nx - whisky_stencil
+  do k=1 + GRHydro_stencil,nz - GRHydro_stencil
+    do j=1 + GRHydro_stencil,ny - GRHydro_stencil
+      do i=1 + GRHydro_stencil,nx - GRHydro_stencil
 
         local_spatial_order = spatial_order
         if (force_spatial_second_order(i,j,k)) then
diff --git a/src/Whisky_Startup.F90 b/src/GRHydro_Startup.F90
index 883a222..444e944 100644
--- a/src/Whisky_Startup.F90
+++ b/src/GRHydro_Startup.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Startup.F90
+   @file      GRHydro_Startup.F90
    @date      Sun Feb 10 00:02:52 2002
    @author    Ian Hawke
    @desc 
@@ -15,7 +15,7 @@
 #include "util_Table.h"
 
  /*@@
-   @routine    Whisky_Startup
+   @routine    GRHydro_Startup
    @date       Sun Feb 10 00:03:09 2002
    @author     Ian Hawke
    @desc 
@@ -29,9 +29,9 @@
 
 @@*/
 
-integer function Whisky_Startup()
+integer function GRHydro_Startup()
 
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
 
   implicit none
 
@@ -43,10 +43,10 @@ integer function Whisky_Startup()
   CCTK_INT, dimension(4) :: dep_gfs
   character(len=256) :: eos_name_param, var_names_param, var_names, var_gfs
 
-  call CCTK_RegisterBanner(ierr, "Whisky: relativistic hydrodynamics, no ice.")
+  call CCTK_RegisterBanner(ierr, "GRHydro: relativistic hydrodynamics, no ice.")
   
 !!$ The number of independent variables is different in the polytropic or general case
-  if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then
+  if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then
     n_base_indep_gfs = 1
   else
     n_base_indep_gfs = 2
@@ -75,7 +75,7 @@ integer function Whisky_Startup()
          eos_name_param, "EOS Name")
     call CCTK_FortranString(strlen, eosgeneral_indep_names, &
          var_names_param)
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then
       var_names = "Rho "//var_names_param(1:strlen)
     else
       var_names = "Rho SpecificInternalEnergy "//var_names_param(1:strlen)
@@ -86,7 +86,7 @@ integer function Whisky_Startup()
     call Util_TableSetString(ierr, table_handle, &
          "Pressure DPressureDSpecificInternalEnergy c_s^2", &
          "Dependent variable names")
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then
       call Util_TableSetInt(ierr, table_handle, &
            1 + eosgeneral_n_indeps, "N independent variables")
     else
@@ -96,13 +96,13 @@ integer function Whisky_Startup()
     call Util_TableSetInt(ierr, table_handle, &
          3, "N dependent variables")
 
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
-      call CCTK_VarIndex(indep_gfs(1), "whisky::rhoplus")
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
+      call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhoplus")
     else
-      call CCTK_VarIndex(indep_gfs(1), "whisky::rhoplus")
-      call CCTK_VarIndex(indep_gfs(2), "whisky::epsplus")
+      call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhoplus")
+      call CCTK_VarIndex(indep_gfs(2), "GRHydro::epsplus")
     end if
-    call CCTK_VarIndex(dep_gfs(1), "whisky::pressplus")
+    call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressplus")
     call CCTK_VarIndex(dep_gfs(2), "GRHydro::eos_dpdeps_p")
     call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_cs2_p")
     
@@ -126,7 +126,7 @@ integer function Whisky_Startup()
       
     end do
     
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, &
            indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs")
     else
@@ -141,13 +141,13 @@ integer function Whisky_Startup()
 !!$    Second, "Minus" boundary extended
 !!$    Many of the table entries are the same
     
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
-      call CCTK_VarIndex(indep_gfs(1), "whisky::rhominus")
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
+      call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhominus")
     else
-      call CCTK_VarIndex(indep_gfs(1), "whisky::rhominus")
-      call CCTK_VarIndex(indep_gfs(2), "whisky::epsminus")
+      call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhominus")
+      call CCTK_VarIndex(indep_gfs(2), "GRHydro::epsminus")
     end if
-    call CCTK_VarIndex(dep_gfs(1), "whisky::pressminus")
+    call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressminus")
     call CCTK_VarIndex(dep_gfs(2), "GRHydro::eos_dpdeps_m")
     call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_cs2_m")
 
@@ -171,7 +171,7 @@ integer function Whisky_Startup()
       
     end do
         
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, &
            indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs")
     else
@@ -185,7 +185,7 @@ integer function Whisky_Startup()
 
 !!$    Third, the "Average" state for the Roe solver
     
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call CCTK_VarIndex(indep_gfs(1), "GRHydro::rho_ave")
     else
       call CCTK_VarIndex(indep_gfs(1), "GRHydro::rho_ave")
@@ -215,7 +215,7 @@ integer function Whisky_Startup()
         
     end do
     
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, &
            indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs")
     else
@@ -230,7 +230,7 @@ integer function Whisky_Startup()
 !!$    Fourth, the "Con2Prim" call.
 !!$    This sets different variables.
 
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call CCTK_VarIndex(indep_gfs(1), "HydroBase::rho")
       call Util_TableSetString(ierr, table_handle, &
            "Pressure DPressureDSpecificInternalEnergy DPressureDRho SpecificInternalEnergy", &
@@ -250,7 +250,7 @@ integer function Whisky_Startup()
       call CCTK_VarIndex(dep_gfs(3), "GRHydro::eos_dpdrho_temp")
     end if
 
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, &
            indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs")
       call Util_TableSetIntArray(ierr, table_handle, 4, dep_gfs, &
@@ -267,20 +267,20 @@ integer function Whisky_Startup()
 !!$    Fifth, the "Prim2Con" (boundary) calls.
 !!$    Again, different variables are set.
 
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
-      call CCTK_VarIndex(indep_gfs(1), "whisky::rhominus")
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
+      call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhominus")
       call Util_TableSetString(ierr, table_handle, &
            "Pressure SpecificInternalEnergy", &
            "Dependent variable names")
-      call CCTK_VarIndex(dep_gfs(1), "whisky::pressminus")
-      call CCTK_VarIndex(dep_gfs(2), "whisky::epsminus")
+      call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressminus")
+      call CCTK_VarIndex(dep_gfs(2), "GRHydro::epsminus")
     else
-      call CCTK_VarIndex(indep_gfs(1), "whisky::rhominus")
-      call CCTK_VarIndex(indep_gfs(2), "whisky::epsminus")
+      call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhominus")
+      call CCTK_VarIndex(indep_gfs(2), "GRHydro::epsminus")
       call Util_TableSetString(ierr, table_handle, &
            "Pressure", &
            "Dependent variable names")
-      call CCTK_VarIndex(dep_gfs(1), "whisky::pressminus")
+      call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressminus")
     end if
 
     call CCTK_FortranString(strlen, eosgeneral_indep_minus_gfs, var_gfs)
@@ -303,7 +303,7 @@ integer function Whisky_Startup()
         
     end do
     
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, &
            indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs")
       call Util_TableSetIntArray(ierr, table_handle, 2, dep_gfs, &
@@ -317,20 +317,20 @@ integer function Whisky_Startup()
     
     EOS_Prim2ConBndCallMinus = EOS_SetupCall(table_handle)
 
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
-      call CCTK_VarIndex(indep_gfs(1), "whisky::rhoplus")
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
+      call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhoplus")
       call Util_TableSetString(ierr, table_handle, &
            "Pressure SpecificInternalEnergy", &
            "Dependent variable names")
-      call CCTK_VarIndex(dep_gfs(1), "whisky::pressplus")
-      call CCTK_VarIndex(dep_gfs(2), "whisky::epsplus")
+      call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressplus")
+      call CCTK_VarIndex(dep_gfs(2), "GRHydro::epsplus")
     else
-      call CCTK_VarIndex(indep_gfs(1), "whisky::rhoplus")
-      call CCTK_VarIndex(indep_gfs(2), "whisky::epsplus")
+      call CCTK_VarIndex(indep_gfs(1), "GRHydro::rhoplus")
+      call CCTK_VarIndex(indep_gfs(2), "GRHydro::epsplus")
       call Util_TableSetString(ierr, table_handle, &
            "Pressure", &
            "Dependent variable names")
-      call CCTK_VarIndex(dep_gfs(1), "whisky::pressplus")
+      call CCTK_VarIndex(dep_gfs(1), "GRHydro::pressplus")
     end if
 
     call CCTK_FortranString(strlen, eosgeneral_indep_plus_gfs, var_gfs)
@@ -353,7 +353,7 @@ integer function Whisky_Startup()
         
     end do
 
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, &
            indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs")
       call Util_TableSetIntArray(ierr, table_handle, 2, dep_gfs, &
@@ -369,7 +369,7 @@ integer function Whisky_Startup()
 
 !!$    Sixth, the Prim2Con (cell centre) calls
 
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call CCTK_VarIndex(indep_gfs(1), "HydroBase::rho")
       call Util_TableSetString(ierr, table_handle, &
            "Pressure SpecificInternalEnergy", &
@@ -405,7 +405,7 @@ integer function Whisky_Startup()
         
     end do
 
-    if (CCTK_EQUALS(whisky_eos_type, "Polytype")) then    
+    if (CCTK_EQUALS(GRHydro_eos_type, "Polytype")) then    
       call Util_TableSetIntArray(ierr, table_handle, 1 + eosgeneral_n_indeps, &
            indep_gfs(1:1 + eosgeneral_n_indeps), "Independent GFs")
       call Util_TableSetIntArray(ierr, table_handle, 2, dep_gfs, &
@@ -423,6 +423,6 @@ integer function Whisky_Startup()
 
   deallocate(indep_gfs)
   
-  Whisky_Startup = 0
+  GRHydro_Startup = 0
 
-end function Whisky_Startup
+end function GRHydro_Startup
diff --git a/src/Whisky_TVDReconstruct.F90 b/src/GRHydro_TVDReconstruct.F90
index 4459da2..c6865c6 100644
--- a/src/Whisky_TVDReconstruct.F90
+++ b/src/GRHydro_TVDReconstruct.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_TVDReconstruct.F90
+   @file      GRHydro_TVDReconstruct.F90
    @date      Sat Jan 26 02:11:44 2002
    @author    Luca Baiotti
    @desc 
@@ -32,7 +32,7 @@
 subroutine tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
      orig, bextp, bextm, trivial_rp, hydro_excision_mask)
   
-  USE Whisky_Scalars
+  USE GRHydro_Scalars
   
   implicit none
   
@@ -53,21 +53,21 @@ subroutine tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
 
   trivial_rp = .false.
     !$OMP PARALLEL DO PRIVATE(i,j,dupw,dloc,delta,ratio,hdelta)
-    do k = whisky_stencil, nz-whisky_stencil+1
-      do j = whisky_stencil, ny-whisky_stencil+1
-        do i = whisky_stencil, nx-whisky_stencil+1
-          if (whisky_enable_internal_excision /= 0 .and. &
+    do k = GRHydro_stencil, nz-GRHydro_stencil+1
+      do j = GRHydro_stencil, ny-GRHydro_stencil+1
+        do i = GRHydro_stencil, nx-GRHydro_stencil+1
+          if (GRHydro_enable_internal_excision /= 0 .and. &
               (hydro_excision_mask(i,j,k) .ne. 0)) then
             trivial_rp(i-xoffset, j-yoffset, k-zoffset) = .true.
             trivial_rp(i, j, k) = .true.
             bextm(i, j, k) = orig(i, j, k)
             bextp(i, j, k) = orig(i, j, k)
-            if (whisky_enable_internal_excision /= 0 .and. &
+            if (GRHydro_enable_internal_excision /= 0 .and. &
                 (hydro_excision_mask(i+xoffset,j+yoffset,k+zoffset) .eq. 0)) then
               bextm(i, j, k) = orig(i+xoffset, j+yoffset, k+zoffset)
               bextp(i, j, k) = orig(i+xoffset, j+yoffset, k+zoffset)
             end if
-          else if (whisky_enable_internal_excision /= 0 .and. &
+          else if (GRHydro_enable_internal_excision /= 0 .and. &
                    ((hydro_excision_mask(i-xoffset,j-yoffset,k-zoffset) .ne. 0) .or. &
                     (hydro_excision_mask(i+xoffset,j+yoffset,k+zoffset) .ne. 0))) then
             bextm(i, j, k) = orig(i, j, k)
diff --git a/src/Whisky_Tmunu.F90 b/src/GRHydro_Tmunu.F90
index ff3b720..6ba34e3 100644
--- a/src/Whisky_Tmunu.F90
+++ b/src/GRHydro_Tmunu.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Tmunu.F90
+   @file      GRHydro_Tmunu.F90
    @date      Thu Apr 16 19:38:40 2009
    @author    Ian Hawke
    @histpry
@@ -65,7 +65,7 @@
 #define vely(i,j,k) vel(i,j,k,2)
 #define velz(i,j,k) vel(i,j,k,3)
 
- subroutine Whisky_Tmunu(CCTK_ARGUMENTS)
+ subroutine GRHydro_Tmunu(CCTK_ARGUMENTS)
 
    implicit none
 
@@ -172,4 +172,4 @@
 
    return
  
- end subroutine Whisky_Tmunu
+ end subroutine GRHydro_Tmunu
diff --git a/src/Whisky_UpdateMask.F90 b/src/GRHydro_UpdateMask.F90
index d67600f..3753797 100644
--- a/src/Whisky_UpdateMask.F90
+++ b/src/GRHydro_UpdateMask.F90
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_UpdateMask.F90
+   @file      GRHydro_UpdateMask.F90
    @date      Wed Mar 13 14:18:38 2002
    @author    
    @desc 
@@ -17,7 +17,7 @@
 #define vely(i,j,k) vel(i,j,k,2)
 #define velz(i,j,k) vel(i,j,k,3)
 
-subroutine WhiskyUpdateAtmosphereMask(CCTK_ARGUMENTS)
+subroutine GRHydroUpdateAtmosphereMask(CCTK_ARGUMENTS)
 
   implicit none
   
@@ -38,7 +38,7 @@ subroutine WhiskyUpdateAtmosphereMask(CCTK_ARGUMENTS)
   do k = 1, cctk_lsh(3)
     do j = 1, cctk_lsh(2)
       do i = 1, cctk_lsh(1)
-        if ( whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0) .or. &
+        if ( GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0) .or. &
              (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, \
                                           type_bits, atmosphere)) .or. &
              (tau(i,j,k) + frac * taurhs(i,j,k) .le. 0.d0) .or. &
@@ -55,10 +55,10 @@ subroutine WhiskyUpdateAtmosphereMask(CCTK_ARGUMENTS)
   end do
   !$OMP END PARALLEL DO
 
-end subroutine WhiskyUpdateAtmosphereMask
+end subroutine GRHydroUpdateAtmosphereMask
 
  /*@@
-   @routine    Whisky_SetupMask
+   @routine    GRHydro_SetupMask
    @date       Thu Jun 20 13:27:28 2002
    @author     Ian Hawke
    @desc 
@@ -72,7 +72,7 @@ end subroutine WhiskyUpdateAtmosphereMask
 
 @@*/
 
-subroutine Whisky_SetupMask(CCTK_ARGUMENTS)
+subroutine GRHydro_SetupMask(CCTK_ARGUMENTS)
 
   implicit none
 
@@ -111,10 +111,10 @@ subroutine Whisky_SetupMask(CCTK_ARGUMENTS)
 
   call CCTK_INFO("Setting up the atmosphere mask: all points are not_atmosphere")
   
-end subroutine Whisky_SetupMask
+end subroutine GRHydro_SetupMask
 
  /*@@
-   @routine    Whisky_InitAtmosMask
+   @routine    GRHydro_InitAtmosMask
    @date       Thu Jun 20 13:27:28 2002
    @author     Ian Hawke
    @desc 
@@ -128,7 +128,7 @@ end subroutine Whisky_SetupMask
 
 @@*/
 
-subroutine Whisky_InitAtmosMask(CCTK_ARGUMENTS)
+subroutine GRHydro_InitAtmosMask(CCTK_ARGUMENTS)
 
   implicit none
 
@@ -144,7 +144,7 @@ subroutine Whisky_InitAtmosMask(CCTK_ARGUMENTS)
     do j = 1, cctk_lsh(2)
       do i = 1, cctk_lsh(1)
 
-        if (rho(i,j,k) .le. whisky_rho_min) then
+        if (rho(i,j,k) .le. GRHydro_rho_min) then
   
           SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits, atmosphere)
           atmosphere_mask(i,j,k) = 1
@@ -157,10 +157,10 @@ subroutine Whisky_InitAtmosMask(CCTK_ARGUMENTS)
 
   call CCTK_INFO("Setting up the atmosphere mask: points with rho<rho_min are set to be atmosphere")
   
-end subroutine Whisky_InitAtmosMask
+end subroutine GRHydro_InitAtmosMask
 
  /*@@
-   @routine    Whisky_AtmosphereReset
+   @routine    GRHydro_AtmosphereReset
    @date       Thu Jun 20 13:30:51 2002
    @author     Ian Hawke
    @desc 
@@ -174,7 +174,7 @@ end subroutine Whisky_InitAtmosMask
 
 @@*/
 
-subroutine Whisky_AtmosphereReset(CCTK_ARGUMENTS)
+subroutine GRHydro_AtmosphereReset(CCTK_ARGUMENTS)
 
   implicit none
 
@@ -205,14 +205,14 @@ subroutine Whisky_AtmosphereReset(CCTK_ARGUMENTS)
 !!$             & (SpaceMask_CheckStateBitsF90(space_mask,i, j, k, type_bits,\
 !!$                    atmosphere)) 
 
-          rho(i,j,k) = whisky_rho_min
+          rho(i,j,k) = GRHydro_rho_min
           velx(i,j,k) = 0.0d0
           vely(i,j,k) = 0.0d0
           velz(i,j,k) = 0.0d0
           if (conformal_state .eq. 0) then
             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 prim2conpolytype(whisky_polytrope_handle, &
+            call prim2conpolytype(GRHydro_polytrope_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), scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
@@ -223,7 +223,7 @@ subroutine Whisky_AtmosphereReset(CCTK_ARGUMENTS)
             call SpatialDeterminant(psi4pt*gxx(i,j,k), psi4pt*gxy(i,j,k), &
                  psi4pt*gxz(i,j,k), psi4pt*gyy(i,j,k), psi4pt*gyz(i,j,k), &
                  psi4pt*gzz(i,j,k), det)
-            call prim2conpolytype(whisky_polytrope_handle, &
+            call prim2conpolytype(GRHydro_polytrope_handle, &
                  psi4pt*gxx(i,j,k), psi4pt*gxy(i,j,k), psi4pt*gxz(i,j,k), &
                  psi4pt*gyy(i,j,k), psi4pt*gyz(i,j,k), psi4pt*gzz(i,j,k), &
                  det, dens(i,j,k), scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), &
@@ -242,6 +242,6 @@ subroutine Whisky_AtmosphereReset(CCTK_ARGUMENTS)
     end do
   end do
 
-!!$  call Whisky_Boundaries(CCTK_PASS_FTOF)
+!!$  call GRHydro_Boundaries(CCTK_PASS_FTOF)
 
-end subroutine Whisky_AtmosphereReset
+end subroutine GRHydro_AtmosphereReset
diff --git a/src/Whisky_Weights.c b/src/GRHydro_Weights.c
index 25b0549..6e01c95 100644
--- a/src/Whisky_Weights.c
+++ b/src/GRHydro_Weights.c
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_Weights.F90
+   @file      GRHydro_Weights.F90
    @date      Sat Jan 26 01:40:14 2002
    @author    Ian Hawke
    @desc 
@@ -18,7 +18,7 @@
 #include "FishEye.h"
 
  /*@@
-   @routine    Whisky_Weights
+   @routine    GRHydro_Weights
    @date       Sat Jan 26 01:41:02 2002
    @author     Ian Hawke
    @desc 
@@ -32,7 +32,7 @@
 
 @@*/
 
-void Whisky_Weights(CCTK_ARGUMENTS)
+void GRHydro_Weights(CCTK_ARGUMENTS)
 {
   
   DECLARE_CCTK_ARGUMENTS;
@@ -194,11 +194,11 @@ void Whisky_Weights(CCTK_ARGUMENTS)
 
 
  /*@@
-   @routine    Whisky_Fisheye_Analysis
+   @routine    GRHydro_Fisheye_Analysis
    @date       
    @author     Christian Ott, Ian Hawke
    @desc 
-   Prepare output of Whisky variables in physical coordinates
+   Prepare output of GRHydro variables in physical coordinates
    @enddesc 
    @calls     
    @calledby   
@@ -208,7 +208,7 @@ void Whisky_Weights(CCTK_ARGUMENTS)
 
 @@*/
 
-int Whisky_Fisheye_Analysis(CCTK_ARGUMENTS)
+int GRHydro_Fisheye_Analysis(CCTK_ARGUMENTS)
 {
 
   DECLARE_CCTK_ARGUMENTS
diff --git a/src/Utils.F90 b/src/Utils.F90
index 446b39d..440c945 100644
--- a/src/Utils.F90
+++ b/src/Utils.F90
@@ -13,7 +13,7 @@
 #include "cctk_Arguments.h"
 
  /*@@
-   @routine    Whisky_RefinementLevel
+   @routine    GRHydro_RefinementLevel
    @date       July 2005
    @author     
    @desc 
@@ -26,14 +26,14 @@
    @endhistory 
 @@*/
 
-subroutine Whisky_RefinementLevel(CCTK_ARGUMENTS)
+subroutine GRHydro_RefinementLevel(CCTK_ARGUMENTS)
 
   implicit none
   DECLARE_CCTK_ARGUMENTS
 
-  whisky_reflevel = aint(log10(dble(cctk_levfac(1)))/log10(2.0d0))
+  GRHydro_reflevel = aint(log10(dble(cctk_levfac(1)))/log10(2.0d0))
 
-end subroutine Whisky_RefinementLevel
+end subroutine GRHydro_RefinementLevel
 
 
  /*@@
@@ -146,11 +146,11 @@ subroutine SetMetricTemps(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),&
-               Whisky_det(i,j,k))
+               GRHydro_det(i,j,k))
           call UpperMetric(&
-               Whisky_uxx(i,j,k),Whisky_uxy(i,j,k),Whisky_uxz(i,j,k),&
-               Whisky_uyy(i,j,k),Whisky_uyz(i,j,k),Whisky_uzz(i,j,k),&
-               Whisky_det(i,j,k),&
+               GRHydro_uxx(i,j,k),GRHydro_uxy(i,j,k),GRHydro_uxz(i,j,k),&
+               GRHydro_uyy(i,j,k),GRHydro_uyz(i,j,k),GRHydro_uzz(i,j,k),&
+               GRHydro_det(i,j,k),&
                gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),&
                gyy(i,j,k),gyz(i,j,k),gzz(i,j,k))        
         else
@@ -158,11 +158,11 @@ subroutine SetMetricTemps(CCTK_ARGUMENTS)
           call SpatialDeterminant(&
                psi4pt*gxx(i,j,k),psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),&
                psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),&
-               Whisky_det(i,j,k))
+               GRHydro_det(i,j,k))
           call UpperMetric(&
-               Whisky_uxx(i,j,k),Whisky_uxy(i,j,k),Whisky_uxz(i,j,k),&
-               Whisky_uyy(i,j,k),Whisky_uyz(i,j,k),Whisky_uzz(i,j,k),&
-               Whisky_det(i,j,k),&
+               GRHydro_uxx(i,j,k),GRHydro_uxy(i,j,k),GRHydro_uxz(i,j,k),&
+               GRHydro_uyy(i,j,k),GRHydro_uyz(i,j,k),GRHydro_uzz(i,j,k),&
+               GRHydro_det(i,j,k),&
                psi4pt*gxx(i,j,k),psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),&
                psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k))
         end if
diff --git a/src/include/Whisky_EMTensor.inc b/src/include/GRHydro_EMTensor.inc
index e7e5e2d..4318c16 100644
--- a/src/include/Whisky_EMTensor.inc
+++ b/src/include/GRHydro_EMTensor.inc
@@ -1,5 +1,5 @@
  /*@@
-   @file      Whisky_EMTensor.inc
+   @file      GRHydro_EMTensor.inc
    @date      Sat Jan 26 02:03:56 2002
    @author    Ian Hawke
    @desc 
diff --git a/src/include/Whisky_EMTensor_temps.inc b/src/include/GRHydro_EMTensor_temps.inc
index 35282fb..c4d0c1d 100644
--- a/src/include/Whisky_EMTensor_temps.inc
+++ b/src/include/GRHydro_EMTensor_temps.inc
@@ -1,9 +1,9 @@
  /*@@
-   @file      Whisky_EMTensor_temps.inc
+   @file      GRHydro_EMTensor_temps.inc
    @date      Sat Jan 26 02:03:56 2002
    @author    Ian Hawke
    @desc 
-     The declaration of the temporaries used in Whisky_EMTensor.inc.
+     The declaration of the temporaries used in GRHydro_EMTensor.inc.
    @enddesc 
  @@*/
 #include "SpaceMask.h"
diff --git a/src/make.code.defn b/src/make.code.defn
index 97191a1..b3f2ccd 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -4,48 +4,48 @@
 # Source files in this directory
 
 SRCS = 	Utils.F90 \
-	Whisky_Boundaries.F90 \
-	Whisky_CalcUpdate.F90 \
-	Whisky_Con2Prim.F90 \
-	Whisky_Eigenproblem.F90 \
-	Whisky_Eigenproblem_Marquina.F90 \
-	Whisky_ENOReconstruct.F90 \
-	Whisky_ENOScalars.F90 \
-	Whisky_EOS.c \
-	Whisky_Flux.F90 \
-	Whisky_FluxSplit.F90 \
-	Whisky_HLLE.F90 \
-	Whisky_HLLEPoly.F90 \
-	Whisky_Loop.F90 \
-	Whisky_Minima.F90 \
-	Whisky_Minima.cc \
-	Whisky_PPM.F90 \
-	Whisky_ParamCheck.F90 \
-	Whisky_Particle.F90 \
-	Whisky_PreLoop.F90 \
-	Whisky_Prim2Con.F90 \
-	Whisky_Reconstruct.F90 \
-	Whisky_ReconstructPoly.F90 \
-	Whisky_RegisterMask.c \
-	Whisky_RegisterGZ.cc \
-	Whisky_RegisterVars.cc \
-	Whisky_RiemannSolve.F90 \
-	Whisky_RoeAverage.F90 \
-	Whisky_RoeSolver.F90 \
-	Whisky_Scalars.F90 \
-	Whisky_Shift.F90 \
-	Whisky_SlopeLimiter.F90 \
-	Whisky_Source.F90 \
-	Whisky_Startup.F90 \
-	Whisky_TVDReconstruct.F90 \
-	Whisky_Marquina.F90 \
-	Whisky_UpdateMask.F90 \
-	Whisky_Set_TP_GF.c  \
-	Whisky_Differences.F90 \
-	Whisky_EoSChangeGamma.F90 \
-	Whisky_Tmunu.F90
+	GRHydro_Boundaries.F90 \
+	GRHydro_CalcUpdate.F90 \
+	GRHydro_Con2Prim.F90 \
+	GRHydro_Eigenproblem.F90 \
+	GRHydro_Eigenproblem_Marquina.F90 \
+	GRHydro_ENOReconstruct.F90 \
+	GRHydro_ENOScalars.F90 \
+	GRHydro_EOS.c \
+	GRHydro_Flux.F90 \
+	GRHydro_FluxSplit.F90 \
+	GRHydro_HLLE.F90 \
+	GRHydro_HLLEPoly.F90 \
+	GRHydro_Loop.F90 \
+	GRHydro_Minima.F90 \
+	GRHydro_Minima.cc \
+	GRHydro_PPM.F90 \
+	GRHydro_ParamCheck.F90 \
+	GRHydro_Particle.F90 \
+	GRHydro_PreLoop.F90 \
+	GRHydro_Prim2Con.F90 \
+	GRHydro_Reconstruct.F90 \
+	GRHydro_ReconstructPoly.F90 \
+	GRHydro_RegisterMask.c \
+	GRHydro_RegisterGZ.cc \
+	GRHydro_RegisterVars.cc \
+	GRHydro_RiemannSolve.F90 \
+	GRHydro_RoeAverage.F90 \
+	GRHydro_RoeSolver.F90 \
+	GRHydro_Scalars.F90 \
+	GRHydro_Shift.F90 \
+	GRHydro_SlopeLimiter.F90 \
+	GRHydro_Source.F90 \
+	GRHydro_Startup.F90 \
+	GRHydro_TVDReconstruct.F90 \
+	GRHydro_Marquina.F90 \
+	GRHydro_UpdateMask.F90 \
+	GRHydro_Set_TP_GF.c  \
+	GRHydro_Differences.F90 \
+	GRHydro_EoSChangeGamma.F90 \
+	GRHydro_Tmunu.F90
 
-###	Whisky_Weights.c \
+###	GRHydro_Weights.c \
 
 
 
diff --git a/src/make.code.deps b/src/make.code.deps
index 23ffd9a..ac36140 100644
--- a/src/make.code.deps
+++ b/src/make.code.deps
@@ -1,8 +1,8 @@
-# Module dependencies for thorn Whisky
+# Module dependencies for thorn GRHydro
 
-Whisky_ENOReconstruct.F90.o:		Whisky_ENOScalars.F90.o
-Whisky_Eigenproblem.F90.o:		Whisky_Scalars.F90.o
-Whisky_Eigenproblem_Marquina.F90.o:	Whisky_Scalars.F90.o
-Whisky_PreLoop.F90.o:			Whisky_Scalars.F90.o
-Whisky_TVDReconstruct.F90.o:		Whisky_Scalars.F90.o
-Whisky_SlopeLimiter.F90.o:		Whisky_Scalars.F90.o
+GRHydro_ENOReconstruct.F90.o:		GRHydro_ENOScalars.F90.o
+GRHydro_Eigenproblem.F90.o:		GRHydro_Scalars.F90.o
+GRHydro_Eigenproblem_Marquina.F90.o:	GRHydro_Scalars.F90.o
+GRHydro_PreLoop.F90.o:			GRHydro_Scalars.F90.o
+GRHydro_TVDReconstruct.F90.o:		GRHydro_Scalars.F90.o
+GRHydro_SlopeLimiter.F90.o:		GRHydro_Scalars.F90.o
diff --git a/src/make.configuration.defn b/src/make.configuration.defn
index 1d1e90b..c8b9180 100644
--- a/src/make.configuration.defn
+++ b/src/make.configuration.defn
@@ -1,4 +1,4 @@
-# make.configuration.defn for Whisky
+# make.configuration.defn for GRHydro
 
 # add the utilities to the list
 ALL_UTILS += Riemann1d
diff --git a/src/make.configuration.deps b/src/make.configuration.deps
index d283562..be61b26 100644
--- a/src/make.configuration.deps
+++ b/src/make.configuration.deps
@@ -1,18 +1,18 @@
 # Make sure that EOS_Polytrope is compiled first
 
-ifneq ($(findstring Whisky/EOS_Polytrope,$(THORNS)),)
-$(CCTK_LIBDIR)$(DIRSEP)libWhisky.a : $(CCTK_LIBDIR)$(DIRSEP)libEOS_Polytrope.a
+ifneq ($(findstring GRHydro/EOS_Polytrope,$(THORNS)),)
+$(CCTK_LIBDIR)$(DIRSEP)libGRHydro.a : $(CCTK_LIBDIR)$(DIRSEP)libEOS_Polytrope.a
 endif
 
 # Compile rules for the utilities
-$(UTIL_DIR)$(DIRSEP)%: $(BUILD_DIR)$(DIRSEP)Whisky$(DIRSEP)%.o
+$(UTIL_DIR)$(DIRSEP)%: $(BUILD_DIR)$(DIRSEP)GRHydro$(DIRSEP)%.o
 	@echo Creating $* in $(UTIL_DIR) from $<
 	if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi
 	$(F90) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $(GENERAL_LIBRARIES) $<
 
 
-$(BUILD_DIR)$(DIRSEP)Whisky$(DIRSEP)%.o: $(PACKAGE_DIR)$(DIRSEP)CIGR$(DIRSEP)Whisky$(DIRSEP)src$(DIRSEP)util$(DIRSEP)%.f90
+$(BUILD_DIR)$(DIRSEP)GRHydro$(DIRSEP)%.o: $(PACKAGE_DIR)$(DIRSEP)CIGR$(DIRSEP)GRHydro$(DIRSEP)src$(DIRSEP)util$(DIRSEP)%.f90
 	@echo Compiling $<
-	if [ ! -d $(BUILD_DIR)$(DIRSEP)Whisky ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)Whisky ; fi
-	cd $(BUILD_DIR)$(DIRSEP)Whisky
+	if [ ! -d $(BUILD_DIR)$(DIRSEP)GRHydro ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)GRHydro ; fi
+	cd $(BUILD_DIR)$(DIRSEP)GRHydro
 	$(F90) $< $(F90FLAGS) -I$(CONFIG) -I$(BINDINGS_DIR)$(DIRSEP)include -I$(FLESH_DIR)$(DIRSEP)include -I$(CCTK_HOME)$(DIRSEP)arrangements $(SYS_INC_DIRS:%=-I%) $(FCOMPILEONLY)$(OPTIONSEP)$@
diff --git a/test/whisky_test_shock/dens_3D_diagonal.xg b/test/GRHydro_test_shock/dens_3D_diagonal.xg
index c149239..c149239 100644
--- a/test/whisky_test_shock/dens_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/dens_3D_diagonal.xg
diff --git a/test/whisky_test_shock/dens_x_[7][7].xg b/test/GRHydro_test_shock/dens_x_[7][7].xg
index b02c542..b02c542 100644
--- a/test/whisky_test_shock/dens_x_[7][7].xg
+++ b/test/GRHydro_test_shock/dens_x_[7][7].xg
diff --git a/test/whisky_test_shock/dens_y_[7][7].xg b/test/GRHydro_test_shock/dens_y_[7][7].xg
index b02c542..b02c542 100644
--- a/test/whisky_test_shock/dens_y_[7][7].xg
+++ b/test/GRHydro_test_shock/dens_y_[7][7].xg
diff --git a/test/whisky_test_shock/dens_z_[7][7].xg b/test/GRHydro_test_shock/dens_z_[7][7].xg
index b02c542..b02c542 100644
--- a/test/whisky_test_shock/dens_z_[7][7].xg
+++ b/test/GRHydro_test_shock/dens_z_[7][7].xg
diff --git a/test/whisky_test_shock/eps_3D_diagonal.xg b/test/GRHydro_test_shock/eps_3D_diagonal.xg
index 0cd9399..0cd9399 100644
--- a/test/whisky_test_shock/eps_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/eps_3D_diagonal.xg
diff --git a/test/whisky_test_shock/eps_x_[7][7].xg b/test/GRHydro_test_shock/eps_x_[7][7].xg
index 7960d17..7960d17 100644
--- a/test/whisky_test_shock/eps_x_[7][7].xg
+++ b/test/GRHydro_test_shock/eps_x_[7][7].xg
diff --git a/test/whisky_test_shock/eps_y_[7][7].xg b/test/GRHydro_test_shock/eps_y_[7][7].xg
index 7960d17..7960d17 100644
--- a/test/whisky_test_shock/eps_y_[7][7].xg
+++ b/test/GRHydro_test_shock/eps_y_[7][7].xg
diff --git a/test/whisky_test_shock/eps_z_[7][7].xg b/test/GRHydro_test_shock/eps_z_[7][7].xg
index 7960d17..7960d17 100644
--- a/test/whisky_test_shock/eps_z_[7][7].xg
+++ b/test/GRHydro_test_shock/eps_z_[7][7].xg
diff --git a/test/whisky_test_shock/press_3D_diagonal.xg b/test/GRHydro_test_shock/press_3D_diagonal.xg
index dfeda7d..dfeda7d 100644
--- a/test/whisky_test_shock/press_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/press_3D_diagonal.xg
diff --git a/test/whisky_test_shock/press_x_[7][7].xg b/test/GRHydro_test_shock/press_x_[7][7].xg
index bf88335..bf88335 100644
--- a/test/whisky_test_shock/press_x_[7][7].xg
+++ b/test/GRHydro_test_shock/press_x_[7][7].xg
diff --git a/test/whisky_test_shock/press_y_[7][7].xg b/test/GRHydro_test_shock/press_y_[7][7].xg
index bf88335..bf88335 100644
--- a/test/whisky_test_shock/press_y_[7][7].xg
+++ b/test/GRHydro_test_shock/press_y_[7][7].xg
diff --git a/test/whisky_test_shock/press_z_[7][7].xg b/test/GRHydro_test_shock/press_z_[7][7].xg
index bf88335..bf88335 100644
--- a/test/whisky_test_shock/press_z_[7][7].xg
+++ b/test/GRHydro_test_shock/press_z_[7][7].xg
diff --git a/test/whisky_test_shock/rho_3D_diagonal.xg b/test/GRHydro_test_shock/rho_3D_diagonal.xg
index bfce405..bfce405 100644
--- a/test/whisky_test_shock/rho_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/rho_3D_diagonal.xg
diff --git a/test/whisky_test_shock/rho_x_[7][7].xg b/test/GRHydro_test_shock/rho_x_[7][7].xg
index 94fdb40..94fdb40 100644
--- a/test/whisky_test_shock/rho_x_[7][7].xg
+++ b/test/GRHydro_test_shock/rho_x_[7][7].xg
diff --git a/test/whisky_test_shock/rho_y_[7][7].xg b/test/GRHydro_test_shock/rho_y_[7][7].xg
index 94fdb40..94fdb40 100644
--- a/test/whisky_test_shock/rho_y_[7][7].xg
+++ b/test/GRHydro_test_shock/rho_y_[7][7].xg
diff --git a/test/whisky_test_shock/rho_z_[7][7].xg b/test/GRHydro_test_shock/rho_z_[7][7].xg
index c078add..c078add 100644
--- a/test/whisky_test_shock/rho_z_[7][7].xg
+++ b/test/GRHydro_test_shock/rho_z_[7][7].xg
diff --git a/test/whisky_test_shock/scon[0]_3D_diagonal.xg b/test/GRHydro_test_shock/scon[0]_3D_diagonal.xg
index 1670d82..1670d82 100644
--- a/test/whisky_test_shock/scon[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/scon[0]_3D_diagonal.xg
diff --git a/test/whisky_test_shock/scon[0]_x_[7][7].xg b/test/GRHydro_test_shock/scon[0]_x_[7][7].xg
index 336f952..336f952 100644
--- a/test/whisky_test_shock/scon[0]_x_[7][7].xg
+++ b/test/GRHydro_test_shock/scon[0]_x_[7][7].xg
diff --git a/test/whisky_test_shock/scon[0]_y_[7][7].xg b/test/GRHydro_test_shock/scon[0]_y_[7][7].xg
index 8ed16ff..8ed16ff 100644
--- a/test/whisky_test_shock/scon[0]_y_[7][7].xg
+++ b/test/GRHydro_test_shock/scon[0]_y_[7][7].xg
diff --git a/test/whisky_test_shock/scon[0]_z_[7][7].xg b/test/GRHydro_test_shock/scon[0]_z_[7][7].xg
index 8ed16ff..8ed16ff 100644
--- a/test/whisky_test_shock/scon[0]_z_[7][7].xg
+++ b/test/GRHydro_test_shock/scon[0]_z_[7][7].xg
diff --git a/test/whisky_test_shock/scon[1]_3D_diagonal.xg b/test/GRHydro_test_shock/scon[1]_3D_diagonal.xg
index 1670d82..1670d82 100644
--- a/test/whisky_test_shock/scon[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/scon[1]_3D_diagonal.xg
diff --git a/test/whisky_test_shock/scon[1]_x_[7][7].xg b/test/GRHydro_test_shock/scon[1]_x_[7][7].xg
index 8ed16ff..8ed16ff 100644
--- a/test/whisky_test_shock/scon[1]_x_[7][7].xg
+++ b/test/GRHydro_test_shock/scon[1]_x_[7][7].xg
diff --git a/test/whisky_test_shock/scon[1]_y_[7][7].xg b/test/GRHydro_test_shock/scon[1]_y_[7][7].xg
index 336f952..336f952 100644
--- a/test/whisky_test_shock/scon[1]_y_[7][7].xg
+++ b/test/GRHydro_test_shock/scon[1]_y_[7][7].xg
diff --git a/test/whisky_test_shock/scon[1]_z_[7][7].xg b/test/GRHydro_test_shock/scon[1]_z_[7][7].xg
index 8ed16ff..8ed16ff 100644
--- a/test/whisky_test_shock/scon[1]_z_[7][7].xg
+++ b/test/GRHydro_test_shock/scon[1]_z_[7][7].xg
diff --git a/test/whisky_test_shock/scon[2]_3D_diagonal.xg b/test/GRHydro_test_shock/scon[2]_3D_diagonal.xg
index 1670d82..1670d82 100644
--- a/test/whisky_test_shock/scon[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/scon[2]_3D_diagonal.xg
diff --git a/test/whisky_test_shock/scon[2]_x_[7][7].xg b/test/GRHydro_test_shock/scon[2]_x_[7][7].xg
index 8ed16ff..8ed16ff 100644
--- a/test/whisky_test_shock/scon[2]_x_[7][7].xg
+++ b/test/GRHydro_test_shock/scon[2]_x_[7][7].xg
diff --git a/test/whisky_test_shock/scon[2]_y_[7][7].xg b/test/GRHydro_test_shock/scon[2]_y_[7][7].xg
index 8ed16ff..8ed16ff 100644
--- a/test/whisky_test_shock/scon[2]_y_[7][7].xg
+++ b/test/GRHydro_test_shock/scon[2]_y_[7][7].xg
diff --git a/test/whisky_test_shock/scon[2]_z_[7][7].xg b/test/GRHydro_test_shock/scon[2]_z_[7][7].xg
index 336f952..336f952 100644
--- a/test/whisky_test_shock/scon[2]_z_[7][7].xg
+++ b/test/GRHydro_test_shock/scon[2]_z_[7][7].xg
diff --git a/test/whisky_test_shock/tau_3D_diagonal.xg b/test/GRHydro_test_shock/tau_3D_diagonal.xg
index 4bace88..4bace88 100644
--- a/test/whisky_test_shock/tau_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/tau_3D_diagonal.xg
diff --git a/test/whisky_test_shock/tau_x_[7][7].xg b/test/GRHydro_test_shock/tau_x_[7][7].xg
index ff3369a..ff3369a 100644
--- a/test/whisky_test_shock/tau_x_[7][7].xg
+++ b/test/GRHydro_test_shock/tau_x_[7][7].xg
diff --git a/test/whisky_test_shock/tau_y_[7][7].xg b/test/GRHydro_test_shock/tau_y_[7][7].xg
index ff3369a..ff3369a 100644
--- a/test/whisky_test_shock/tau_y_[7][7].xg
+++ b/test/GRHydro_test_shock/tau_y_[7][7].xg
diff --git a/test/whisky_test_shock/tau_z_[7][7].xg b/test/GRHydro_test_shock/tau_z_[7][7].xg
index bd9e6db..bd9e6db 100644
--- a/test/whisky_test_shock/tau_z_[7][7].xg
+++ b/test/GRHydro_test_shock/tau_z_[7][7].xg
diff --git a/test/whisky_test_shock/vel[0]_3D_diagonal.xg b/test/GRHydro_test_shock/vel[0]_3D_diagonal.xg
index 556ab72..556ab72 100644
--- a/test/whisky_test_shock/vel[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/vel[0]_3D_diagonal.xg
diff --git a/test/whisky_test_shock/vel[0]_x_[7][7].xg b/test/GRHydro_test_shock/vel[0]_x_[7][7].xg
index 99ca0cb..99ca0cb 100644
--- a/test/whisky_test_shock/vel[0]_x_[7][7].xg
+++ b/test/GRHydro_test_shock/vel[0]_x_[7][7].xg
diff --git a/test/whisky_test_shock/vel[0]_y_[7][7].xg b/test/GRHydro_test_shock/vel[0]_y_[7][7].xg
index d4fc578..d4fc578 100644
--- a/test/whisky_test_shock/vel[0]_y_[7][7].xg
+++ b/test/GRHydro_test_shock/vel[0]_y_[7][7].xg
diff --git a/test/whisky_test_shock/vel[0]_z_[7][7].xg b/test/GRHydro_test_shock/vel[0]_z_[7][7].xg
index d4fc578..d4fc578 100644
--- a/test/whisky_test_shock/vel[0]_z_[7][7].xg
+++ b/test/GRHydro_test_shock/vel[0]_z_[7][7].xg
diff --git a/test/whisky_test_shock/vel[1]_3D_diagonal.xg b/test/GRHydro_test_shock/vel[1]_3D_diagonal.xg
index 556ab72..556ab72 100644
--- a/test/whisky_test_shock/vel[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/vel[1]_3D_diagonal.xg
diff --git a/test/whisky_test_shock/vel[1]_x_[7][7].xg b/test/GRHydro_test_shock/vel[1]_x_[7][7].xg
index d4fc578..d4fc578 100644
--- a/test/whisky_test_shock/vel[1]_x_[7][7].xg
+++ b/test/GRHydro_test_shock/vel[1]_x_[7][7].xg
diff --git a/test/whisky_test_shock/vel[1]_y_[7][7].xg b/test/GRHydro_test_shock/vel[1]_y_[7][7].xg
index 99ca0cb..99ca0cb 100644
--- a/test/whisky_test_shock/vel[1]_y_[7][7].xg
+++ b/test/GRHydro_test_shock/vel[1]_y_[7][7].xg
diff --git a/test/whisky_test_shock/vel[1]_z_[7][7].xg b/test/GRHydro_test_shock/vel[1]_z_[7][7].xg
index d4fc578..d4fc578 100644
--- a/test/whisky_test_shock/vel[1]_z_[7][7].xg
+++ b/test/GRHydro_test_shock/vel[1]_z_[7][7].xg
diff --git a/test/whisky_test_shock/vel[2]_3D_diagonal.xg b/test/GRHydro_test_shock/vel[2]_3D_diagonal.xg
index 556ab72..556ab72 100644
--- a/test/whisky_test_shock/vel[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/vel[2]_3D_diagonal.xg
diff --git a/test/whisky_test_shock/vel[2]_x_[7][7].xg b/test/GRHydro_test_shock/vel[2]_x_[7][7].xg
index d4fc578..d4fc578 100644
--- a/test/whisky_test_shock/vel[2]_x_[7][7].xg
+++ b/test/GRHydro_test_shock/vel[2]_x_[7][7].xg
diff --git a/test/whisky_test_shock/vel[2]_y_[7][7].xg b/test/GRHydro_test_shock/vel[2]_y_[7][7].xg
index d4fc578..d4fc578 100644
--- a/test/whisky_test_shock/vel[2]_y_[7][7].xg
+++ b/test/GRHydro_test_shock/vel[2]_y_[7][7].xg
diff --git a/test/whisky_test_shock/vel[2]_z_[7][7].xg b/test/GRHydro_test_shock/vel[2]_z_[7][7].xg
index 99ca0cb..99ca0cb 100644
--- a/test/whisky_test_shock/vel[2]_z_[7][7].xg
+++ b/test/GRHydro_test_shock/vel[2]_z_[7][7].xg
diff --git a/test/whisky_test_shock/w_lorentz_3D_diagonal.xg b/test/GRHydro_test_shock/w_lorentz_3D_diagonal.xg
index 6bf06d2..6bf06d2 100644
--- a/test/whisky_test_shock/w_lorentz_3D_diagonal.xg
+++ b/test/GRHydro_test_shock/w_lorentz_3D_diagonal.xg
diff --git a/test/whisky_test_shock/w_lorentz_x_[7][7].xg b/test/GRHydro_test_shock/w_lorentz_x_[7][7].xg
index ac3451e..ac3451e 100644
--- a/test/whisky_test_shock/w_lorentz_x_[7][7].xg
+++ b/test/GRHydro_test_shock/w_lorentz_x_[7][7].xg
diff --git a/test/whisky_test_shock/w_lorentz_y_[7][7].xg b/test/GRHydro_test_shock/w_lorentz_y_[7][7].xg
index ac3451e..ac3451e 100644
--- a/test/whisky_test_shock/w_lorentz_y_[7][7].xg
+++ b/test/GRHydro_test_shock/w_lorentz_y_[7][7].xg
diff --git a/test/whisky_test_shock/w_lorentz_z_[7][7].xg b/test/GRHydro_test_shock/w_lorentz_z_[7][7].xg
index ac3451e..ac3451e 100644
--- a/test/whisky_test_shock/w_lorentz_z_[7][7].xg
+++ b/test/GRHydro_test_shock/w_lorentz_z_[7][7].xg
diff --git a/test/whisky_test_shock/whisky_test_shock.par b/test/GRHydro_test_shock/whisky_test_shock.par
index e69de29..e69de29 100644
--- a/test/whisky_test_shock/whisky_test_shock.par
+++ b/test/GRHydro_test_shock/whisky_test_shock.par
diff --git a/test/whisky_test_shock_ppm/dens_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/dens_3D_diagonal.xg
index b4e426f..b4e426f 100644
--- a/test/whisky_test_shock_ppm/dens_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/dens_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/dens_x_[7][7].xg b/test/GRHydro_test_shock_ppm/dens_x_[7][7].xg
index cf7feca..cf7feca 100644
--- a/test/whisky_test_shock_ppm/dens_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/dens_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/dens_y_[7][7].xg b/test/GRHydro_test_shock_ppm/dens_y_[7][7].xg
index cf7feca..cf7feca 100644
--- a/test/whisky_test_shock_ppm/dens_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/dens_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/dens_z_[7][7].xg b/test/GRHydro_test_shock_ppm/dens_z_[7][7].xg
index cf7feca..cf7feca 100644
--- a/test/whisky_test_shock_ppm/dens_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/dens_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/eps_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/eps_3D_diagonal.xg
index da19415..da19415 100644
--- a/test/whisky_test_shock_ppm/eps_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/eps_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/eps_x_[7][7].xg b/test/GRHydro_test_shock_ppm/eps_x_[7][7].xg
index a72dbdd..a72dbdd 100644
--- a/test/whisky_test_shock_ppm/eps_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/eps_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/eps_y_[7][7].xg b/test/GRHydro_test_shock_ppm/eps_y_[7][7].xg
index 19b7ead..19b7ead 100644
--- a/test/whisky_test_shock_ppm/eps_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/eps_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/eps_z_[7][7].xg b/test/GRHydro_test_shock_ppm/eps_z_[7][7].xg
index 19b7ead..19b7ead 100644
--- a/test/whisky_test_shock_ppm/eps_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/eps_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/press_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/press_3D_diagonal.xg
index c6d910d..c6d910d 100644
--- a/test/whisky_test_shock_ppm/press_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/press_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/press_x_[7][7].xg b/test/GRHydro_test_shock_ppm/press_x_[7][7].xg
index 550db35..550db35 100644
--- a/test/whisky_test_shock_ppm/press_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/press_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/press_y_[7][7].xg b/test/GRHydro_test_shock_ppm/press_y_[7][7].xg
index 550db35..550db35 100644
--- a/test/whisky_test_shock_ppm/press_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/press_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/press_z_[7][7].xg b/test/GRHydro_test_shock_ppm/press_z_[7][7].xg
index 550db35..550db35 100644
--- a/test/whisky_test_shock_ppm/press_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/press_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/rho_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/rho_3D_diagonal.xg
index f106e88..f106e88 100644
--- a/test/whisky_test_shock_ppm/rho_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/rho_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/rho_x_[7][7].xg b/test/GRHydro_test_shock_ppm/rho_x_[7][7].xg
index 197880a..197880a 100644
--- a/test/whisky_test_shock_ppm/rho_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/rho_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/rho_y_[7][7].xg b/test/GRHydro_test_shock_ppm/rho_y_[7][7].xg
index 197880a..197880a 100644
--- a/test/whisky_test_shock_ppm/rho_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/rho_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/rho_z_[7][7].xg b/test/GRHydro_test_shock_ppm/rho_z_[7][7].xg
index 197880a..197880a 100644
--- a/test/whisky_test_shock_ppm/rho_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/rho_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/scon[0]_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/scon[0]_3D_diagonal.xg
index 4c439fe..4c439fe 100644
--- a/test/whisky_test_shock_ppm/scon[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/scon[0]_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/scon[0]_x_[7][7].xg b/test/GRHydro_test_shock_ppm/scon[0]_x_[7][7].xg
index 32ff1b2..32ff1b2 100644
--- a/test/whisky_test_shock_ppm/scon[0]_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/scon[0]_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/scon[0]_y_[7][7].xg b/test/GRHydro_test_shock_ppm/scon[0]_y_[7][7].xg
index 7634629..7634629 100644
--- a/test/whisky_test_shock_ppm/scon[0]_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/scon[0]_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/scon[0]_z_[7][7].xg b/test/GRHydro_test_shock_ppm/scon[0]_z_[7][7].xg
index 7634629..7634629 100644
--- a/test/whisky_test_shock_ppm/scon[0]_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/scon[0]_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/scon[1]_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/scon[1]_3D_diagonal.xg
index 4c439fe..4c439fe 100644
--- a/test/whisky_test_shock_ppm/scon[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/scon[1]_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/scon[1]_x_[7][7].xg b/test/GRHydro_test_shock_ppm/scon[1]_x_[7][7].xg
index 7634629..7634629 100644
--- a/test/whisky_test_shock_ppm/scon[1]_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/scon[1]_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/scon[1]_y_[7][7].xg b/test/GRHydro_test_shock_ppm/scon[1]_y_[7][7].xg
index 32ff1b2..32ff1b2 100644
--- a/test/whisky_test_shock_ppm/scon[1]_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/scon[1]_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/scon[1]_z_[7][7].xg b/test/GRHydro_test_shock_ppm/scon[1]_z_[7][7].xg
index 7634629..7634629 100644
--- a/test/whisky_test_shock_ppm/scon[1]_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/scon[1]_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/scon[2]_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/scon[2]_3D_diagonal.xg
index 4c439fe..4c439fe 100644
--- a/test/whisky_test_shock_ppm/scon[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/scon[2]_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/scon[2]_x_[7][7].xg b/test/GRHydro_test_shock_ppm/scon[2]_x_[7][7].xg
index 7634629..7634629 100644
--- a/test/whisky_test_shock_ppm/scon[2]_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/scon[2]_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/scon[2]_y_[7][7].xg b/test/GRHydro_test_shock_ppm/scon[2]_y_[7][7].xg
index 7634629..7634629 100644
--- a/test/whisky_test_shock_ppm/scon[2]_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/scon[2]_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/scon[2]_z_[7][7].xg b/test/GRHydro_test_shock_ppm/scon[2]_z_[7][7].xg
index 32ff1b2..32ff1b2 100644
--- a/test/whisky_test_shock_ppm/scon[2]_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/scon[2]_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/tau_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/tau_3D_diagonal.xg
index 3721b97..3721b97 100644
--- a/test/whisky_test_shock_ppm/tau_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/tau_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/tau_x_[7][7].xg b/test/GRHydro_test_shock_ppm/tau_x_[7][7].xg
index 81abcf9..81abcf9 100644
--- a/test/whisky_test_shock_ppm/tau_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/tau_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/tau_y_[7][7].xg b/test/GRHydro_test_shock_ppm/tau_y_[7][7].xg
index 81abcf9..81abcf9 100644
--- a/test/whisky_test_shock_ppm/tau_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/tau_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/tau_z_[7][7].xg b/test/GRHydro_test_shock_ppm/tau_z_[7][7].xg
index c9eff44..c9eff44 100644
--- a/test/whisky_test_shock_ppm/tau_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/tau_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/vel[0]_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/vel[0]_3D_diagonal.xg
index b32cbc9..b32cbc9 100644
--- a/test/whisky_test_shock_ppm/vel[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/vel[0]_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/vel[0]_x_[7][7].xg b/test/GRHydro_test_shock_ppm/vel[0]_x_[7][7].xg
index 30b59aa..30b59aa 100644
--- a/test/whisky_test_shock_ppm/vel[0]_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/vel[0]_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/vel[0]_y_[7][7].xg b/test/GRHydro_test_shock_ppm/vel[0]_y_[7][7].xg
index 22ad5a9..22ad5a9 100644
--- a/test/whisky_test_shock_ppm/vel[0]_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/vel[0]_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/vel[0]_z_[7][7].xg b/test/GRHydro_test_shock_ppm/vel[0]_z_[7][7].xg
index 22ad5a9..22ad5a9 100644
--- a/test/whisky_test_shock_ppm/vel[0]_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/vel[0]_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/vel[1]_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/vel[1]_3D_diagonal.xg
index b32cbc9..b32cbc9 100644
--- a/test/whisky_test_shock_ppm/vel[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/vel[1]_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/vel[1]_x_[7][7].xg b/test/GRHydro_test_shock_ppm/vel[1]_x_[7][7].xg
index 22ad5a9..22ad5a9 100644
--- a/test/whisky_test_shock_ppm/vel[1]_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/vel[1]_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/vel[1]_y_[7][7].xg b/test/GRHydro_test_shock_ppm/vel[1]_y_[7][7].xg
index 30b59aa..30b59aa 100644
--- a/test/whisky_test_shock_ppm/vel[1]_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/vel[1]_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/vel[1]_z_[7][7].xg b/test/GRHydro_test_shock_ppm/vel[1]_z_[7][7].xg
index 22ad5a9..22ad5a9 100644
--- a/test/whisky_test_shock_ppm/vel[1]_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/vel[1]_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/vel[2]_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/vel[2]_3D_diagonal.xg
index b32cbc9..b32cbc9 100644
--- a/test/whisky_test_shock_ppm/vel[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/vel[2]_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/vel[2]_x_[7][7].xg b/test/GRHydro_test_shock_ppm/vel[2]_x_[7][7].xg
index 22ad5a9..22ad5a9 100644
--- a/test/whisky_test_shock_ppm/vel[2]_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/vel[2]_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/vel[2]_y_[7][7].xg b/test/GRHydro_test_shock_ppm/vel[2]_y_[7][7].xg
index 22ad5a9..22ad5a9 100644
--- a/test/whisky_test_shock_ppm/vel[2]_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/vel[2]_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/vel[2]_z_[7][7].xg b/test/GRHydro_test_shock_ppm/vel[2]_z_[7][7].xg
index 30b59aa..30b59aa 100644
--- a/test/whisky_test_shock_ppm/vel[2]_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/vel[2]_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/w_lorentz_3D_diagonal.xg b/test/GRHydro_test_shock_ppm/w_lorentz_3D_diagonal.xg
index 348d85f..348d85f 100644
--- a/test/whisky_test_shock_ppm/w_lorentz_3D_diagonal.xg
+++ b/test/GRHydro_test_shock_ppm/w_lorentz_3D_diagonal.xg
diff --git a/test/whisky_test_shock_ppm/w_lorentz_x_[7][7].xg b/test/GRHydro_test_shock_ppm/w_lorentz_x_[7][7].xg
index eb04c27..eb04c27 100644
--- a/test/whisky_test_shock_ppm/w_lorentz_x_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/w_lorentz_x_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/w_lorentz_y_[7][7].xg b/test/GRHydro_test_shock_ppm/w_lorentz_y_[7][7].xg
index eb04c27..eb04c27 100644
--- a/test/whisky_test_shock_ppm/w_lorentz_y_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/w_lorentz_y_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/w_lorentz_z_[7][7].xg b/test/GRHydro_test_shock_ppm/w_lorentz_z_[7][7].xg
index eb04c27..eb04c27 100644
--- a/test/whisky_test_shock_ppm/w_lorentz_z_[7][7].xg
+++ b/test/GRHydro_test_shock_ppm/w_lorentz_z_[7][7].xg
diff --git a/test/whisky_test_shock_ppm/whisky_test_shock_ppm.par b/test/GRHydro_test_shock_ppm/whisky_test_shock_ppm.par
index e69de29..e69de29 100644
--- a/test/whisky_test_shock_ppm/whisky_test_shock_ppm.par
+++ b/test/GRHydro_test_shock_ppm/whisky_test_shock_ppm.par
diff --git a/test/whisky_test_tov_ppm/alp_maximum.xg b/test/GRHydro_test_tov_ppm/alp_maximum.xg
index 27bf461..27bf461 100644
--- a/test/whisky_test_tov_ppm/alp_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/alp_maximum.xg
diff --git a/test/whisky_test_tov_ppm/alp_minimum.xg b/test/GRHydro_test_tov_ppm/alp_minimum.xg
index c6442fe..c6442fe 100644
--- a/test/whisky_test_tov_ppm/alp_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/alp_minimum.xg
diff --git a/test/whisky_test_tov_ppm/alp_norm1.xg b/test/GRHydro_test_tov_ppm/alp_norm1.xg
index 8ab1537..8ab1537 100644
--- a/test/whisky_test_tov_ppm/alp_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/alp_norm1.xg
diff --git a/test/whisky_test_tov_ppm/alp_norm2.xg b/test/GRHydro_test_tov_ppm/alp_norm2.xg
index 4280123..4280123 100644
--- a/test/whisky_test_tov_ppm/alp_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/alp_norm2.xg
diff --git a/test/whisky_test_tov_ppm/dens_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/dens_3D_diagonal.xg
index 00b657a..00b657a 100644
--- a/test/whisky_test_tov_ppm/dens_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/dens_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/dens_maximum.xg b/test/GRHydro_test_tov_ppm/dens_maximum.xg
index f246657..f246657 100644
--- a/test/whisky_test_tov_ppm/dens_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/dens_maximum.xg
diff --git a/test/whisky_test_tov_ppm/dens_minimum.xg b/test/GRHydro_test_tov_ppm/dens_minimum.xg
index 24fabfe..24fabfe 100644
--- a/test/whisky_test_tov_ppm/dens_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/dens_minimum.xg
diff --git a/test/whisky_test_tov_ppm/dens_norm1.xg b/test/GRHydro_test_tov_ppm/dens_norm1.xg
index 716428a..716428a 100644
--- a/test/whisky_test_tov_ppm/dens_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/dens_norm1.xg
diff --git a/test/whisky_test_tov_ppm/dens_norm2.xg b/test/GRHydro_test_tov_ppm/dens_norm2.xg
index 42772d2..42772d2 100644
--- a/test/whisky_test_tov_ppm/dens_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/dens_norm2.xg
diff --git a/test/whisky_test_tov_ppm/dens_x_[16][16].xg b/test/GRHydro_test_tov_ppm/dens_x_[16][16].xg
index 1a1fb5c..1a1fb5c 100644
--- a/test/whisky_test_tov_ppm/dens_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/dens_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/dens_y_[16][16].xg b/test/GRHydro_test_tov_ppm/dens_y_[16][16].xg
index 1a1fb5c..1a1fb5c 100644
--- a/test/whisky_test_tov_ppm/dens_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/dens_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/dens_z_[16][16].xg b/test/GRHydro_test_tov_ppm/dens_z_[16][16].xg
index 1a1fb5c..1a1fb5c 100644
--- a/test/whisky_test_tov_ppm/dens_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/dens_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/eps_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/eps_3D_diagonal.xg
index 1b6c0f9..1b6c0f9 100644
--- a/test/whisky_test_tov_ppm/eps_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/eps_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/eps_maximum.xg b/test/GRHydro_test_tov_ppm/eps_maximum.xg
index cb77c27..cb77c27 100644
--- a/test/whisky_test_tov_ppm/eps_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/eps_maximum.xg
diff --git a/test/whisky_test_tov_ppm/eps_minimum.xg b/test/GRHydro_test_tov_ppm/eps_minimum.xg
index 4b1b36c..4b1b36c 100644
--- a/test/whisky_test_tov_ppm/eps_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/eps_minimum.xg
diff --git a/test/whisky_test_tov_ppm/eps_norm1.xg b/test/GRHydro_test_tov_ppm/eps_norm1.xg
index 6942fb9..6942fb9 100644
--- a/test/whisky_test_tov_ppm/eps_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/eps_norm1.xg
diff --git a/test/whisky_test_tov_ppm/eps_norm2.xg b/test/GRHydro_test_tov_ppm/eps_norm2.xg
index 3c23eee..3c23eee 100644
--- a/test/whisky_test_tov_ppm/eps_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/eps_norm2.xg
diff --git a/test/whisky_test_tov_ppm/eps_x_[16][16].xg b/test/GRHydro_test_tov_ppm/eps_x_[16][16].xg
index 3e8e193..3e8e193 100644
--- a/test/whisky_test_tov_ppm/eps_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/eps_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/eps_y_[16][16].xg b/test/GRHydro_test_tov_ppm/eps_y_[16][16].xg
index 3e8e193..3e8e193 100644
--- a/test/whisky_test_tov_ppm/eps_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/eps_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/eps_z_[16][16].xg b/test/GRHydro_test_tov_ppm/eps_z_[16][16].xg
index 3e8e193..3e8e193 100644
--- a/test/whisky_test_tov_ppm/eps_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/eps_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/gxx_maximum.xg b/test/GRHydro_test_tov_ppm/gxx_maximum.xg
index 247c527..247c527 100644
--- a/test/whisky_test_tov_ppm/gxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/gxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm/gxx_minimum.xg b/test/GRHydro_test_tov_ppm/gxx_minimum.xg
index 236f58d..236f58d 100644
--- a/test/whisky_test_tov_ppm/gxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/gxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm/gxx_norm1.xg b/test/GRHydro_test_tov_ppm/gxx_norm1.xg
index 09dc024..09dc024 100644
--- a/test/whisky_test_tov_ppm/gxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/gxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm/gxx_norm2.xg b/test/GRHydro_test_tov_ppm/gxx_norm2.xg
index 251fc12..251fc12 100644
--- a/test/whisky_test_tov_ppm/gxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/gxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm/gxy_maximum.xg b/test/GRHydro_test_tov_ppm/gxy_maximum.xg
index 42abcf9..42abcf9 100644
--- a/test/whisky_test_tov_ppm/gxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/gxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm/gxy_minimum.xg b/test/GRHydro_test_tov_ppm/gxy_minimum.xg
index 76db2bc..76db2bc 100644
--- a/test/whisky_test_tov_ppm/gxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/gxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm/gxy_norm1.xg b/test/GRHydro_test_tov_ppm/gxy_norm1.xg
index 50f0e6a..50f0e6a 100644
--- a/test/whisky_test_tov_ppm/gxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/gxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm/gxy_norm2.xg b/test/GRHydro_test_tov_ppm/gxy_norm2.xg
index 5bbce9e..5bbce9e 100644
--- a/test/whisky_test_tov_ppm/gxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/gxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm/gxz_maximum.xg b/test/GRHydro_test_tov_ppm/gxz_maximum.xg
index a71a85b..a71a85b 100644
--- a/test/whisky_test_tov_ppm/gxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/gxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm/gxz_minimum.xg b/test/GRHydro_test_tov_ppm/gxz_minimum.xg
index f124f6d..f124f6d 100644
--- a/test/whisky_test_tov_ppm/gxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/gxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm/gxz_norm1.xg b/test/GRHydro_test_tov_ppm/gxz_norm1.xg
index 6e1e802..6e1e802 100644
--- a/test/whisky_test_tov_ppm/gxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/gxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm/gxz_norm2.xg b/test/GRHydro_test_tov_ppm/gxz_norm2.xg
index e954fd6..e954fd6 100644
--- a/test/whisky_test_tov_ppm/gxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/gxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm/gyy_maximum.xg b/test/GRHydro_test_tov_ppm/gyy_maximum.xg
index 6945fcb..6945fcb 100644
--- a/test/whisky_test_tov_ppm/gyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/gyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm/gyy_minimum.xg b/test/GRHydro_test_tov_ppm/gyy_minimum.xg
index f4d908c..f4d908c 100644
--- a/test/whisky_test_tov_ppm/gyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/gyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm/gyy_norm1.xg b/test/GRHydro_test_tov_ppm/gyy_norm1.xg
index cf730c8..cf730c8 100644
--- a/test/whisky_test_tov_ppm/gyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/gyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm/gyy_norm2.xg b/test/GRHydro_test_tov_ppm/gyy_norm2.xg
index 6e0dc12..6e0dc12 100644
--- a/test/whisky_test_tov_ppm/gyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/gyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm/gyz_maximum.xg b/test/GRHydro_test_tov_ppm/gyz_maximum.xg
index 24de994..24de994 100644
--- a/test/whisky_test_tov_ppm/gyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/gyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm/gyz_minimum.xg b/test/GRHydro_test_tov_ppm/gyz_minimum.xg
index c9dacc2..c9dacc2 100644
--- a/test/whisky_test_tov_ppm/gyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/gyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm/gyz_norm1.xg b/test/GRHydro_test_tov_ppm/gyz_norm1.xg
index 64cfd53..64cfd53 100644
--- a/test/whisky_test_tov_ppm/gyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/gyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm/gyz_norm2.xg b/test/GRHydro_test_tov_ppm/gyz_norm2.xg
index cd143ee..cd143ee 100644
--- a/test/whisky_test_tov_ppm/gyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/gyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm/gzz_maximum.xg b/test/GRHydro_test_tov_ppm/gzz_maximum.xg
index 2a9cec8..2a9cec8 100644
--- a/test/whisky_test_tov_ppm/gzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/gzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm/gzz_minimum.xg b/test/GRHydro_test_tov_ppm/gzz_minimum.xg
index fdc12b9..fdc12b9 100644
--- a/test/whisky_test_tov_ppm/gzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/gzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm/gzz_norm1.xg b/test/GRHydro_test_tov_ppm/gzz_norm1.xg
index 6532e18..6532e18 100644
--- a/test/whisky_test_tov_ppm/gzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/gzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm/gzz_norm2.xg b/test/GRHydro_test_tov_ppm/gzz_norm2.xg
index 5c9c02f..5c9c02f 100644
--- a/test/whisky_test_tov_ppm/gzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/gzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm/ham_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/ham_3D_diagonal.xg
index 6c77e9a..6c77e9a 100644
--- a/test/whisky_test_tov_ppm/ham_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/ham_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/ham_maximum.xg b/test/GRHydro_test_tov_ppm/ham_maximum.xg
index 7015cfa..7015cfa 100644
--- a/test/whisky_test_tov_ppm/ham_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/ham_maximum.xg
diff --git a/test/whisky_test_tov_ppm/ham_minimum.xg b/test/GRHydro_test_tov_ppm/ham_minimum.xg
index ffbe145..ffbe145 100644
--- a/test/whisky_test_tov_ppm/ham_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/ham_minimum.xg
diff --git a/test/whisky_test_tov_ppm/ham_norm1.xg b/test/GRHydro_test_tov_ppm/ham_norm1.xg
index 2b669dd..2b669dd 100644
--- a/test/whisky_test_tov_ppm/ham_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/ham_norm1.xg
diff --git a/test/whisky_test_tov_ppm/ham_norm2.xg b/test/GRHydro_test_tov_ppm/ham_norm2.xg
index df78f2f..df78f2f 100644
--- a/test/whisky_test_tov_ppm/ham_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/ham_norm2.xg
diff --git a/test/whisky_test_tov_ppm/ham_x_[16][16].xg b/test/GRHydro_test_tov_ppm/ham_x_[16][16].xg
index 5afea19..5afea19 100644
--- a/test/whisky_test_tov_ppm/ham_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/ham_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/ham_y_[16][16].xg b/test/GRHydro_test_tov_ppm/ham_y_[16][16].xg
index 6657695..6657695 100644
--- a/test/whisky_test_tov_ppm/ham_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/ham_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/ham_z_[16][16].xg b/test/GRHydro_test_tov_ppm/ham_z_[16][16].xg
index 2c76454..2c76454 100644
--- a/test/whisky_test_tov_ppm/ham_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/ham_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/kxx_maximum.xg b/test/GRHydro_test_tov_ppm/kxx_maximum.xg
index 45849a0..45849a0 100644
--- a/test/whisky_test_tov_ppm/kxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/kxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm/kxx_minimum.xg b/test/GRHydro_test_tov_ppm/kxx_minimum.xg
index af1d941..af1d941 100644
--- a/test/whisky_test_tov_ppm/kxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/kxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm/kxx_norm1.xg b/test/GRHydro_test_tov_ppm/kxx_norm1.xg
index 1356951..1356951 100644
--- a/test/whisky_test_tov_ppm/kxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/kxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm/kxx_norm2.xg b/test/GRHydro_test_tov_ppm/kxx_norm2.xg
index f4dcfdd..f4dcfdd 100644
--- a/test/whisky_test_tov_ppm/kxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/kxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm/kxy_maximum.xg b/test/GRHydro_test_tov_ppm/kxy_maximum.xg
index ab6ec9d..ab6ec9d 100644
--- a/test/whisky_test_tov_ppm/kxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/kxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm/kxy_minimum.xg b/test/GRHydro_test_tov_ppm/kxy_minimum.xg
index 8d53e8b..8d53e8b 100644
--- a/test/whisky_test_tov_ppm/kxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/kxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm/kxy_norm1.xg b/test/GRHydro_test_tov_ppm/kxy_norm1.xg
index 0214709..0214709 100644
--- a/test/whisky_test_tov_ppm/kxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/kxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm/kxy_norm2.xg b/test/GRHydro_test_tov_ppm/kxy_norm2.xg
index 1b68a3f..1b68a3f 100644
--- a/test/whisky_test_tov_ppm/kxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/kxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm/kxz_maximum.xg b/test/GRHydro_test_tov_ppm/kxz_maximum.xg
index 01397a2..01397a2 100644
--- a/test/whisky_test_tov_ppm/kxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/kxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm/kxz_minimum.xg b/test/GRHydro_test_tov_ppm/kxz_minimum.xg
index f1e96c4..f1e96c4 100644
--- a/test/whisky_test_tov_ppm/kxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/kxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm/kxz_norm1.xg b/test/GRHydro_test_tov_ppm/kxz_norm1.xg
index 6197828..6197828 100644
--- a/test/whisky_test_tov_ppm/kxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/kxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm/kxz_norm2.xg b/test/GRHydro_test_tov_ppm/kxz_norm2.xg
index cb2b58e..cb2b58e 100644
--- a/test/whisky_test_tov_ppm/kxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/kxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm/kyy_maximum.xg b/test/GRHydro_test_tov_ppm/kyy_maximum.xg
index 9e023be..9e023be 100644
--- a/test/whisky_test_tov_ppm/kyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/kyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm/kyy_minimum.xg b/test/GRHydro_test_tov_ppm/kyy_minimum.xg
index f54b021..f54b021 100644
--- a/test/whisky_test_tov_ppm/kyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/kyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm/kyy_norm1.xg b/test/GRHydro_test_tov_ppm/kyy_norm1.xg
index 49f77d5..49f77d5 100644
--- a/test/whisky_test_tov_ppm/kyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/kyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm/kyy_norm2.xg b/test/GRHydro_test_tov_ppm/kyy_norm2.xg
index 4dc657a..4dc657a 100644
--- a/test/whisky_test_tov_ppm/kyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/kyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm/kyz_maximum.xg b/test/GRHydro_test_tov_ppm/kyz_maximum.xg
index 5de0d75..5de0d75 100644
--- a/test/whisky_test_tov_ppm/kyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/kyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm/kyz_minimum.xg b/test/GRHydro_test_tov_ppm/kyz_minimum.xg
index 079a343..079a343 100644
--- a/test/whisky_test_tov_ppm/kyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/kyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm/kyz_norm1.xg b/test/GRHydro_test_tov_ppm/kyz_norm1.xg
index cbac08d..cbac08d 100644
--- a/test/whisky_test_tov_ppm/kyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/kyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm/kyz_norm2.xg b/test/GRHydro_test_tov_ppm/kyz_norm2.xg
index 3fc33ca..3fc33ca 100644
--- a/test/whisky_test_tov_ppm/kyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/kyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm/kzz_maximum.xg b/test/GRHydro_test_tov_ppm/kzz_maximum.xg
index 23eeff1..23eeff1 100644
--- a/test/whisky_test_tov_ppm/kzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/kzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm/kzz_minimum.xg b/test/GRHydro_test_tov_ppm/kzz_minimum.xg
index e13e0be..e13e0be 100644
--- a/test/whisky_test_tov_ppm/kzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/kzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm/kzz_norm1.xg b/test/GRHydro_test_tov_ppm/kzz_norm1.xg
index dc2d4d7..dc2d4d7 100644
--- a/test/whisky_test_tov_ppm/kzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/kzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm/kzz_norm2.xg b/test/GRHydro_test_tov_ppm/kzz_norm2.xg
index 7201b11..7201b11 100644
--- a/test/whisky_test_tov_ppm/kzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/kzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm/momx_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/momx_3D_diagonal.xg
index ed5b60c..ed5b60c 100644
--- a/test/whisky_test_tov_ppm/momx_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/momx_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/momx_maximum.xg b/test/GRHydro_test_tov_ppm/momx_maximum.xg
index e31ade6..e31ade6 100644
--- a/test/whisky_test_tov_ppm/momx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/momx_maximum.xg
diff --git a/test/whisky_test_tov_ppm/momx_minimum.xg b/test/GRHydro_test_tov_ppm/momx_minimum.xg
index b129f30..b129f30 100644
--- a/test/whisky_test_tov_ppm/momx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/momx_minimum.xg
diff --git a/test/whisky_test_tov_ppm/momx_norm1.xg b/test/GRHydro_test_tov_ppm/momx_norm1.xg
index 679dcfb..679dcfb 100644
--- a/test/whisky_test_tov_ppm/momx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/momx_norm1.xg
diff --git a/test/whisky_test_tov_ppm/momx_norm2.xg b/test/GRHydro_test_tov_ppm/momx_norm2.xg
index f2ebca3..f2ebca3 100644
--- a/test/whisky_test_tov_ppm/momx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/momx_norm2.xg
diff --git a/test/whisky_test_tov_ppm/momx_x_[16][16].xg b/test/GRHydro_test_tov_ppm/momx_x_[16][16].xg
index fd126ed..fd126ed 100644
--- a/test/whisky_test_tov_ppm/momx_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/momx_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/momx_y_[16][16].xg b/test/GRHydro_test_tov_ppm/momx_y_[16][16].xg
index dc85bb3..dc85bb3 100644
--- a/test/whisky_test_tov_ppm/momx_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/momx_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/momx_z_[16][16].xg b/test/GRHydro_test_tov_ppm/momx_z_[16][16].xg
index 47aa271..47aa271 100644
--- a/test/whisky_test_tov_ppm/momx_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/momx_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/momy_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/momy_3D_diagonal.xg
index 8d8866b..8d8866b 100644
--- a/test/whisky_test_tov_ppm/momy_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/momy_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/momy_maximum.xg b/test/GRHydro_test_tov_ppm/momy_maximum.xg
index 1f0c1fc..1f0c1fc 100644
--- a/test/whisky_test_tov_ppm/momy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/momy_maximum.xg
diff --git a/test/whisky_test_tov_ppm/momy_minimum.xg b/test/GRHydro_test_tov_ppm/momy_minimum.xg
index 99849d5..99849d5 100644
--- a/test/whisky_test_tov_ppm/momy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/momy_minimum.xg
diff --git a/test/whisky_test_tov_ppm/momy_norm1.xg b/test/GRHydro_test_tov_ppm/momy_norm1.xg
index 7e24e6e..7e24e6e 100644
--- a/test/whisky_test_tov_ppm/momy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/momy_norm1.xg
diff --git a/test/whisky_test_tov_ppm/momy_norm2.xg b/test/GRHydro_test_tov_ppm/momy_norm2.xg
index 2d85ae6..2d85ae6 100644
--- a/test/whisky_test_tov_ppm/momy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/momy_norm2.xg
diff --git a/test/whisky_test_tov_ppm/momy_x_[16][16].xg b/test/GRHydro_test_tov_ppm/momy_x_[16][16].xg
index e76364a..e76364a 100644
--- a/test/whisky_test_tov_ppm/momy_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/momy_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/momy_y_[16][16].xg b/test/GRHydro_test_tov_ppm/momy_y_[16][16].xg
index db295af..db295af 100644
--- a/test/whisky_test_tov_ppm/momy_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/momy_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/momy_z_[16][16].xg b/test/GRHydro_test_tov_ppm/momy_z_[16][16].xg
index 62c862e..62c862e 100644
--- a/test/whisky_test_tov_ppm/momy_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/momy_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/momz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/momz_3D_diagonal.xg
index 5a060ba..5a060ba 100644
--- a/test/whisky_test_tov_ppm/momz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/momz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/momz_maximum.xg b/test/GRHydro_test_tov_ppm/momz_maximum.xg
index e47c256..e47c256 100644
--- a/test/whisky_test_tov_ppm/momz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/momz_maximum.xg
diff --git a/test/whisky_test_tov_ppm/momz_minimum.xg b/test/GRHydro_test_tov_ppm/momz_minimum.xg
index 8f81c7a..8f81c7a 100644
--- a/test/whisky_test_tov_ppm/momz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/momz_minimum.xg
diff --git a/test/whisky_test_tov_ppm/momz_norm1.xg b/test/GRHydro_test_tov_ppm/momz_norm1.xg
index 9b14a9a..9b14a9a 100644
--- a/test/whisky_test_tov_ppm/momz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/momz_norm1.xg
diff --git a/test/whisky_test_tov_ppm/momz_norm2.xg b/test/GRHydro_test_tov_ppm/momz_norm2.xg
index 73ff283..73ff283 100644
--- a/test/whisky_test_tov_ppm/momz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/momz_norm2.xg
diff --git a/test/whisky_test_tov_ppm/momz_x_[16][16].xg b/test/GRHydro_test_tov_ppm/momz_x_[16][16].xg
index f0eea1f..f0eea1f 100644
--- a/test/whisky_test_tov_ppm/momz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/momz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/momz_y_[16][16].xg b/test/GRHydro_test_tov_ppm/momz_y_[16][16].xg
index d89bfb0..d89bfb0 100644
--- a/test/whisky_test_tov_ppm/momz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/momz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/momz_z_[16][16].xg b/test/GRHydro_test_tov_ppm/momz_z_[16][16].xg
index 54f635c..54f635c 100644
--- a/test/whisky_test_tov_ppm/momz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/momz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/press_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/press_3D_diagonal.xg
index 330ea8f..330ea8f 100644
--- a/test/whisky_test_tov_ppm/press_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/press_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/press_maximum.xg b/test/GRHydro_test_tov_ppm/press_maximum.xg
index e8669ea..e8669ea 100644
--- a/test/whisky_test_tov_ppm/press_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/press_maximum.xg
diff --git a/test/whisky_test_tov_ppm/press_minimum.xg b/test/GRHydro_test_tov_ppm/press_minimum.xg
index 5860d41..5860d41 100644
--- a/test/whisky_test_tov_ppm/press_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/press_minimum.xg
diff --git a/test/whisky_test_tov_ppm/press_norm1.xg b/test/GRHydro_test_tov_ppm/press_norm1.xg
index d139036..d139036 100644
--- a/test/whisky_test_tov_ppm/press_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/press_norm1.xg
diff --git a/test/whisky_test_tov_ppm/press_norm2.xg b/test/GRHydro_test_tov_ppm/press_norm2.xg
index 9b2d8f1..9b2d8f1 100644
--- a/test/whisky_test_tov_ppm/press_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/press_norm2.xg
diff --git a/test/whisky_test_tov_ppm/press_x_[16][16].xg b/test/GRHydro_test_tov_ppm/press_x_[16][16].xg
index e3ce88a..e3ce88a 100644
--- a/test/whisky_test_tov_ppm/press_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/press_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/press_y_[16][16].xg b/test/GRHydro_test_tov_ppm/press_y_[16][16].xg
index e3ce88a..e3ce88a 100644
--- a/test/whisky_test_tov_ppm/press_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/press_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/press_z_[16][16].xg b/test/GRHydro_test_tov_ppm/press_z_[16][16].xg
index e3ce88a..e3ce88a 100644
--- a/test/whisky_test_tov_ppm/press_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/press_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/rho_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/rho_3D_diagonal.xg
index 663c42e..663c42e 100644
--- a/test/whisky_test_tov_ppm/rho_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/rho_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/rho_maximum.xg b/test/GRHydro_test_tov_ppm/rho_maximum.xg
index ab6be3b..ab6be3b 100644
--- a/test/whisky_test_tov_ppm/rho_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/rho_maximum.xg
diff --git a/test/whisky_test_tov_ppm/rho_minimum.xg b/test/GRHydro_test_tov_ppm/rho_minimum.xg
index d5fa141..d5fa141 100644
--- a/test/whisky_test_tov_ppm/rho_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/rho_minimum.xg
diff --git a/test/whisky_test_tov_ppm/rho_norm1.xg b/test/GRHydro_test_tov_ppm/rho_norm1.xg
index a3f1c0d..a3f1c0d 100644
--- a/test/whisky_test_tov_ppm/rho_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/rho_norm1.xg
diff --git a/test/whisky_test_tov_ppm/rho_norm2.xg b/test/GRHydro_test_tov_ppm/rho_norm2.xg
index cd623ea..cd623ea 100644
--- a/test/whisky_test_tov_ppm/rho_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/rho_norm2.xg
diff --git a/test/whisky_test_tov_ppm/rho_x_[16][16].xg b/test/GRHydro_test_tov_ppm/rho_x_[16][16].xg
index fc1a756..fc1a756 100644
--- a/test/whisky_test_tov_ppm/rho_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/rho_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/rho_y_[16][16].xg b/test/GRHydro_test_tov_ppm/rho_y_[16][16].xg
index fc1a756..fc1a756 100644
--- a/test/whisky_test_tov_ppm/rho_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/rho_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/rho_z_[16][16].xg b/test/GRHydro_test_tov_ppm/rho_z_[16][16].xg
index fc1a756..fc1a756 100644
--- a/test/whisky_test_tov_ppm/rho_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/rho_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/scon[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/scon[0]_3D_diagonal.xg
index 5fc62d0..5fc62d0 100644
--- a/test/whisky_test_tov_ppm/scon[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/scon[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/scon[0]_maximum.xg b/test/GRHydro_test_tov_ppm/scon[0]_maximum.xg
index 40c3e05..40c3e05 100644
--- a/test/whisky_test_tov_ppm/scon[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/scon[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm/scon[0]_minimum.xg b/test/GRHydro_test_tov_ppm/scon[0]_minimum.xg
index b537648..b537648 100644
--- a/test/whisky_test_tov_ppm/scon[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/scon[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm/scon[0]_norm1.xg b/test/GRHydro_test_tov_ppm/scon[0]_norm1.xg
index c51f6f9..c51f6f9 100644
--- a/test/whisky_test_tov_ppm/scon[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/scon[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm/scon[0]_norm2.xg b/test/GRHydro_test_tov_ppm/scon[0]_norm2.xg
index 27190f3..27190f3 100644
--- a/test/whisky_test_tov_ppm/scon[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/scon[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm/scon[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm/scon[0]_x_[16][16].xg
index 313887c..313887c 100644
--- a/test/whisky_test_tov_ppm/scon[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/scon[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/scon[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm/scon[0]_y_[16][16].xg
index 170f139..170f139 100644
--- a/test/whisky_test_tov_ppm/scon[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/scon[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/scon[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm/scon[0]_z_[16][16].xg
index d4d7bf4..d4d7bf4 100644
--- a/test/whisky_test_tov_ppm/scon[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/scon[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/scon[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/scon[1]_3D_diagonal.xg
index 50166c2..50166c2 100644
--- a/test/whisky_test_tov_ppm/scon[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/scon[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/scon[1]_maximum.xg b/test/GRHydro_test_tov_ppm/scon[1]_maximum.xg
index eda21c2..eda21c2 100644
--- a/test/whisky_test_tov_ppm/scon[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/scon[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm/scon[1]_minimum.xg b/test/GRHydro_test_tov_ppm/scon[1]_minimum.xg
index 95dc3b6..95dc3b6 100644
--- a/test/whisky_test_tov_ppm/scon[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/scon[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm/scon[1]_norm1.xg b/test/GRHydro_test_tov_ppm/scon[1]_norm1.xg
index d081d52..d081d52 100644
--- a/test/whisky_test_tov_ppm/scon[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/scon[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm/scon[1]_norm2.xg b/test/GRHydro_test_tov_ppm/scon[1]_norm2.xg
index 3add453..3add453 100644
--- a/test/whisky_test_tov_ppm/scon[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/scon[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm/scon[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm/scon[1]_x_[16][16].xg
index 7eb8b57..7eb8b57 100644
--- a/test/whisky_test_tov_ppm/scon[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/scon[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/scon[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm/scon[1]_y_[16][16].xg
index fd405f6..fd405f6 100644
--- a/test/whisky_test_tov_ppm/scon[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/scon[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/scon[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm/scon[1]_z_[16][16].xg
index 9e3529f..9e3529f 100644
--- a/test/whisky_test_tov_ppm/scon[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/scon[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/scon[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/scon[2]_3D_diagonal.xg
index 50166c2..50166c2 100644
--- a/test/whisky_test_tov_ppm/scon[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/scon[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/scon[2]_maximum.xg b/test/GRHydro_test_tov_ppm/scon[2]_maximum.xg
index e28d22f..e28d22f 100644
--- a/test/whisky_test_tov_ppm/scon[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/scon[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm/scon[2]_minimum.xg b/test/GRHydro_test_tov_ppm/scon[2]_minimum.xg
index 792ec28..792ec28 100644
--- a/test/whisky_test_tov_ppm/scon[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/scon[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm/scon[2]_norm1.xg b/test/GRHydro_test_tov_ppm/scon[2]_norm1.xg
index d5fc589..d5fc589 100644
--- a/test/whisky_test_tov_ppm/scon[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/scon[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm/scon[2]_norm2.xg b/test/GRHydro_test_tov_ppm/scon[2]_norm2.xg
index d62cad9..d62cad9 100644
--- a/test/whisky_test_tov_ppm/scon[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/scon[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm/scon[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm/scon[2]_x_[16][16].xg
index 95443ef..95443ef 100644
--- a/test/whisky_test_tov_ppm/scon[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/scon[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/scon[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm/scon[2]_y_[16][16].xg
index 67366fd..67366fd 100644
--- a/test/whisky_test_tov_ppm/scon[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/scon[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/scon[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm/scon[2]_z_[16][16].xg
index fd405f6..fd405f6 100644
--- a/test/whisky_test_tov_ppm/scon[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/scon[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/tau_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/tau_3D_diagonal.xg
index 8df7268..8df7268 100644
--- a/test/whisky_test_tov_ppm/tau_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/tau_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/tau_maximum.xg b/test/GRHydro_test_tov_ppm/tau_maximum.xg
index 9d0efd5..9d0efd5 100644
--- a/test/whisky_test_tov_ppm/tau_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/tau_maximum.xg
diff --git a/test/whisky_test_tov_ppm/tau_minimum.xg b/test/GRHydro_test_tov_ppm/tau_minimum.xg
index 717b687..717b687 100644
--- a/test/whisky_test_tov_ppm/tau_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/tau_minimum.xg
diff --git a/test/whisky_test_tov_ppm/tau_norm1.xg b/test/GRHydro_test_tov_ppm/tau_norm1.xg
index e70e38c..e70e38c 100644
--- a/test/whisky_test_tov_ppm/tau_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/tau_norm1.xg
diff --git a/test/whisky_test_tov_ppm/tau_norm2.xg b/test/GRHydro_test_tov_ppm/tau_norm2.xg
index 3176ed1..3176ed1 100644
--- a/test/whisky_test_tov_ppm/tau_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/tau_norm2.xg
diff --git a/test/whisky_test_tov_ppm/tau_x_[16][16].xg b/test/GRHydro_test_tov_ppm/tau_x_[16][16].xg
index 8c12307..8c12307 100644
--- a/test/whisky_test_tov_ppm/tau_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/tau_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/tau_y_[16][16].xg b/test/GRHydro_test_tov_ppm/tau_y_[16][16].xg
index 0970fbf..0970fbf 100644
--- a/test/whisky_test_tov_ppm/tau_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/tau_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/tau_z_[16][16].xg b/test/GRHydro_test_tov_ppm/tau_z_[16][16].xg
index 0970fbf..0970fbf 100644
--- a/test/whisky_test_tov_ppm/tau_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/tau_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/vel[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/vel[0]_3D_diagonal.xg
index acca7f6..acca7f6 100644
--- a/test/whisky_test_tov_ppm/vel[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/vel[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/vel[0]_maximum.xg b/test/GRHydro_test_tov_ppm/vel[0]_maximum.xg
index 76e0a5a..76e0a5a 100644
--- a/test/whisky_test_tov_ppm/vel[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/vel[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm/vel[0]_minimum.xg b/test/GRHydro_test_tov_ppm/vel[0]_minimum.xg
index 3ee44b2..3ee44b2 100644
--- a/test/whisky_test_tov_ppm/vel[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/vel[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm/vel[0]_norm1.xg b/test/GRHydro_test_tov_ppm/vel[0]_norm1.xg
index 8d17001..8d17001 100644
--- a/test/whisky_test_tov_ppm/vel[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/vel[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm/vel[0]_norm2.xg b/test/GRHydro_test_tov_ppm/vel[0]_norm2.xg
index 374aa73..374aa73 100644
--- a/test/whisky_test_tov_ppm/vel[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/vel[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm/vel[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm/vel[0]_x_[16][16].xg
index 56d913d..56d913d 100644
--- a/test/whisky_test_tov_ppm/vel[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/vel[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/vel[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm/vel[0]_y_[16][16].xg
index 4fa0a71..4fa0a71 100644
--- a/test/whisky_test_tov_ppm/vel[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/vel[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/vel[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm/vel[0]_z_[16][16].xg
index c6a1f9e..c6a1f9e 100644
--- a/test/whisky_test_tov_ppm/vel[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/vel[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/vel[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/vel[1]_3D_diagonal.xg
index 2184096..2184096 100644
--- a/test/whisky_test_tov_ppm/vel[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/vel[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/vel[1]_maximum.xg b/test/GRHydro_test_tov_ppm/vel[1]_maximum.xg
index c344ca6..c344ca6 100644
--- a/test/whisky_test_tov_ppm/vel[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/vel[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm/vel[1]_minimum.xg b/test/GRHydro_test_tov_ppm/vel[1]_minimum.xg
index 4e4972c..4e4972c 100644
--- a/test/whisky_test_tov_ppm/vel[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/vel[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm/vel[1]_norm1.xg b/test/GRHydro_test_tov_ppm/vel[1]_norm1.xg
index a57bdec..a57bdec 100644
--- a/test/whisky_test_tov_ppm/vel[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/vel[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm/vel[1]_norm2.xg b/test/GRHydro_test_tov_ppm/vel[1]_norm2.xg
index bd86e20..bd86e20 100644
--- a/test/whisky_test_tov_ppm/vel[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/vel[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm/vel[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm/vel[1]_x_[16][16].xg
index 10b5c02..10b5c02 100644
--- a/test/whisky_test_tov_ppm/vel[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/vel[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/vel[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm/vel[1]_y_[16][16].xg
index ddcbad8..ddcbad8 100644
--- a/test/whisky_test_tov_ppm/vel[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/vel[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/vel[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm/vel[1]_z_[16][16].xg
index ef6f58a..ef6f58a 100644
--- a/test/whisky_test_tov_ppm/vel[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/vel[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/vel[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/vel[2]_3D_diagonal.xg
index 71a1d30..71a1d30 100644
--- a/test/whisky_test_tov_ppm/vel[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/vel[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/vel[2]_maximum.xg b/test/GRHydro_test_tov_ppm/vel[2]_maximum.xg
index abf9b6c..abf9b6c 100644
--- a/test/whisky_test_tov_ppm/vel[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/vel[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm/vel[2]_minimum.xg b/test/GRHydro_test_tov_ppm/vel[2]_minimum.xg
index 27f84b4..27f84b4 100644
--- a/test/whisky_test_tov_ppm/vel[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/vel[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm/vel[2]_norm1.xg b/test/GRHydro_test_tov_ppm/vel[2]_norm1.xg
index 208fbb0..208fbb0 100644
--- a/test/whisky_test_tov_ppm/vel[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/vel[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm/vel[2]_norm2.xg b/test/GRHydro_test_tov_ppm/vel[2]_norm2.xg
index 8eb1536..8eb1536 100644
--- a/test/whisky_test_tov_ppm/vel[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/vel[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm/vel[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm/vel[2]_x_[16][16].xg
index 193a861..193a861 100644
--- a/test/whisky_test_tov_ppm/vel[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/vel[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/vel[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm/vel[2]_y_[16][16].xg
index b81291f..b81291f 100644
--- a/test/whisky_test_tov_ppm/vel[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/vel[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/vel[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm/vel[2]_z_[16][16].xg
index 11ca726..11ca726 100644
--- a/test/whisky_test_tov_ppm/vel[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/vel[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/w_lorentz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm/w_lorentz_3D_diagonal.xg
index da97f23..da97f23 100644
--- a/test/whisky_test_tov_ppm/w_lorentz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm/w_lorentz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm/w_lorentz_maximum.xg b/test/GRHydro_test_tov_ppm/w_lorentz_maximum.xg
index 3e8e1ce..3e8e1ce 100644
--- a/test/whisky_test_tov_ppm/w_lorentz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm/w_lorentz_maximum.xg
diff --git a/test/whisky_test_tov_ppm/w_lorentz_minimum.xg b/test/GRHydro_test_tov_ppm/w_lorentz_minimum.xg
index 6874066..6874066 100644
--- a/test/whisky_test_tov_ppm/w_lorentz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm/w_lorentz_minimum.xg
diff --git a/test/whisky_test_tov_ppm/w_lorentz_norm1.xg b/test/GRHydro_test_tov_ppm/w_lorentz_norm1.xg
index 254515e..254515e 100644
--- a/test/whisky_test_tov_ppm/w_lorentz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm/w_lorentz_norm1.xg
diff --git a/test/whisky_test_tov_ppm/w_lorentz_norm2.xg b/test/GRHydro_test_tov_ppm/w_lorentz_norm2.xg
index fa8e291..fa8e291 100644
--- a/test/whisky_test_tov_ppm/w_lorentz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm/w_lorentz_norm2.xg
diff --git a/test/whisky_test_tov_ppm/w_lorentz_x_[16][16].xg b/test/GRHydro_test_tov_ppm/w_lorentz_x_[16][16].xg
index 61fcbd6..61fcbd6 100644
--- a/test/whisky_test_tov_ppm/w_lorentz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/w_lorentz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/w_lorentz_y_[16][16].xg b/test/GRHydro_test_tov_ppm/w_lorentz_y_[16][16].xg
index 61fcbd6..61fcbd6 100644
--- a/test/whisky_test_tov_ppm/w_lorentz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/w_lorentz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/w_lorentz_z_[16][16].xg b/test/GRHydro_test_tov_ppm/w_lorentz_z_[16][16].xg
index 61fcbd6..61fcbd6 100644
--- a/test/whisky_test_tov_ppm/w_lorentz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm/w_lorentz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm/whisky_test_tov_ppm.par b/test/GRHydro_test_tov_ppm/whisky_test_tov_ppm.par
index e69de29..e69de29 100644
--- a/test/whisky_test_tov_ppm/whisky_test_tov_ppm.par
+++ b/test/GRHydro_test_tov_ppm/whisky_test_tov_ppm.par
diff --git a/test/whisky_test_tov_ppm_ML/alp_maximum.xg b/test/GRHydro_test_tov_ppm_ML/alp_maximum.xg
index 4f7fbd3..4f7fbd3 100644
--- a/test/whisky_test_tov_ppm_ML/alp_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/alp_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/alp_minimum.xg b/test/GRHydro_test_tov_ppm_ML/alp_minimum.xg
index 6650bd1..6650bd1 100644
--- a/test/whisky_test_tov_ppm_ML/alp_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/alp_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/alp_norm1.xg b/test/GRHydro_test_tov_ppm_ML/alp_norm1.xg
index 57139b3..57139b3 100644
--- a/test/whisky_test_tov_ppm_ML/alp_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/alp_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/alp_norm2.xg b/test/GRHydro_test_tov_ppm_ML/alp_norm2.xg
index 545a894..545a894 100644
--- a/test/whisky_test_tov_ppm_ML/alp_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/alp_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/dens_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/dens_3D_diagonal.xg
index 60afe50..60afe50 100644
--- a/test/whisky_test_tov_ppm_ML/dens_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/dens_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/dens_maximum.xg b/test/GRHydro_test_tov_ppm_ML/dens_maximum.xg
index 34c4ab9..34c4ab9 100644
--- a/test/whisky_test_tov_ppm_ML/dens_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/dens_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/dens_minimum.xg b/test/GRHydro_test_tov_ppm_ML/dens_minimum.xg
index 7ecea1c..7ecea1c 100644
--- a/test/whisky_test_tov_ppm_ML/dens_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/dens_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/dens_norm1.xg b/test/GRHydro_test_tov_ppm_ML/dens_norm1.xg
index f77dc0b..f77dc0b 100644
--- a/test/whisky_test_tov_ppm_ML/dens_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/dens_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/dens_norm2.xg b/test/GRHydro_test_tov_ppm_ML/dens_norm2.xg
index 0d237b4..0d237b4 100644
--- a/test/whisky_test_tov_ppm_ML/dens_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/dens_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/dens_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/dens_x_[16][16].xg
index 92d17d8..92d17d8 100644
--- a/test/whisky_test_tov_ppm_ML/dens_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/dens_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/dens_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/dens_y_[16][16].xg
index 92d17d8..92d17d8 100644
--- a/test/whisky_test_tov_ppm_ML/dens_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/dens_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/dens_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/dens_z_[16][16].xg
index 92d17d8..92d17d8 100644
--- a/test/whisky_test_tov_ppm_ML/dens_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/dens_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/eps_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/eps_3D_diagonal.xg
index a6cc2c7..a6cc2c7 100644
--- a/test/whisky_test_tov_ppm_ML/eps_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/eps_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/eps_maximum.xg b/test/GRHydro_test_tov_ppm_ML/eps_maximum.xg
index fefb56b..fefb56b 100644
--- a/test/whisky_test_tov_ppm_ML/eps_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/eps_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/eps_minimum.xg b/test/GRHydro_test_tov_ppm_ML/eps_minimum.xg
index 4b1b36c..4b1b36c 100644
--- a/test/whisky_test_tov_ppm_ML/eps_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/eps_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/eps_norm1.xg b/test/GRHydro_test_tov_ppm_ML/eps_norm1.xg
index ea209a6..ea209a6 100644
--- a/test/whisky_test_tov_ppm_ML/eps_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/eps_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/eps_norm2.xg b/test/GRHydro_test_tov_ppm_ML/eps_norm2.xg
index ff8e098..ff8e098 100644
--- a/test/whisky_test_tov_ppm_ML/eps_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/eps_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/eps_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/eps_x_[16][16].xg
index fa4bb6c..fa4bb6c 100644
--- a/test/whisky_test_tov_ppm_ML/eps_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/eps_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/eps_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/eps_y_[16][16].xg
index fa4bb6c..fa4bb6c 100644
--- a/test/whisky_test_tov_ppm_ML/eps_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/eps_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/eps_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/eps_z_[16][16].xg
index fa4bb6c..fa4bb6c 100644
--- a/test/whisky_test_tov_ppm_ML/eps_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/eps_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/gxx_maximum.xg b/test/GRHydro_test_tov_ppm_ML/gxx_maximum.xg
index 3bb1d6c..3bb1d6c 100644
--- a/test/whisky_test_tov_ppm_ML/gxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxx_minimum.xg b/test/GRHydro_test_tov_ppm_ML/gxx_minimum.xg
index aed1081..aed1081 100644
--- a/test/whisky_test_tov_ppm_ML/gxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxx_norm1.xg b/test/GRHydro_test_tov_ppm_ML/gxx_norm1.xg
index 68c821d..68c821d 100644
--- a/test/whisky_test_tov_ppm_ML/gxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxx_norm2.xg b/test/GRHydro_test_tov_ppm_ML/gxx_norm2.xg
index 4ce3fa6..4ce3fa6 100644
--- a/test/whisky_test_tov_ppm_ML/gxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxy_maximum.xg b/test/GRHydro_test_tov_ppm_ML/gxy_maximum.xg
index 37f3f9a..37f3f9a 100644
--- a/test/whisky_test_tov_ppm_ML/gxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxy_minimum.xg b/test/GRHydro_test_tov_ppm_ML/gxy_minimum.xg
index 5ec98bb..5ec98bb 100644
--- a/test/whisky_test_tov_ppm_ML/gxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxy_norm1.xg b/test/GRHydro_test_tov_ppm_ML/gxy_norm1.xg
index d780a5f..d780a5f 100644
--- a/test/whisky_test_tov_ppm_ML/gxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxy_norm2.xg b/test/GRHydro_test_tov_ppm_ML/gxy_norm2.xg
index 13e02cd..13e02cd 100644
--- a/test/whisky_test_tov_ppm_ML/gxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxz_maximum.xg b/test/GRHydro_test_tov_ppm_ML/gxz_maximum.xg
index 27a3600..27a3600 100644
--- a/test/whisky_test_tov_ppm_ML/gxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxz_minimum.xg b/test/GRHydro_test_tov_ppm_ML/gxz_minimum.xg
index e0a297e..e0a297e 100644
--- a/test/whisky_test_tov_ppm_ML/gxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxz_norm1.xg b/test/GRHydro_test_tov_ppm_ML/gxz_norm1.xg
index bb7786b..bb7786b 100644
--- a/test/whisky_test_tov_ppm_ML/gxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/gxz_norm2.xg b/test/GRHydro_test_tov_ppm_ML/gxz_norm2.xg
index 228ccfc..228ccfc 100644
--- a/test/whisky_test_tov_ppm_ML/gxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/gyy_maximum.xg b/test/GRHydro_test_tov_ppm_ML/gyy_maximum.xg
index d22e2bd..d22e2bd 100644
--- a/test/whisky_test_tov_ppm_ML/gyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gyy_minimum.xg b/test/GRHydro_test_tov_ppm_ML/gyy_minimum.xg
index 6bbcce3..6bbcce3 100644
--- a/test/whisky_test_tov_ppm_ML/gyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gyy_norm1.xg b/test/GRHydro_test_tov_ppm_ML/gyy_norm1.xg
index f535bde..f535bde 100644
--- a/test/whisky_test_tov_ppm_ML/gyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/gyy_norm2.xg b/test/GRHydro_test_tov_ppm_ML/gyy_norm2.xg
index fb00882..fb00882 100644
--- a/test/whisky_test_tov_ppm_ML/gyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/gyz_maximum.xg b/test/GRHydro_test_tov_ppm_ML/gyz_maximum.xg
index 6d80a77..6d80a77 100644
--- a/test/whisky_test_tov_ppm_ML/gyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gyz_minimum.xg b/test/GRHydro_test_tov_ppm_ML/gyz_minimum.xg
index 6684f7a..6684f7a 100644
--- a/test/whisky_test_tov_ppm_ML/gyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gyz_norm1.xg b/test/GRHydro_test_tov_ppm_ML/gyz_norm1.xg
index 1e2c5f5..1e2c5f5 100644
--- a/test/whisky_test_tov_ppm_ML/gyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/gyz_norm2.xg b/test/GRHydro_test_tov_ppm_ML/gyz_norm2.xg
index 380ddc5..380ddc5 100644
--- a/test/whisky_test_tov_ppm_ML/gyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/gzz_maximum.xg b/test/GRHydro_test_tov_ppm_ML/gzz_maximum.xg
index 3cce90e..3cce90e 100644
--- a/test/whisky_test_tov_ppm_ML/gzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gzz_minimum.xg b/test/GRHydro_test_tov_ppm_ML/gzz_minimum.xg
index 4cdf653..4cdf653 100644
--- a/test/whisky_test_tov_ppm_ML/gzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/gzz_norm1.xg b/test/GRHydro_test_tov_ppm_ML/gzz_norm1.xg
index e5f511e..e5f511e 100644
--- a/test/whisky_test_tov_ppm_ML/gzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/gzz_norm2.xg b/test/GRHydro_test_tov_ppm_ML/gzz_norm2.xg
index 52da1bd..52da1bd 100644
--- a/test/whisky_test_tov_ppm_ML/gzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/gzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/ham_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/ham_3D_diagonal.xg
index 32b681f..32b681f 100644
--- a/test/whisky_test_tov_ppm_ML/ham_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/ham_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/ham_maximum.xg b/test/GRHydro_test_tov_ppm_ML/ham_maximum.xg
index 37189b3..37189b3 100644
--- a/test/whisky_test_tov_ppm_ML/ham_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/ham_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/ham_minimum.xg b/test/GRHydro_test_tov_ppm_ML/ham_minimum.xg
index aaca631..aaca631 100644
--- a/test/whisky_test_tov_ppm_ML/ham_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/ham_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/ham_norm1.xg b/test/GRHydro_test_tov_ppm_ML/ham_norm1.xg
index 56f4d4f..56f4d4f 100644
--- a/test/whisky_test_tov_ppm_ML/ham_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/ham_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/ham_norm2.xg b/test/GRHydro_test_tov_ppm_ML/ham_norm2.xg
index d60a75b..d60a75b 100644
--- a/test/whisky_test_tov_ppm_ML/ham_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/ham_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/ham_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/ham_x_[16][16].xg
index 53f5560..53f5560 100644
--- a/test/whisky_test_tov_ppm_ML/ham_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/ham_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/ham_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/ham_y_[16][16].xg
index 1fb07d8..1fb07d8 100644
--- a/test/whisky_test_tov_ppm_ML/ham_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/ham_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/ham_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/ham_z_[16][16].xg
index 2405e52..2405e52 100644
--- a/test/whisky_test_tov_ppm_ML/ham_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/ham_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/kxx_maximum.xg b/test/GRHydro_test_tov_ppm_ML/kxx_maximum.xg
index 0e57258..0e57258 100644
--- a/test/whisky_test_tov_ppm_ML/kxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxx_minimum.xg b/test/GRHydro_test_tov_ppm_ML/kxx_minimum.xg
index b08e974..b08e974 100644
--- a/test/whisky_test_tov_ppm_ML/kxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxx_norm1.xg b/test/GRHydro_test_tov_ppm_ML/kxx_norm1.xg
index 9ad07c5..9ad07c5 100644
--- a/test/whisky_test_tov_ppm_ML/kxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxx_norm2.xg b/test/GRHydro_test_tov_ppm_ML/kxx_norm2.xg
index 8e19ee3..8e19ee3 100644
--- a/test/whisky_test_tov_ppm_ML/kxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxy_maximum.xg b/test/GRHydro_test_tov_ppm_ML/kxy_maximum.xg
index e3b9c59..e3b9c59 100644
--- a/test/whisky_test_tov_ppm_ML/kxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxy_minimum.xg b/test/GRHydro_test_tov_ppm_ML/kxy_minimum.xg
index dd2c493..dd2c493 100644
--- a/test/whisky_test_tov_ppm_ML/kxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxy_norm1.xg b/test/GRHydro_test_tov_ppm_ML/kxy_norm1.xg
index 16ddc55..16ddc55 100644
--- a/test/whisky_test_tov_ppm_ML/kxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxy_norm2.xg b/test/GRHydro_test_tov_ppm_ML/kxy_norm2.xg
index fb255bb..fb255bb 100644
--- a/test/whisky_test_tov_ppm_ML/kxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxz_maximum.xg b/test/GRHydro_test_tov_ppm_ML/kxz_maximum.xg
index d1d881d..d1d881d 100644
--- a/test/whisky_test_tov_ppm_ML/kxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxz_minimum.xg b/test/GRHydro_test_tov_ppm_ML/kxz_minimum.xg
index 56e8872..56e8872 100644
--- a/test/whisky_test_tov_ppm_ML/kxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxz_norm1.xg b/test/GRHydro_test_tov_ppm_ML/kxz_norm1.xg
index 92097a4..92097a4 100644
--- a/test/whisky_test_tov_ppm_ML/kxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/kxz_norm2.xg b/test/GRHydro_test_tov_ppm_ML/kxz_norm2.xg
index e249efc..e249efc 100644
--- a/test/whisky_test_tov_ppm_ML/kxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/kyy_maximum.xg b/test/GRHydro_test_tov_ppm_ML/kyy_maximum.xg
index 01af2ce..01af2ce 100644
--- a/test/whisky_test_tov_ppm_ML/kyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kyy_minimum.xg b/test/GRHydro_test_tov_ppm_ML/kyy_minimum.xg
index adf9cf5..adf9cf5 100644
--- a/test/whisky_test_tov_ppm_ML/kyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kyy_norm1.xg b/test/GRHydro_test_tov_ppm_ML/kyy_norm1.xg
index 1a2ae80..1a2ae80 100644
--- a/test/whisky_test_tov_ppm_ML/kyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/kyy_norm2.xg b/test/GRHydro_test_tov_ppm_ML/kyy_norm2.xg
index a04bb64..a04bb64 100644
--- a/test/whisky_test_tov_ppm_ML/kyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/kyz_maximum.xg b/test/GRHydro_test_tov_ppm_ML/kyz_maximum.xg
index e493b14..e493b14 100644
--- a/test/whisky_test_tov_ppm_ML/kyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kyz_minimum.xg b/test/GRHydro_test_tov_ppm_ML/kyz_minimum.xg
index 44de007..44de007 100644
--- a/test/whisky_test_tov_ppm_ML/kyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kyz_norm1.xg b/test/GRHydro_test_tov_ppm_ML/kyz_norm1.xg
index 7dd05c8..7dd05c8 100644
--- a/test/whisky_test_tov_ppm_ML/kyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/kyz_norm2.xg b/test/GRHydro_test_tov_ppm_ML/kyz_norm2.xg
index cdb609d..cdb609d 100644
--- a/test/whisky_test_tov_ppm_ML/kyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/kzz_maximum.xg b/test/GRHydro_test_tov_ppm_ML/kzz_maximum.xg
index 607be7c..607be7c 100644
--- a/test/whisky_test_tov_ppm_ML/kzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kzz_minimum.xg b/test/GRHydro_test_tov_ppm_ML/kzz_minimum.xg
index f4f31bd..f4f31bd 100644
--- a/test/whisky_test_tov_ppm_ML/kzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/kzz_norm1.xg b/test/GRHydro_test_tov_ppm_ML/kzz_norm1.xg
index 9c1f71b..9c1f71b 100644
--- a/test/whisky_test_tov_ppm_ML/kzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/kzz_norm2.xg b/test/GRHydro_test_tov_ppm_ML/kzz_norm2.xg
index d334f8f..d334f8f 100644
--- a/test/whisky_test_tov_ppm_ML/kzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/kzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/momx_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/momx_3D_diagonal.xg
index 03c675c..03c675c 100644
--- a/test/whisky_test_tov_ppm_ML/momx_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momx_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/momx_maximum.xg b/test/GRHydro_test_tov_ppm_ML/momx_maximum.xg
index fcc2403..fcc2403 100644
--- a/test/whisky_test_tov_ppm_ML/momx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/momx_minimum.xg b/test/GRHydro_test_tov_ppm_ML/momx_minimum.xg
index d440388..d440388 100644
--- a/test/whisky_test_tov_ppm_ML/momx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/momx_norm1.xg b/test/GRHydro_test_tov_ppm_ML/momx_norm1.xg
index dab5ea0..dab5ea0 100644
--- a/test/whisky_test_tov_ppm_ML/momx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/momx_norm2.xg b/test/GRHydro_test_tov_ppm_ML/momx_norm2.xg
index 0ffd0fa..0ffd0fa 100644
--- a/test/whisky_test_tov_ppm_ML/momx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/momx_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/momx_x_[16][16].xg
index 64fe169..64fe169 100644
--- a/test/whisky_test_tov_ppm_ML/momx_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/momx_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/momx_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/momx_y_[16][16].xg
index c3d543c..c3d543c 100644
--- a/test/whisky_test_tov_ppm_ML/momx_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/momx_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/momx_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/momx_z_[16][16].xg
index 4b20cd5..4b20cd5 100644
--- a/test/whisky_test_tov_ppm_ML/momx_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/momx_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/momy_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/momy_3D_diagonal.xg
index 03c675c..03c675c 100644
--- a/test/whisky_test_tov_ppm_ML/momy_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momy_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/momy_maximum.xg b/test/GRHydro_test_tov_ppm_ML/momy_maximum.xg
index d0fdbe5..d0fdbe5 100644
--- a/test/whisky_test_tov_ppm_ML/momy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/momy_minimum.xg b/test/GRHydro_test_tov_ppm_ML/momy_minimum.xg
index 52d401a..52d401a 100644
--- a/test/whisky_test_tov_ppm_ML/momy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/momy_norm1.xg b/test/GRHydro_test_tov_ppm_ML/momy_norm1.xg
index c8c2735..c8c2735 100644
--- a/test/whisky_test_tov_ppm_ML/momy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/momy_norm2.xg b/test/GRHydro_test_tov_ppm_ML/momy_norm2.xg
index e382016..e382016 100644
--- a/test/whisky_test_tov_ppm_ML/momy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/momy_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/momy_x_[16][16].xg
index 398b35f..398b35f 100644
--- a/test/whisky_test_tov_ppm_ML/momy_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/momy_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/momy_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/momy_y_[16][16].xg
index cbd1705..cbd1705 100644
--- a/test/whisky_test_tov_ppm_ML/momy_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/momy_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/momy_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/momy_z_[16][16].xg
index 7f8e6e8..7f8e6e8 100644
--- a/test/whisky_test_tov_ppm_ML/momy_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/momy_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/momz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/momz_3D_diagonal.xg
index da02e9d..da02e9d 100644
--- a/test/whisky_test_tov_ppm_ML/momz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/momz_maximum.xg b/test/GRHydro_test_tov_ppm_ML/momz_maximum.xg
index bdddaa6..bdddaa6 100644
--- a/test/whisky_test_tov_ppm_ML/momz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/momz_minimum.xg b/test/GRHydro_test_tov_ppm_ML/momz_minimum.xg
index ec7f267..ec7f267 100644
--- a/test/whisky_test_tov_ppm_ML/momz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/momz_norm1.xg b/test/GRHydro_test_tov_ppm_ML/momz_norm1.xg
index 84304c8..84304c8 100644
--- a/test/whisky_test_tov_ppm_ML/momz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/momz_norm2.xg b/test/GRHydro_test_tov_ppm_ML/momz_norm2.xg
index bb3095b..bb3095b 100644
--- a/test/whisky_test_tov_ppm_ML/momz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/momz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/momz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/momz_x_[16][16].xg
index 535f25e..535f25e 100644
--- a/test/whisky_test_tov_ppm_ML/momz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/momz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/momz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/momz_y_[16][16].xg
index 9c55582..9c55582 100644
--- a/test/whisky_test_tov_ppm_ML/momz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/momz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/momz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/momz_z_[16][16].xg
index b481873..b481873 100644
--- a/test/whisky_test_tov_ppm_ML/momz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/momz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/press_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/press_3D_diagonal.xg
index 27c89db..27c89db 100644
--- a/test/whisky_test_tov_ppm_ML/press_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/press_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/press_maximum.xg b/test/GRHydro_test_tov_ppm_ML/press_maximum.xg
index 32e497e..32e497e 100644
--- a/test/whisky_test_tov_ppm_ML/press_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/press_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/press_minimum.xg b/test/GRHydro_test_tov_ppm_ML/press_minimum.xg
index 5860d41..5860d41 100644
--- a/test/whisky_test_tov_ppm_ML/press_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/press_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/press_norm1.xg b/test/GRHydro_test_tov_ppm_ML/press_norm1.xg
index 1b2fcc3..1b2fcc3 100644
--- a/test/whisky_test_tov_ppm_ML/press_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/press_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/press_norm2.xg b/test/GRHydro_test_tov_ppm_ML/press_norm2.xg
index c0a606e..c0a606e 100644
--- a/test/whisky_test_tov_ppm_ML/press_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/press_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/press_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/press_x_[16][16].xg
index 3e05a4b..3e05a4b 100644
--- a/test/whisky_test_tov_ppm_ML/press_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/press_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/press_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/press_y_[16][16].xg
index 3e05a4b..3e05a4b 100644
--- a/test/whisky_test_tov_ppm_ML/press_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/press_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/press_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/press_z_[16][16].xg
index 3e05a4b..3e05a4b 100644
--- a/test/whisky_test_tov_ppm_ML/press_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/press_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/rho_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/rho_3D_diagonal.xg
index 048d439..048d439 100644
--- a/test/whisky_test_tov_ppm_ML/rho_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/rho_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/rho_maximum.xg b/test/GRHydro_test_tov_ppm_ML/rho_maximum.xg
index 27e2cf2..27e2cf2 100644
--- a/test/whisky_test_tov_ppm_ML/rho_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/rho_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/rho_minimum.xg b/test/GRHydro_test_tov_ppm_ML/rho_minimum.xg
index d5fa141..d5fa141 100644
--- a/test/whisky_test_tov_ppm_ML/rho_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/rho_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/rho_norm1.xg b/test/GRHydro_test_tov_ppm_ML/rho_norm1.xg
index c86f44a..c86f44a 100644
--- a/test/whisky_test_tov_ppm_ML/rho_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/rho_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/rho_norm2.xg b/test/GRHydro_test_tov_ppm_ML/rho_norm2.xg
index 86827ca..86827ca 100644
--- a/test/whisky_test_tov_ppm_ML/rho_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/rho_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/rho_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/rho_x_[16][16].xg
index c4062c7..c4062c7 100644
--- a/test/whisky_test_tov_ppm_ML/rho_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/rho_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/rho_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/rho_y_[16][16].xg
index c4062c7..c4062c7 100644
--- a/test/whisky_test_tov_ppm_ML/rho_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/rho_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/rho_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/rho_z_[16][16].xg
index c4062c7..c4062c7 100644
--- a/test/whisky_test_tov_ppm_ML/rho_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/rho_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/scon[0]_3D_diagonal.xg
index 90c5bbd..90c5bbd 100644
--- a/test/whisky_test_tov_ppm_ML/scon[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[0]_maximum.xg b/test/GRHydro_test_tov_ppm_ML/scon[0]_maximum.xg
index 79272e5..79272e5 100644
--- a/test/whisky_test_tov_ppm_ML/scon[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[0]_minimum.xg b/test/GRHydro_test_tov_ppm_ML/scon[0]_minimum.xg
index 2136153..2136153 100644
--- a/test/whisky_test_tov_ppm_ML/scon[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[0]_norm1.xg b/test/GRHydro_test_tov_ppm_ML/scon[0]_norm1.xg
index ebf418b..ebf418b 100644
--- a/test/whisky_test_tov_ppm_ML/scon[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[0]_norm2.xg b/test/GRHydro_test_tov_ppm_ML/scon[0]_norm2.xg
index aa0bf60..aa0bf60 100644
--- a/test/whisky_test_tov_ppm_ML/scon[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/scon[0]_x_[16][16].xg
index 93f9924..93f9924 100644
--- a/test/whisky_test_tov_ppm_ML/scon[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/scon[0]_y_[16][16].xg
index 9524d65..9524d65 100644
--- a/test/whisky_test_tov_ppm_ML/scon[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/scon[0]_z_[16][16].xg
index ece5d75..ece5d75 100644
--- a/test/whisky_test_tov_ppm_ML/scon[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/scon[1]_3D_diagonal.xg
index 90c5bbd..90c5bbd 100644
--- a/test/whisky_test_tov_ppm_ML/scon[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[1]_maximum.xg b/test/GRHydro_test_tov_ppm_ML/scon[1]_maximum.xg
index c27fcb1..c27fcb1 100644
--- a/test/whisky_test_tov_ppm_ML/scon[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[1]_minimum.xg b/test/GRHydro_test_tov_ppm_ML/scon[1]_minimum.xg
index b04f1da..b04f1da 100644
--- a/test/whisky_test_tov_ppm_ML/scon[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[1]_norm1.xg b/test/GRHydro_test_tov_ppm_ML/scon[1]_norm1.xg
index 3846020..3846020 100644
--- a/test/whisky_test_tov_ppm_ML/scon[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[1]_norm2.xg b/test/GRHydro_test_tov_ppm_ML/scon[1]_norm2.xg
index d39d9bf..d39d9bf 100644
--- a/test/whisky_test_tov_ppm_ML/scon[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/scon[1]_x_[16][16].xg
index 970d8d4..970d8d4 100644
--- a/test/whisky_test_tov_ppm_ML/scon[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/scon[1]_y_[16][16].xg
index 93f9924..93f9924 100644
--- a/test/whisky_test_tov_ppm_ML/scon[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/scon[1]_z_[16][16].xg
index 616963e..616963e 100644
--- a/test/whisky_test_tov_ppm_ML/scon[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/scon[2]_3D_diagonal.xg
index 90c5bbd..90c5bbd 100644
--- a/test/whisky_test_tov_ppm_ML/scon[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[2]_maximum.xg b/test/GRHydro_test_tov_ppm_ML/scon[2]_maximum.xg
index 7b4b9ce..7b4b9ce 100644
--- a/test/whisky_test_tov_ppm_ML/scon[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[2]_minimum.xg b/test/GRHydro_test_tov_ppm_ML/scon[2]_minimum.xg
index 5a29b6e..5a29b6e 100644
--- a/test/whisky_test_tov_ppm_ML/scon[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[2]_norm1.xg b/test/GRHydro_test_tov_ppm_ML/scon[2]_norm1.xg
index 3deaa55..3deaa55 100644
--- a/test/whisky_test_tov_ppm_ML/scon[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[2]_norm2.xg b/test/GRHydro_test_tov_ppm_ML/scon[2]_norm2.xg
index 359968e..359968e 100644
--- a/test/whisky_test_tov_ppm_ML/scon[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/scon[2]_x_[16][16].xg
index d63b935..d63b935 100644
--- a/test/whisky_test_tov_ppm_ML/scon[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/scon[2]_y_[16][16].xg
index d63b935..d63b935 100644
--- a/test/whisky_test_tov_ppm_ML/scon[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/scon[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/scon[2]_z_[16][16].xg
index 93f9924..93f9924 100644
--- a/test/whisky_test_tov_ppm_ML/scon[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/scon[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/tau_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/tau_3D_diagonal.xg
index 91e40c3..91e40c3 100644
--- a/test/whisky_test_tov_ppm_ML/tau_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/tau_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/tau_maximum.xg b/test/GRHydro_test_tov_ppm_ML/tau_maximum.xg
index a438656..a438656 100644
--- a/test/whisky_test_tov_ppm_ML/tau_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/tau_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/tau_minimum.xg b/test/GRHydro_test_tov_ppm_ML/tau_minimum.xg
index 717b687..717b687 100644
--- a/test/whisky_test_tov_ppm_ML/tau_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/tau_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/tau_norm1.xg b/test/GRHydro_test_tov_ppm_ML/tau_norm1.xg
index 3859507..3859507 100644
--- a/test/whisky_test_tov_ppm_ML/tau_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/tau_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/tau_norm2.xg b/test/GRHydro_test_tov_ppm_ML/tau_norm2.xg
index 56ee213..56ee213 100644
--- a/test/whisky_test_tov_ppm_ML/tau_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/tau_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/tau_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/tau_x_[16][16].xg
index ce9b967..ce9b967 100644
--- a/test/whisky_test_tov_ppm_ML/tau_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/tau_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/tau_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/tau_y_[16][16].xg
index ce9b967..ce9b967 100644
--- a/test/whisky_test_tov_ppm_ML/tau_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/tau_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/tau_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/tau_z_[16][16].xg
index ce9b967..ce9b967 100644
--- a/test/whisky_test_tov_ppm_ML/tau_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/tau_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/vel[0]_3D_diagonal.xg
index 572d917..572d917 100644
--- a/test/whisky_test_tov_ppm_ML/vel[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[0]_maximum.xg b/test/GRHydro_test_tov_ppm_ML/vel[0]_maximum.xg
index 2d67411..2d67411 100644
--- a/test/whisky_test_tov_ppm_ML/vel[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[0]_minimum.xg b/test/GRHydro_test_tov_ppm_ML/vel[0]_minimum.xg
index 99e7caa..99e7caa 100644
--- a/test/whisky_test_tov_ppm_ML/vel[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[0]_norm1.xg b/test/GRHydro_test_tov_ppm_ML/vel[0]_norm1.xg
index 159a4d0..159a4d0 100644
--- a/test/whisky_test_tov_ppm_ML/vel[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[0]_norm2.xg b/test/GRHydro_test_tov_ppm_ML/vel[0]_norm2.xg
index 901e3e0..901e3e0 100644
--- a/test/whisky_test_tov_ppm_ML/vel[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/vel[0]_x_[16][16].xg
index b5626d9..b5626d9 100644
--- a/test/whisky_test_tov_ppm_ML/vel[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/vel[0]_y_[16][16].xg
index 4461e34..4461e34 100644
--- a/test/whisky_test_tov_ppm_ML/vel[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/vel[0]_z_[16][16].xg
index 90801e1..90801e1 100644
--- a/test/whisky_test_tov_ppm_ML/vel[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/vel[1]_3D_diagonal.xg
index 572d917..572d917 100644
--- a/test/whisky_test_tov_ppm_ML/vel[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[1]_maximum.xg b/test/GRHydro_test_tov_ppm_ML/vel[1]_maximum.xg
index 6ae9939..6ae9939 100644
--- a/test/whisky_test_tov_ppm_ML/vel[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[1]_minimum.xg b/test/GRHydro_test_tov_ppm_ML/vel[1]_minimum.xg
index 1e24016..1e24016 100644
--- a/test/whisky_test_tov_ppm_ML/vel[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[1]_norm1.xg b/test/GRHydro_test_tov_ppm_ML/vel[1]_norm1.xg
index 2a46b94..2a46b94 100644
--- a/test/whisky_test_tov_ppm_ML/vel[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[1]_norm2.xg b/test/GRHydro_test_tov_ppm_ML/vel[1]_norm2.xg
index 923490e..923490e 100644
--- a/test/whisky_test_tov_ppm_ML/vel[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/vel[1]_x_[16][16].xg
index 4461e34..4461e34 100644
--- a/test/whisky_test_tov_ppm_ML/vel[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/vel[1]_y_[16][16].xg
index b5626d9..b5626d9 100644
--- a/test/whisky_test_tov_ppm_ML/vel[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/vel[1]_z_[16][16].xg
index a99182a..a99182a 100644
--- a/test/whisky_test_tov_ppm_ML/vel[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/vel[2]_3D_diagonal.xg
index 572d917..572d917 100644
--- a/test/whisky_test_tov_ppm_ML/vel[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[2]_maximum.xg b/test/GRHydro_test_tov_ppm_ML/vel[2]_maximum.xg
index d1d8e73..d1d8e73 100644
--- a/test/whisky_test_tov_ppm_ML/vel[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[2]_minimum.xg b/test/GRHydro_test_tov_ppm_ML/vel[2]_minimum.xg
index 5222b13..5222b13 100644
--- a/test/whisky_test_tov_ppm_ML/vel[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[2]_norm1.xg b/test/GRHydro_test_tov_ppm_ML/vel[2]_norm1.xg
index 3e5bb42..3e5bb42 100644
--- a/test/whisky_test_tov_ppm_ML/vel[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[2]_norm2.xg b/test/GRHydro_test_tov_ppm_ML/vel[2]_norm2.xg
index 4af873a..4af873a 100644
--- a/test/whisky_test_tov_ppm_ML/vel[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/vel[2]_x_[16][16].xg
index 1616c69..1616c69 100644
--- a/test/whisky_test_tov_ppm_ML/vel[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/vel[2]_y_[16][16].xg
index 86ce933..86ce933 100644
--- a/test/whisky_test_tov_ppm_ML/vel[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/vel[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/vel[2]_z_[16][16].xg
index b5626d9..b5626d9 100644
--- a/test/whisky_test_tov_ppm_ML/vel[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/vel[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/w_lorentz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_ML/w_lorentz_3D_diagonal.xg
index 041b75a..041b75a 100644
--- a/test/whisky_test_tov_ppm_ML/w_lorentz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_ML/w_lorentz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_ML/w_lorentz_maximum.xg b/test/GRHydro_test_tov_ppm_ML/w_lorentz_maximum.xg
index 0964ff7..0964ff7 100644
--- a/test/whisky_test_tov_ppm_ML/w_lorentz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/w_lorentz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_ML/w_lorentz_minimum.xg b/test/GRHydro_test_tov_ppm_ML/w_lorentz_minimum.xg
index 6874066..6874066 100644
--- a/test/whisky_test_tov_ppm_ML/w_lorentz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_ML/w_lorentz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_ML/w_lorentz_norm1.xg b/test/GRHydro_test_tov_ppm_ML/w_lorentz_norm1.xg
index db0d4c7..db0d4c7 100644
--- a/test/whisky_test_tov_ppm_ML/w_lorentz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_ML/w_lorentz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_ML/w_lorentz_norm2.xg b/test/GRHydro_test_tov_ppm_ML/w_lorentz_norm2.xg
index 676e488..676e488 100644
--- a/test/whisky_test_tov_ppm_ML/w_lorentz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_ML/w_lorentz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_ML/w_lorentz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/w_lorentz_x_[16][16].xg
index acfd02e..acfd02e 100644
--- a/test/whisky_test_tov_ppm_ML/w_lorentz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/w_lorentz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/w_lorentz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/w_lorentz_y_[16][16].xg
index acfd02e..acfd02e 100644
--- a/test/whisky_test_tov_ppm_ML/w_lorentz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/w_lorentz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML/w_lorentz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_ML/w_lorentz_z_[16][16].xg
index acfd02e..acfd02e 100644
--- a/test/whisky_test_tov_ppm_ML/w_lorentz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_ML/w_lorentz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_ML.par b/test/GRHydro_test_tov_ppm_ML/whisky_test_tov_ppm_ML.par
index 2c9282c..2c9282c 100644
--- a/test/whisky_test_tov_ppm_ML.par
+++ b/test/GRHydro_test_tov_ppm_ML/whisky_test_tov_ppm_ML.par
diff --git a/test/whisky_test_tov_ppm_eosg/alp_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/alp_maximum.xg
index 402ce87..402ce87 100644
--- a/test/whisky_test_tov_ppm_eosg/alp_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/alp_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/alp_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/alp_minimum.xg
index f6b851c..f6b851c 100644
--- a/test/whisky_test_tov_ppm_eosg/alp_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/alp_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/alp_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/alp_norm1.xg
index 6db1c2d..6db1c2d 100644
--- a/test/whisky_test_tov_ppm_eosg/alp_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/alp_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/alp_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/alp_norm2.xg
index e42a254..e42a254 100644
--- a/test/whisky_test_tov_ppm_eosg/alp_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/alp_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/dens_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/dens_3D_diagonal.xg
index b9ed999..b9ed999 100644
--- a/test/whisky_test_tov_ppm_eosg/dens_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/dens_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/dens_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/dens_maximum.xg
index f246657..f246657 100644
--- a/test/whisky_test_tov_ppm_eosg/dens_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/dens_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/dens_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/dens_minimum.xg
index 1b543fe..1b543fe 100644
--- a/test/whisky_test_tov_ppm_eosg/dens_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/dens_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/dens_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/dens_norm1.xg
index d0f04a2..d0f04a2 100644
--- a/test/whisky_test_tov_ppm_eosg/dens_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/dens_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/dens_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/dens_norm2.xg
index 4f458c2..4f458c2 100644
--- a/test/whisky_test_tov_ppm_eosg/dens_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/dens_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/dens_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/dens_x_[16][16].xg
index d1b461d..d1b461d 100644
--- a/test/whisky_test_tov_ppm_eosg/dens_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/dens_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/dens_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/dens_y_[16][16].xg
index d1b461d..d1b461d 100644
--- a/test/whisky_test_tov_ppm_eosg/dens_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/dens_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/dens_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/dens_z_[16][16].xg
index d1b461d..d1b461d 100644
--- a/test/whisky_test_tov_ppm_eosg/dens_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/dens_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/eps_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/eps_3D_diagonal.xg
index e86add7..e86add7 100644
--- a/test/whisky_test_tov_ppm_eosg/eps_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/eps_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/eps_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/eps_maximum.xg
index f53e699..f53e699 100644
--- a/test/whisky_test_tov_ppm_eosg/eps_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/eps_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/eps_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/eps_minimum.xg
index 4b1b36c..4b1b36c 100644
--- a/test/whisky_test_tov_ppm_eosg/eps_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/eps_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/eps_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/eps_norm1.xg
index ef40822..ef40822 100644
--- a/test/whisky_test_tov_ppm_eosg/eps_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/eps_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/eps_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/eps_norm2.xg
index c738334..c738334 100644
--- a/test/whisky_test_tov_ppm_eosg/eps_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/eps_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/eps_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/eps_x_[16][16].xg
index 6afb07e..6afb07e 100644
--- a/test/whisky_test_tov_ppm_eosg/eps_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/eps_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/eps_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/eps_y_[16][16].xg
index 6afb07e..6afb07e 100644
--- a/test/whisky_test_tov_ppm_eosg/eps_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/eps_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/eps_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/eps_z_[16][16].xg
index 6afb07e..6afb07e 100644
--- a/test/whisky_test_tov_ppm_eosg/eps_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/eps_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxx_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/gxx_maximum.xg
index 247c527..247c527 100644
--- a/test/whisky_test_tov_ppm_eosg/gxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxx_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/gxx_minimum.xg
index e449995..e449995 100644
--- a/test/whisky_test_tov_ppm_eosg/gxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxx_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/gxx_norm1.xg
index 1fc8a53..1fc8a53 100644
--- a/test/whisky_test_tov_ppm_eosg/gxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxx_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/gxx_norm2.xg
index 3bace3a..3bace3a 100644
--- a/test/whisky_test_tov_ppm_eosg/gxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/gxy_maximum.xg
index 738b5af..738b5af 100644
--- a/test/whisky_test_tov_ppm_eosg/gxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/gxy_minimum.xg
index 33b1893..33b1893 100644
--- a/test/whisky_test_tov_ppm_eosg/gxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/gxy_norm1.xg
index ba77c3b..ba77c3b 100644
--- a/test/whisky_test_tov_ppm_eosg/gxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/gxy_norm2.xg
index 95f506e..95f506e 100644
--- a/test/whisky_test_tov_ppm_eosg/gxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/gxz_maximum.xg
index e1912ce..e1912ce 100644
--- a/test/whisky_test_tov_ppm_eosg/gxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/gxz_minimum.xg
index f29c571..f29c571 100644
--- a/test/whisky_test_tov_ppm_eosg/gxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/gxz_norm1.xg
index eed1b03..eed1b03 100644
--- a/test/whisky_test_tov_ppm_eosg/gxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gxz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/gxz_norm2.xg
index c0f6320..c0f6320 100644
--- a/test/whisky_test_tov_ppm_eosg/gxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gyy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/gyy_maximum.xg
index 6945fcb..6945fcb 100644
--- a/test/whisky_test_tov_ppm_eosg/gyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gyy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/gyy_minimum.xg
index 15c60b2..15c60b2 100644
--- a/test/whisky_test_tov_ppm_eosg/gyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gyy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/gyy_norm1.xg
index 5120936..5120936 100644
--- a/test/whisky_test_tov_ppm_eosg/gyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gyy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/gyy_norm2.xg
index 41784fc..41784fc 100644
--- a/test/whisky_test_tov_ppm_eosg/gyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gyz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/gyz_maximum.xg
index c9194ae..c9194ae 100644
--- a/test/whisky_test_tov_ppm_eosg/gyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gyz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/gyz_minimum.xg
index 13755c9..13755c9 100644
--- a/test/whisky_test_tov_ppm_eosg/gyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gyz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/gyz_norm1.xg
index 62e553e..62e553e 100644
--- a/test/whisky_test_tov_ppm_eosg/gyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gyz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/gyz_norm2.xg
index 5871e06..5871e06 100644
--- a/test/whisky_test_tov_ppm_eosg/gyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gzz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/gzz_maximum.xg
index 2a9cec8..2a9cec8 100644
--- a/test/whisky_test_tov_ppm_eosg/gzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gzz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/gzz_minimum.xg
index df82e5e..df82e5e 100644
--- a/test/whisky_test_tov_ppm_eosg/gzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gzz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/gzz_norm1.xg
index b94e91f..b94e91f 100644
--- a/test/whisky_test_tov_ppm_eosg/gzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/gzz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/gzz_norm2.xg
index 6218d53..6218d53 100644
--- a/test/whisky_test_tov_ppm_eosg/gzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/gzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/ham_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/ham_3D_diagonal.xg
index be3f3d1..be3f3d1 100644
--- a/test/whisky_test_tov_ppm_eosg/ham_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/ham_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/ham_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/ham_maximum.xg
index ad79321..ad79321 100644
--- a/test/whisky_test_tov_ppm_eosg/ham_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/ham_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/ham_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/ham_minimum.xg
index b31df8f..b31df8f 100644
--- a/test/whisky_test_tov_ppm_eosg/ham_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/ham_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/ham_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/ham_norm1.xg
index 6116168..6116168 100644
--- a/test/whisky_test_tov_ppm_eosg/ham_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/ham_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/ham_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/ham_norm2.xg
index 77440f9..77440f9 100644
--- a/test/whisky_test_tov_ppm_eosg/ham_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/ham_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/ham_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/ham_x_[16][16].xg
index d7b54b1..d7b54b1 100644
--- a/test/whisky_test_tov_ppm_eosg/ham_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/ham_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/ham_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/ham_y_[16][16].xg
index 4fb563c..4fb563c 100644
--- a/test/whisky_test_tov_ppm_eosg/ham_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/ham_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/ham_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/ham_z_[16][16].xg
index 5923088..5923088 100644
--- a/test/whisky_test_tov_ppm_eosg/ham_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/ham_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxx_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/kxx_maximum.xg
index 1271391..1271391 100644
--- a/test/whisky_test_tov_ppm_eosg/kxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxx_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/kxx_minimum.xg
index 2a7f007..2a7f007 100644
--- a/test/whisky_test_tov_ppm_eosg/kxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxx_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/kxx_norm1.xg
index d78bed9..d78bed9 100644
--- a/test/whisky_test_tov_ppm_eosg/kxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxx_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/kxx_norm2.xg
index f278ffc..f278ffc 100644
--- a/test/whisky_test_tov_ppm_eosg/kxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/kxy_maximum.xg
index eaac757..eaac757 100644
--- a/test/whisky_test_tov_ppm_eosg/kxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/kxy_minimum.xg
index e2c80a8..e2c80a8 100644
--- a/test/whisky_test_tov_ppm_eosg/kxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/kxy_norm1.xg
index 466b8b8..466b8b8 100644
--- a/test/whisky_test_tov_ppm_eosg/kxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/kxy_norm2.xg
index 1b67a6d..1b67a6d 100644
--- a/test/whisky_test_tov_ppm_eosg/kxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/kxz_maximum.xg
index 3ccd915..3ccd915 100644
--- a/test/whisky_test_tov_ppm_eosg/kxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/kxz_minimum.xg
index 7022987..7022987 100644
--- a/test/whisky_test_tov_ppm_eosg/kxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/kxz_norm1.xg
index 1906848..1906848 100644
--- a/test/whisky_test_tov_ppm_eosg/kxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kxz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/kxz_norm2.xg
index 9a8eeea..9a8eeea 100644
--- a/test/whisky_test_tov_ppm_eosg/kxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kyy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/kyy_maximum.xg
index 22b6dc6..22b6dc6 100644
--- a/test/whisky_test_tov_ppm_eosg/kyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kyy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/kyy_minimum.xg
index 334ed90..334ed90 100644
--- a/test/whisky_test_tov_ppm_eosg/kyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kyy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/kyy_norm1.xg
index 1dc961d..1dc961d 100644
--- a/test/whisky_test_tov_ppm_eosg/kyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kyy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/kyy_norm2.xg
index c207afd..c207afd 100644
--- a/test/whisky_test_tov_ppm_eosg/kyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kyz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/kyz_maximum.xg
index 1d1d351..1d1d351 100644
--- a/test/whisky_test_tov_ppm_eosg/kyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kyz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/kyz_minimum.xg
index c61e84a..c61e84a 100644
--- a/test/whisky_test_tov_ppm_eosg/kyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kyz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/kyz_norm1.xg
index 5e5bf88..5e5bf88 100644
--- a/test/whisky_test_tov_ppm_eosg/kyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kyz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/kyz_norm2.xg
index 206834b..206834b 100644
--- a/test/whisky_test_tov_ppm_eosg/kyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kzz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/kzz_maximum.xg
index 9404df4..9404df4 100644
--- a/test/whisky_test_tov_ppm_eosg/kzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kzz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/kzz_minimum.xg
index c92cbec..c92cbec 100644
--- a/test/whisky_test_tov_ppm_eosg/kzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kzz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/kzz_norm1.xg
index 8845971..8845971 100644
--- a/test/whisky_test_tov_ppm_eosg/kzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/kzz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/kzz_norm2.xg
index 4d9d4db..4d9d4db 100644
--- a/test/whisky_test_tov_ppm_eosg/kzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/kzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momx_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/momx_3D_diagonal.xg
index a599171..a599171 100644
--- a/test/whisky_test_tov_ppm_eosg/momx_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momx_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momx_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/momx_maximum.xg
index 5452921..5452921 100644
--- a/test/whisky_test_tov_ppm_eosg/momx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momx_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/momx_minimum.xg
index 090e5ec..090e5ec 100644
--- a/test/whisky_test_tov_ppm_eosg/momx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momx_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/momx_norm1.xg
index 723f153..723f153 100644
--- a/test/whisky_test_tov_ppm_eosg/momx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momx_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/momx_norm2.xg
index 491f867..491f867 100644
--- a/test/whisky_test_tov_ppm_eosg/momx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momx_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/momx_x_[16][16].xg
index 3c1d3ca..3c1d3ca 100644
--- a/test/whisky_test_tov_ppm_eosg/momx_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momx_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/momx_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/momx_y_[16][16].xg
index d6c515c..d6c515c 100644
--- a/test/whisky_test_tov_ppm_eosg/momx_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momx_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/momx_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/momx_z_[16][16].xg
index 05b9aa1..05b9aa1 100644
--- a/test/whisky_test_tov_ppm_eosg/momx_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momx_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/momy_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/momy_3D_diagonal.xg
index 34d22c4..34d22c4 100644
--- a/test/whisky_test_tov_ppm_eosg/momy_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momy_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/momy_maximum.xg
index 4005435..4005435 100644
--- a/test/whisky_test_tov_ppm_eosg/momy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/momy_minimum.xg
index f8e7b21..f8e7b21 100644
--- a/test/whisky_test_tov_ppm_eosg/momy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/momy_norm1.xg
index 65760c0..65760c0 100644
--- a/test/whisky_test_tov_ppm_eosg/momy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/momy_norm2.xg
index ebf4635..ebf4635 100644
--- a/test/whisky_test_tov_ppm_eosg/momy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momy_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/momy_x_[16][16].xg
index bf1cef7..bf1cef7 100644
--- a/test/whisky_test_tov_ppm_eosg/momy_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momy_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/momy_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/momy_y_[16][16].xg
index 32091ed..32091ed 100644
--- a/test/whisky_test_tov_ppm_eosg/momy_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momy_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/momy_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/momy_z_[16][16].xg
index 7dcbe68..7dcbe68 100644
--- a/test/whisky_test_tov_ppm_eosg/momy_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momy_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/momz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/momz_3D_diagonal.xg
index b94d155..b94d155 100644
--- a/test/whisky_test_tov_ppm_eosg/momz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/momz_maximum.xg
index 37bffe3..37bffe3 100644
--- a/test/whisky_test_tov_ppm_eosg/momz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/momz_minimum.xg
index 2a83e9b..2a83e9b 100644
--- a/test/whisky_test_tov_ppm_eosg/momz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/momz_norm1.xg
index 4fb8892..4fb8892 100644
--- a/test/whisky_test_tov_ppm_eosg/momz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/momz_norm2.xg
index c6dc8c3..c6dc8c3 100644
--- a/test/whisky_test_tov_ppm_eosg/momz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/momz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/momz_x_[16][16].xg
index 82f01a1..82f01a1 100644
--- a/test/whisky_test_tov_ppm_eosg/momz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/momz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/momz_y_[16][16].xg
index c414209..c414209 100644
--- a/test/whisky_test_tov_ppm_eosg/momz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/momz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/momz_z_[16][16].xg
index fcee92e..fcee92e 100644
--- a/test/whisky_test_tov_ppm_eosg/momz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/momz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/press_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/press_3D_diagonal.xg
index 084bce0..084bce0 100644
--- a/test/whisky_test_tov_ppm_eosg/press_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/press_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/press_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/press_maximum.xg
index e8669ea..e8669ea 100644
--- a/test/whisky_test_tov_ppm_eosg/press_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/press_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/press_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/press_minimum.xg
index 5860d41..5860d41 100644
--- a/test/whisky_test_tov_ppm_eosg/press_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/press_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/press_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/press_norm1.xg
index ddffaca..ddffaca 100644
--- a/test/whisky_test_tov_ppm_eosg/press_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/press_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/press_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/press_norm2.xg
index 9b2d8f1..9b2d8f1 100644
--- a/test/whisky_test_tov_ppm_eosg/press_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/press_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/press_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/press_x_[16][16].xg
index 29eef30..29eef30 100644
--- a/test/whisky_test_tov_ppm_eosg/press_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/press_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/press_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/press_y_[16][16].xg
index 29eef30..29eef30 100644
--- a/test/whisky_test_tov_ppm_eosg/press_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/press_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/press_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/press_z_[16][16].xg
index 29eef30..29eef30 100644
--- a/test/whisky_test_tov_ppm_eosg/press_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/press_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/rho_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/rho_3D_diagonal.xg
index 34370c0..34370c0 100644
--- a/test/whisky_test_tov_ppm_eosg/rho_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/rho_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/rho_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/rho_maximum.xg
index ab6be3b..ab6be3b 100644
--- a/test/whisky_test_tov_ppm_eosg/rho_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/rho_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/rho_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/rho_minimum.xg
index d5fa141..d5fa141 100644
--- a/test/whisky_test_tov_ppm_eosg/rho_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/rho_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/rho_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/rho_norm1.xg
index 951cd9d..951cd9d 100644
--- a/test/whisky_test_tov_ppm_eosg/rho_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/rho_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/rho_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/rho_norm2.xg
index 66a6297..66a6297 100644
--- a/test/whisky_test_tov_ppm_eosg/rho_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/rho_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/rho_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/rho_x_[16][16].xg
index fc2cf75..fc2cf75 100644
--- a/test/whisky_test_tov_ppm_eosg/rho_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/rho_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/rho_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/rho_y_[16][16].xg
index fc2cf75..fc2cf75 100644
--- a/test/whisky_test_tov_ppm_eosg/rho_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/rho_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/rho_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/rho_z_[16][16].xg
index fc2cf75..fc2cf75 100644
--- a/test/whisky_test_tov_ppm_eosg/rho_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/rho_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/scon[0]_3D_diagonal.xg
index bc9c0b2..bc9c0b2 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[0]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/scon[0]_maximum.xg
index 40c3e05..40c3e05 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[0]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/scon[0]_minimum.xg
index b537648..b537648 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[0]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/scon[0]_norm1.xg
index 66f4dff..66f4dff 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[0]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/scon[0]_norm2.xg
index e0f0dad..e0f0dad 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/scon[0]_x_[16][16].xg
index a812889..a812889 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/scon[0]_y_[16][16].xg
index 53ccf22..53ccf22 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/scon[0]_z_[16][16].xg
index 3bb7c69..3bb7c69 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/scon[1]_3D_diagonal.xg
index ed81f8a..ed81f8a 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[1]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/scon[1]_maximum.xg
index eda21c2..eda21c2 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[1]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/scon[1]_minimum.xg
index 95dc3b6..95dc3b6 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[1]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/scon[1]_norm1.xg
index e867953..e867953 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[1]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/scon[1]_norm2.xg
index 5fd1862..5fd1862 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/scon[1]_x_[16][16].xg
index ad47e84..ad47e84 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/scon[1]_y_[16][16].xg
index 0674ccb..0674ccb 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/scon[1]_z_[16][16].xg
index fee63c3..fee63c3 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/scon[2]_3D_diagonal.xg
index c168537..c168537 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[2]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/scon[2]_maximum.xg
index e28d22f..e28d22f 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[2]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/scon[2]_minimum.xg
index 792ec28..792ec28 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[2]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/scon[2]_norm1.xg
index caf2211..caf2211 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[2]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/scon[2]_norm2.xg
index 21d91c6..21d91c6 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/scon[2]_x_[16][16].xg
index 0429f0f..0429f0f 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/scon[2]_y_[16][16].xg
index 416691e..416691e 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/scon[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/scon[2]_z_[16][16].xg
index d7effe8..d7effe8 100644
--- a/test/whisky_test_tov_ppm_eosg/scon[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/scon[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/tau_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/tau_3D_diagonal.xg
index 7891a08..7891a08 100644
--- a/test/whisky_test_tov_ppm_eosg/tau_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/tau_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/tau_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/tau_maximum.xg
index 9d0efd5..9d0efd5 100644
--- a/test/whisky_test_tov_ppm_eosg/tau_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/tau_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/tau_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/tau_minimum.xg
index 141a6de..141a6de 100644
--- a/test/whisky_test_tov_ppm_eosg/tau_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/tau_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/tau_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/tau_norm1.xg
index e2d8305..e2d8305 100644
--- a/test/whisky_test_tov_ppm_eosg/tau_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/tau_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/tau_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/tau_norm2.xg
index 3176ed1..3176ed1 100644
--- a/test/whisky_test_tov_ppm_eosg/tau_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/tau_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/tau_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/tau_x_[16][16].xg
index bb92d14..bb92d14 100644
--- a/test/whisky_test_tov_ppm_eosg/tau_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/tau_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/tau_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/tau_y_[16][16].xg
index 1e861e3..1e861e3 100644
--- a/test/whisky_test_tov_ppm_eosg/tau_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/tau_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/tau_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/tau_z_[16][16].xg
index bb92d14..bb92d14 100644
--- a/test/whisky_test_tov_ppm_eosg/tau_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/tau_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/vel[0]_3D_diagonal.xg
index 695c496..695c496 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[0]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/vel[0]_maximum.xg
index f64c159..f64c159 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[0]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/vel[0]_minimum.xg
index f0370fd..f0370fd 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[0]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/vel[0]_norm1.xg
index 4e3446a..4e3446a 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[0]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/vel[0]_norm2.xg
index 77f49c1..77f49c1 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/vel[0]_x_[16][16].xg
index 8df117c..8df117c 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/vel[0]_y_[16][16].xg
index d282583..d282583 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/vel[0]_z_[16][16].xg
index d5b552f..d5b552f 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/vel[1]_3D_diagonal.xg
index 1fca1b9..1fca1b9 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[1]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/vel[1]_maximum.xg
index d3acd76..d3acd76 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[1]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/vel[1]_minimum.xg
index f34be43..f34be43 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[1]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/vel[1]_norm1.xg
index ef98200..ef98200 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[1]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/vel[1]_norm2.xg
index 88d6598..88d6598 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/vel[1]_x_[16][16].xg
index db986f4..db986f4 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/vel[1]_y_[16][16].xg
index 57947e4..57947e4 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/vel[1]_z_[16][16].xg
index 4eac04c..4eac04c 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/vel[2]_3D_diagonal.xg
index 1fca1b9..1fca1b9 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[2]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/vel[2]_maximum.xg
index 27d7175..27d7175 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[2]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/vel[2]_minimum.xg
index fcf4f57..fcf4f57 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[2]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/vel[2]_norm1.xg
index d34887b..d34887b 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[2]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/vel[2]_norm2.xg
index 64135ba..64135ba 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/vel[2]_x_[16][16].xg
index d735d16..d735d16 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/vel[2]_y_[16][16].xg
index 6b7fd4c..6b7fd4c 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/vel[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/vel[2]_z_[16][16].xg
index 57947e4..57947e4 100644
--- a/test/whisky_test_tov_ppm_eosg/vel[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/vel[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/w_lorentz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_3D_diagonal.xg
index ada0204..ada0204 100644
--- a/test/whisky_test_tov_ppm_eosg/w_lorentz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg/w_lorentz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_maximum.xg
index 43ecc7f..43ecc7f 100644
--- a/test/whisky_test_tov_ppm_eosg/w_lorentz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/w_lorentz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_minimum.xg
index 6874066..6874066 100644
--- a/test/whisky_test_tov_ppm_eosg/w_lorentz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg/w_lorentz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_norm1.xg
index ecffc59..ecffc59 100644
--- a/test/whisky_test_tov_ppm_eosg/w_lorentz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg/w_lorentz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_norm2.xg
index 5a34bba..5a34bba 100644
--- a/test/whisky_test_tov_ppm_eosg/w_lorentz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg/w_lorentz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_x_[16][16].xg
index 7773e50..7773e50 100644
--- a/test/whisky_test_tov_ppm_eosg/w_lorentz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/w_lorentz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_y_[16][16].xg
index 7773e50..7773e50 100644
--- a/test/whisky_test_tov_ppm_eosg/w_lorentz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg/w_lorentz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_z_[16][16].xg
index 7773e50..7773e50 100644
--- a/test/whisky_test_tov_ppm_eosg/w_lorentz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg/w_lorentz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/alp_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/alp_maximum.xg
index a7b9a15..a7b9a15 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/alp_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/alp_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/alp_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/alp_minimum.xg
index f682b90..f682b90 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/alp_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/alp_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/alp_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/alp_norm1.xg
index ef8ed94..ef8ed94 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/alp_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/alp_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/alp_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/alp_norm2.xg
index 8420c11..8420c11 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/alp_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/alp_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/dens_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/dens_3D_diagonal.xg
index 5cdd5d9..5cdd5d9 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/dens_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/dens_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/dens_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/dens_maximum.xg
index a0d9708..a0d9708 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/dens_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/dens_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/dens_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/dens_minimum.xg
index 1b543fe..1b543fe 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/dens_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/dens_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/dens_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/dens_norm1.xg
index d0f04a2..d0f04a2 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/dens_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/dens_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/dens_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/dens_norm2.xg
index 0f0ac57..0f0ac57 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/dens_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/dens_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/dens_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/dens_x_[16][16].xg
index acb8a2d..acb8a2d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/dens_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/dens_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/dens_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/dens_y_[16][16].xg
index acb8a2d..acb8a2d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/dens_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/dens_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/dens_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/dens_z_[16][16].xg
index acb8a2d..acb8a2d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/dens_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/dens_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/eps_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/eps_3D_diagonal.xg
index 07c232e..07c232e 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/eps_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/eps_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/eps_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/eps_maximum.xg
index 2e5798f..2e5798f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/eps_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/eps_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/eps_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/eps_minimum.xg
index 4b1b36c..4b1b36c 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/eps_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/eps_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/eps_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/eps_norm1.xg
index 34fe57a..34fe57a 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/eps_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/eps_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/eps_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/eps_norm2.xg
index a8b679d..a8b679d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/eps_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/eps_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/eps_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/eps_x_[16][16].xg
index e9ee631..e9ee631 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/eps_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/eps_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/eps_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/eps_y_[16][16].xg
index e9ee631..e9ee631 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/eps_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/eps_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/eps_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/eps_z_[16][16].xg
index e9ee631..e9ee631 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/eps_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/eps_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxx_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxx_maximum.xg
index 94e25a9..94e25a9 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxx_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxx_minimum.xg
index db5ec3c..db5ec3c 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxx_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxx_norm1.xg
index fe0d6f6..fe0d6f6 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxx_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxx_norm2.xg
index aa79761..aa79761 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxy_maximum.xg
index 5fe5966..5fe5966 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxy_minimum.xg
index e642d06..e642d06 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxy_norm1.xg
index c99dce2..c99dce2 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxy_norm2.xg
index 322bbe8..322bbe8 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxz_maximum.xg
index 9c72657..9c72657 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxz_minimum.xg
index c6f0107..c6f0107 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxz_norm1.xg
index a332052..a332052 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gxz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gxz_norm2.xg
index 8d734e7..8d734e7 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gyy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gyy_maximum.xg
index b09c770..b09c770 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gyy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gyy_minimum.xg
index a32a868..a32a868 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gyy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gyy_norm1.xg
index 937b6cf..937b6cf 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gyy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gyy_norm2.xg
index 7bee23a..7bee23a 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gyz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gyz_maximum.xg
index 55958e4..55958e4 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gyz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gyz_minimum.xg
index cfafc01..cfafc01 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gyz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gyz_norm1.xg
index 1d83394..1d83394 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gyz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gyz_norm2.xg
index 9687f9e..9687f9e 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gzz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gzz_maximum.xg
index 804cf0e..804cf0e 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gzz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gzz_minimum.xg
index 357ab75..357ab75 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gzz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gzz_norm1.xg
index 5f0ecf1..5f0ecf1 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/gzz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/gzz_norm2.xg
index 36a1940..36a1940 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/gzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/gzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/ham_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/ham_3D_diagonal.xg
index 3b1a7a8..3b1a7a8 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/ham_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/ham_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/ham_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/ham_maximum.xg
index 67ade29..67ade29 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/ham_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/ham_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/ham_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/ham_minimum.xg
index 001e52a..001e52a 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/ham_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/ham_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/ham_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/ham_norm1.xg
index 7bb66cf..7bb66cf 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/ham_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/ham_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/ham_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/ham_norm2.xg
index 08e97a2..08e97a2 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/ham_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/ham_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/ham_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/ham_x_[16][16].xg
index c0a309e..c0a309e 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/ham_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/ham_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/ham_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/ham_y_[16][16].xg
index 6e0af19..6e0af19 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/ham_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/ham_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/ham_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/ham_z_[16][16].xg
index 93d87d9..93d87d9 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/ham_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/ham_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxx_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxx_maximum.xg
index 7fcc3ef..7fcc3ef 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxx_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxx_minimum.xg
index c6e4088..c6e4088 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxx_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxx_norm1.xg
index 78b2e88..78b2e88 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxx_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxx_norm2.xg
index ae920a1..ae920a1 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxy_maximum.xg
index cc23576..cc23576 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxy_minimum.xg
index b439a54..b439a54 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxy_norm1.xg
index 22dbb03..22dbb03 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxy_norm2.xg
index 09c6715..09c6715 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxz_maximum.xg
index 573efc6..573efc6 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxz_minimum.xg
index 67327b2..67327b2 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxz_norm1.xg
index 931ef2d..931ef2d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kxz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kxz_norm2.xg
index e7a5bac..e7a5bac 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kyy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kyy_maximum.xg
index d23af0f..d23af0f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kyy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kyy_minimum.xg
index 11391da..11391da 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kyy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kyy_norm1.xg
index 8fb1f97..8fb1f97 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kyy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kyy_norm2.xg
index ff99fa9..ff99fa9 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kyz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kyz_maximum.xg
index bc9f46a..bc9f46a 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kyz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kyz_minimum.xg
index 405b776..405b776 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kyz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kyz_norm1.xg
index 273a720..273a720 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kyz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kyz_norm2.xg
index cd8a870..cd8a870 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kzz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kzz_maximum.xg
index a472180..a472180 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kzz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kzz_minimum.xg
index 9bd06c0..9bd06c0 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kzz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kzz_norm1.xg
index 95ee197..95ee197 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/kzz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/kzz_norm2.xg
index 7a7b926..7a7b926 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/kzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/kzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momx_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momx_3D_diagonal.xg
index 8b3cdec..8b3cdec 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momx_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momx_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momx_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momx_maximum.xg
index 6ec957c..6ec957c 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momx_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momx_minimum.xg
index c3a4595..c3a4595 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momx_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momx_norm1.xg
index d395516..d395516 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momx_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momx_norm2.xg
index bcfb6db..bcfb6db 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momx_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/momx_x_[16][16].xg
index d320760..d320760 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momx_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momx_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momx_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/momx_y_[16][16].xg
index 6c60519..6c60519 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momx_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momx_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momx_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/momx_z_[16][16].xg
index b5ffa26..b5ffa26 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momx_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momx_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momy_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momy_3D_diagonal.xg
index 8b3cdec..8b3cdec 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momy_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momy_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momy_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momy_maximum.xg
index 81cee44..81cee44 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momy_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momy_minimum.xg
index 5f5e662..5f5e662 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momy_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momy_norm1.xg
index e09b879..e09b879 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momy_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momy_norm2.xg
index aabfb46..aabfb46 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momy_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/momy_x_[16][16].xg
index 8923288..8923288 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momy_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momy_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momy_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/momy_y_[16][16].xg
index 1dfafd8..1dfafd8 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momy_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momy_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momy_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/momy_z_[16][16].xg
index 8f7e90f..8f7e90f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momy_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momy_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momz_3D_diagonal.xg
index bbd2fc9..bbd2fc9 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momz_maximum.xg
index 515ea46..515ea46 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momz_minimum.xg
index 4043bad..4043bad 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momz_norm1.xg
index b8fb433..b8fb433 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/momz_norm2.xg
index 02d548c..02d548c 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/momz_x_[16][16].xg
index 0773aa4..0773aa4 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/momz_y_[16][16].xg
index 4869e70..4869e70 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/momz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/momz_z_[16][16].xg
index e0bfb34..e0bfb34 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/momz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/momz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/press_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/press_3D_diagonal.xg
index 43ecd83..43ecd83 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/press_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/press_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/press_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/press_maximum.xg
index 900722f..900722f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/press_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/press_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/press_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/press_minimum.xg
index 5860d41..5860d41 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/press_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/press_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/press_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/press_norm1.xg
index 1038d05..1038d05 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/press_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/press_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/press_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/press_norm2.xg
index 303f1a3..303f1a3 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/press_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/press_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/press_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/press_x_[16][16].xg
index 77b46d7..77b46d7 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/press_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/press_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/press_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/press_y_[16][16].xg
index 77b46d7..77b46d7 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/press_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/press_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/press_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/press_z_[16][16].xg
index 77b46d7..77b46d7 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/press_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/press_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/rho_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/rho_3D_diagonal.xg
index a6243b1..a6243b1 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/rho_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/rho_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/rho_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/rho_maximum.xg
index dce2966..dce2966 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/rho_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/rho_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/rho_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/rho_minimum.xg
index d5fa141..d5fa141 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/rho_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/rho_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/rho_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/rho_norm1.xg
index 6201dd0..6201dd0 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/rho_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/rho_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/rho_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/rho_norm2.xg
index d9edf80..d9edf80 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/rho_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/rho_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/rho_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/rho_x_[16][16].xg
index e49a93f..e49a93f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/rho_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/rho_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/rho_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/rho_y_[16][16].xg
index e49a93f..e49a93f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/rho_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/rho_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/rho_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/rho_z_[16][16].xg
index e49a93f..e49a93f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/rho_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/rho_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_3D_diagonal.xg
index 940115d..940115d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_maximum.xg
index 77b3728..77b3728 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_minimum.xg
index a50516c..a50516c 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_norm1.xg
index 0971ea2..0971ea2 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_norm2.xg
index 514345b..514345b 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_x_[16][16].xg
index 16a52c5..16a52c5 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_y_[16][16].xg
index 4cae405..4cae405 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_z_[16][16].xg
index 901c24d..901c24d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_3D_diagonal.xg
index 940115d..940115d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_maximum.xg
index 8f3c86c..8f3c86c 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_minimum.xg
index 3799a0e..3799a0e 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_norm1.xg
index cabea74..cabea74 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_norm2.xg
index e094c57..e094c57 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_x_[16][16].xg
index 4cae405..4cae405 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_y_[16][16].xg
index 16a52c5..16a52c5 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_z_[16][16].xg
index bc261e0..bc261e0 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_3D_diagonal.xg
index b9c91e4..b9c91e4 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_maximum.xg
index 795d621..795d621 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_minimum.xg
index 4a41521..4a41521 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_norm1.xg
index 579895d..579895d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_norm2.xg
index 1977cff..1977cff 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_x_[16][16].xg
index aab47b3..aab47b3 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_y_[16][16].xg
index aab47b3..aab47b3 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_z_[16][16].xg
index 087991c..087991c 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/scon[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/scon[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/tau_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/tau_3D_diagonal.xg
index 8860d69..8860d69 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/tau_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/tau_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/tau_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/tau_maximum.xg
index 0499537..0499537 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/tau_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/tau_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/tau_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/tau_minimum.xg
index 7f92ea2..7f92ea2 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/tau_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/tau_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/tau_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/tau_norm1.xg
index f79323f..f79323f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/tau_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/tau_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/tau_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/tau_norm2.xg
index eb27cc8..eb27cc8 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/tau_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/tau_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/tau_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/tau_x_[16][16].xg
index a2a74c1..a2a74c1 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/tau_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/tau_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/tau_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/tau_y_[16][16].xg
index a2a74c1..a2a74c1 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/tau_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/tau_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/tau_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/tau_z_[16][16].xg
index 6099122..6099122 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/tau_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/tau_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_3D_diagonal.xg
index ea0e996..ea0e996 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_maximum.xg
index baea675..baea675 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_minimum.xg
index d24e54d..d24e54d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_norm1.xg
index c564b27..c564b27 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_norm2.xg
index fb45847..fb45847 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_x_[16][16].xg
index 89cc24f..89cc24f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_y_[16][16].xg
index a1611b1..a1611b1 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_z_[16][16].xg
index 4653945..4653945 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_3D_diagonal.xg
index ea0e996..ea0e996 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_maximum.xg
index a19fa85..a19fa85 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_minimum.xg
index d0e6a4d..d0e6a4d 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_norm1.xg
index 27e1ee2..27e1ee2 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_norm2.xg
index dc6293a..dc6293a 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_x_[16][16].xg
index a1611b1..a1611b1 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_y_[16][16].xg
index 89cc24f..89cc24f 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_z_[16][16].xg
index 4653945..4653945 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_3D_diagonal.xg
index bfb3077..bfb3077 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_maximum.xg
index 43858ce..43858ce 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_minimum.xg
index bc05ccc..bc05ccc 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_norm1.xg
index 0c47a4b..0c47a4b 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_norm2.xg
index 054b212..054b212 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_x_[16][16].xg
index 9e18690..9e18690 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_y_[16][16].xg
index 9e18690..9e18690 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_z_[16][16].xg
index 381ebc9..381ebc9 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/vel[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/vel[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_3D_diagonal.xg
index f60e0bc..f60e0bc 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_maximum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_maximum.xg
index 2753baf..2753baf 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_minimum.xg b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_minimum.xg
index 6874066..6874066 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_norm1.xg b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_norm1.xg
index 7037d00..7037d00 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_norm2.xg b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_norm2.xg
index 3b72434..3b72434 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_x_[16][16].xg
index 1d75df3..1d75df3 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_y_[16][16].xg
index 1d75df3..1d75df3 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_z_[16][16].xg
index 1d75df3..1d75df3 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/w_lorentz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/w_lorentz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_eosg_ML.par b/test/GRHydro_test_tov_ppm_eosg_ML/whisky_test_tov_ppm_eosg_ML.par
index e21a148..e21a148 100644
--- a/test/whisky_test_tov_ppm_eosg_ML.par
+++ b/test/GRHydro_test_tov_ppm_eosg_ML/whisky_test_tov_ppm_eosg_ML.par
diff --git a/test/whisky_test_tov_ppm_no_trp/alp_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/alp_maximum.xg
index 27bf461..27bf461 100644
--- a/test/whisky_test_tov_ppm_no_trp/alp_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/alp_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/alp_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/alp_minimum.xg
index c6442fe..c6442fe 100644
--- a/test/whisky_test_tov_ppm_no_trp/alp_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/alp_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/alp_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/alp_norm1.xg
index 8ab1537..8ab1537 100644
--- a/test/whisky_test_tov_ppm_no_trp/alp_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/alp_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/alp_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/alp_norm2.xg
index 4280123..4280123 100644
--- a/test/whisky_test_tov_ppm_no_trp/alp_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/alp_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/dens_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/dens_3D_diagonal.xg
index 00b657a..00b657a 100644
--- a/test/whisky_test_tov_ppm_no_trp/dens_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/dens_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/dens_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/dens_maximum.xg
index f246657..f246657 100644
--- a/test/whisky_test_tov_ppm_no_trp/dens_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/dens_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/dens_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/dens_minimum.xg
index 24fabfe..24fabfe 100644
--- a/test/whisky_test_tov_ppm_no_trp/dens_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/dens_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/dens_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/dens_norm1.xg
index 716428a..716428a 100644
--- a/test/whisky_test_tov_ppm_no_trp/dens_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/dens_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/dens_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/dens_norm2.xg
index 42772d2..42772d2 100644
--- a/test/whisky_test_tov_ppm_no_trp/dens_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/dens_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/dens_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/dens_x_[16][16].xg
index 1a1fb5c..1a1fb5c 100644
--- a/test/whisky_test_tov_ppm_no_trp/dens_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/dens_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/dens_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/dens_y_[16][16].xg
index 1a1fb5c..1a1fb5c 100644
--- a/test/whisky_test_tov_ppm_no_trp/dens_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/dens_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/dens_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/dens_z_[16][16].xg
index 1a1fb5c..1a1fb5c 100644
--- a/test/whisky_test_tov_ppm_no_trp/dens_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/dens_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/eps_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/eps_3D_diagonal.xg
index 1b6c0f9..1b6c0f9 100644
--- a/test/whisky_test_tov_ppm_no_trp/eps_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/eps_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/eps_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/eps_maximum.xg
index cb77c27..cb77c27 100644
--- a/test/whisky_test_tov_ppm_no_trp/eps_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/eps_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/eps_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/eps_minimum.xg
index 4b1b36c..4b1b36c 100644
--- a/test/whisky_test_tov_ppm_no_trp/eps_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/eps_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/eps_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/eps_norm1.xg
index 6942fb9..6942fb9 100644
--- a/test/whisky_test_tov_ppm_no_trp/eps_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/eps_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/eps_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/eps_norm2.xg
index 3c23eee..3c23eee 100644
--- a/test/whisky_test_tov_ppm_no_trp/eps_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/eps_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/eps_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/eps_x_[16][16].xg
index 3e8e193..3e8e193 100644
--- a/test/whisky_test_tov_ppm_no_trp/eps_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/eps_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/eps_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/eps_y_[16][16].xg
index 3e8e193..3e8e193 100644
--- a/test/whisky_test_tov_ppm_no_trp/eps_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/eps_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/eps_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/eps_z_[16][16].xg
index 3e8e193..3e8e193 100644
--- a/test/whisky_test_tov_ppm_no_trp/eps_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/eps_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxx_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/gxx_maximum.xg
index 247c527..247c527 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxx_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/gxx_minimum.xg
index 236f58d..236f58d 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxx_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/gxx_norm1.xg
index 09dc024..09dc024 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxx_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/gxx_norm2.xg
index 251fc12..251fc12 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/gxy_maximum.xg
index 42abcf9..42abcf9 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/gxy_minimum.xg
index 76db2bc..76db2bc 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/gxy_norm1.xg
index 50f0e6a..50f0e6a 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/gxy_norm2.xg
index 5bbce9e..5bbce9e 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/gxz_maximum.xg
index a71a85b..a71a85b 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/gxz_minimum.xg
index f124f6d..f124f6d 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/gxz_norm1.xg
index 6e1e802..6e1e802 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gxz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/gxz_norm2.xg
index e954fd6..e954fd6 100644
--- a/test/whisky_test_tov_ppm_no_trp/gxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gyy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/gyy_maximum.xg
index 6945fcb..6945fcb 100644
--- a/test/whisky_test_tov_ppm_no_trp/gyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gyy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/gyy_minimum.xg
index f4d908c..f4d908c 100644
--- a/test/whisky_test_tov_ppm_no_trp/gyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gyy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/gyy_norm1.xg
index cf730c8..cf730c8 100644
--- a/test/whisky_test_tov_ppm_no_trp/gyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gyy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/gyy_norm2.xg
index 6e0dc12..6e0dc12 100644
--- a/test/whisky_test_tov_ppm_no_trp/gyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gyz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/gyz_maximum.xg
index 24de994..24de994 100644
--- a/test/whisky_test_tov_ppm_no_trp/gyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gyz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/gyz_minimum.xg
index c9dacc2..c9dacc2 100644
--- a/test/whisky_test_tov_ppm_no_trp/gyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gyz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/gyz_norm1.xg
index 64cfd53..64cfd53 100644
--- a/test/whisky_test_tov_ppm_no_trp/gyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gyz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/gyz_norm2.xg
index cd143ee..cd143ee 100644
--- a/test/whisky_test_tov_ppm_no_trp/gyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gzz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/gzz_maximum.xg
index 2a9cec8..2a9cec8 100644
--- a/test/whisky_test_tov_ppm_no_trp/gzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gzz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/gzz_minimum.xg
index fdc12b9..fdc12b9 100644
--- a/test/whisky_test_tov_ppm_no_trp/gzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gzz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/gzz_norm1.xg
index 6532e18..6532e18 100644
--- a/test/whisky_test_tov_ppm_no_trp/gzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/gzz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/gzz_norm2.xg
index 5c9c02f..5c9c02f 100644
--- a/test/whisky_test_tov_ppm_no_trp/gzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/gzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/ham_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/ham_3D_diagonal.xg
index 6c77e9a..6c77e9a 100644
--- a/test/whisky_test_tov_ppm_no_trp/ham_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/ham_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/ham_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/ham_maximum.xg
index 7015cfa..7015cfa 100644
--- a/test/whisky_test_tov_ppm_no_trp/ham_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/ham_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/ham_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/ham_minimum.xg
index ffbe145..ffbe145 100644
--- a/test/whisky_test_tov_ppm_no_trp/ham_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/ham_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/ham_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/ham_norm1.xg
index 2b669dd..2b669dd 100644
--- a/test/whisky_test_tov_ppm_no_trp/ham_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/ham_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/ham_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/ham_norm2.xg
index df78f2f..df78f2f 100644
--- a/test/whisky_test_tov_ppm_no_trp/ham_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/ham_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/ham_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/ham_x_[16][16].xg
index 5afea19..5afea19 100644
--- a/test/whisky_test_tov_ppm_no_trp/ham_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/ham_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/ham_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/ham_y_[16][16].xg
index 6657695..6657695 100644
--- a/test/whisky_test_tov_ppm_no_trp/ham_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/ham_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/ham_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/ham_z_[16][16].xg
index 2c76454..2c76454 100644
--- a/test/whisky_test_tov_ppm_no_trp/ham_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/ham_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxx_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/kxx_maximum.xg
index 45849a0..45849a0 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxx_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/kxx_minimum.xg
index af1d941..af1d941 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxx_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/kxx_norm1.xg
index 1356951..1356951 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxx_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/kxx_norm2.xg
index f4dcfdd..f4dcfdd 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/kxy_maximum.xg
index ab6ec9d..ab6ec9d 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/kxy_minimum.xg
index 8d53e8b..8d53e8b 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/kxy_norm1.xg
index 0214709..0214709 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/kxy_norm2.xg
index 1b68a3f..1b68a3f 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/kxz_maximum.xg
index 01397a2..01397a2 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/kxz_minimum.xg
index f1e96c4..f1e96c4 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/kxz_norm1.xg
index 6197828..6197828 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kxz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/kxz_norm2.xg
index cb2b58e..cb2b58e 100644
--- a/test/whisky_test_tov_ppm_no_trp/kxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kyy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/kyy_maximum.xg
index 9e023be..9e023be 100644
--- a/test/whisky_test_tov_ppm_no_trp/kyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kyy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/kyy_minimum.xg
index f54b021..f54b021 100644
--- a/test/whisky_test_tov_ppm_no_trp/kyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kyy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/kyy_norm1.xg
index 49f77d5..49f77d5 100644
--- a/test/whisky_test_tov_ppm_no_trp/kyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kyy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/kyy_norm2.xg
index 4dc657a..4dc657a 100644
--- a/test/whisky_test_tov_ppm_no_trp/kyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kyz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/kyz_maximum.xg
index 5de0d75..5de0d75 100644
--- a/test/whisky_test_tov_ppm_no_trp/kyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kyz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/kyz_minimum.xg
index 079a343..079a343 100644
--- a/test/whisky_test_tov_ppm_no_trp/kyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kyz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/kyz_norm1.xg
index cbac08d..cbac08d 100644
--- a/test/whisky_test_tov_ppm_no_trp/kyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kyz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/kyz_norm2.xg
index 3fc33ca..3fc33ca 100644
--- a/test/whisky_test_tov_ppm_no_trp/kyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kzz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/kzz_maximum.xg
index 23eeff1..23eeff1 100644
--- a/test/whisky_test_tov_ppm_no_trp/kzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kzz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/kzz_minimum.xg
index e13e0be..e13e0be 100644
--- a/test/whisky_test_tov_ppm_no_trp/kzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kzz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/kzz_norm1.xg
index dc2d4d7..dc2d4d7 100644
--- a/test/whisky_test_tov_ppm_no_trp/kzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/kzz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/kzz_norm2.xg
index 7201b11..7201b11 100644
--- a/test/whisky_test_tov_ppm_no_trp/kzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/kzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momx_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/momx_3D_diagonal.xg
index ed5b60c..ed5b60c 100644
--- a/test/whisky_test_tov_ppm_no_trp/momx_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momx_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momx_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/momx_maximum.xg
index e31ade6..e31ade6 100644
--- a/test/whisky_test_tov_ppm_no_trp/momx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momx_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/momx_minimum.xg
index b129f30..b129f30 100644
--- a/test/whisky_test_tov_ppm_no_trp/momx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momx_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/momx_norm1.xg
index 679dcfb..679dcfb 100644
--- a/test/whisky_test_tov_ppm_no_trp/momx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momx_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/momx_norm2.xg
index f2ebca3..f2ebca3 100644
--- a/test/whisky_test_tov_ppm_no_trp/momx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momx_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/momx_x_[16][16].xg
index fd126ed..fd126ed 100644
--- a/test/whisky_test_tov_ppm_no_trp/momx_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momx_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momx_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/momx_y_[16][16].xg
index dc85bb3..dc85bb3 100644
--- a/test/whisky_test_tov_ppm_no_trp/momx_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momx_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momx_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/momx_z_[16][16].xg
index 47aa271..47aa271 100644
--- a/test/whisky_test_tov_ppm_no_trp/momx_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momx_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momy_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/momy_3D_diagonal.xg
index 8d8866b..8d8866b 100644
--- a/test/whisky_test_tov_ppm_no_trp/momy_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momy_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/momy_maximum.xg
index 1f0c1fc..1f0c1fc 100644
--- a/test/whisky_test_tov_ppm_no_trp/momy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/momy_minimum.xg
index 99849d5..99849d5 100644
--- a/test/whisky_test_tov_ppm_no_trp/momy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/momy_norm1.xg
index 7e24e6e..7e24e6e 100644
--- a/test/whisky_test_tov_ppm_no_trp/momy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/momy_norm2.xg
index 2d85ae6..2d85ae6 100644
--- a/test/whisky_test_tov_ppm_no_trp/momy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momy_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/momy_x_[16][16].xg
index e76364a..e76364a 100644
--- a/test/whisky_test_tov_ppm_no_trp/momy_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momy_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momy_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/momy_y_[16][16].xg
index db295af..db295af 100644
--- a/test/whisky_test_tov_ppm_no_trp/momy_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momy_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momy_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/momy_z_[16][16].xg
index 62c862e..62c862e 100644
--- a/test/whisky_test_tov_ppm_no_trp/momy_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momy_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/momz_3D_diagonal.xg
index 5a060ba..5a060ba 100644
--- a/test/whisky_test_tov_ppm_no_trp/momz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/momz_maximum.xg
index e47c256..e47c256 100644
--- a/test/whisky_test_tov_ppm_no_trp/momz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/momz_minimum.xg
index 8f81c7a..8f81c7a 100644
--- a/test/whisky_test_tov_ppm_no_trp/momz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/momz_norm1.xg
index 9b14a9a..9b14a9a 100644
--- a/test/whisky_test_tov_ppm_no_trp/momz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/momz_norm2.xg
index 73ff283..73ff283 100644
--- a/test/whisky_test_tov_ppm_no_trp/momz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/momz_x_[16][16].xg
index f0eea1f..f0eea1f 100644
--- a/test/whisky_test_tov_ppm_no_trp/momz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/momz_y_[16][16].xg
index d89bfb0..d89bfb0 100644
--- a/test/whisky_test_tov_ppm_no_trp/momz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/momz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/momz_z_[16][16].xg
index 54f635c..54f635c 100644
--- a/test/whisky_test_tov_ppm_no_trp/momz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/momz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/press_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/press_3D_diagonal.xg
index 330ea8f..330ea8f 100644
--- a/test/whisky_test_tov_ppm_no_trp/press_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/press_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/press_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/press_maximum.xg
index e8669ea..e8669ea 100644
--- a/test/whisky_test_tov_ppm_no_trp/press_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/press_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/press_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/press_minimum.xg
index 5860d41..5860d41 100644
--- a/test/whisky_test_tov_ppm_no_trp/press_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/press_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/press_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/press_norm1.xg
index d139036..d139036 100644
--- a/test/whisky_test_tov_ppm_no_trp/press_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/press_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/press_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/press_norm2.xg
index 9b2d8f1..9b2d8f1 100644
--- a/test/whisky_test_tov_ppm_no_trp/press_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/press_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/press_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/press_x_[16][16].xg
index e3ce88a..e3ce88a 100644
--- a/test/whisky_test_tov_ppm_no_trp/press_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/press_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/press_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/press_y_[16][16].xg
index e3ce88a..e3ce88a 100644
--- a/test/whisky_test_tov_ppm_no_trp/press_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/press_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/press_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/press_z_[16][16].xg
index e3ce88a..e3ce88a 100644
--- a/test/whisky_test_tov_ppm_no_trp/press_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/press_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/rho_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/rho_3D_diagonal.xg
index 663c42e..663c42e 100644
--- a/test/whisky_test_tov_ppm_no_trp/rho_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/rho_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/rho_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/rho_maximum.xg
index ab6be3b..ab6be3b 100644
--- a/test/whisky_test_tov_ppm_no_trp/rho_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/rho_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/rho_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/rho_minimum.xg
index d5fa141..d5fa141 100644
--- a/test/whisky_test_tov_ppm_no_trp/rho_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/rho_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/rho_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/rho_norm1.xg
index a3f1c0d..a3f1c0d 100644
--- a/test/whisky_test_tov_ppm_no_trp/rho_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/rho_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/rho_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/rho_norm2.xg
index cd623ea..cd623ea 100644
--- a/test/whisky_test_tov_ppm_no_trp/rho_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/rho_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/rho_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/rho_x_[16][16].xg
index fc1a756..fc1a756 100644
--- a/test/whisky_test_tov_ppm_no_trp/rho_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/rho_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/rho_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/rho_y_[16][16].xg
index fc1a756..fc1a756 100644
--- a/test/whisky_test_tov_ppm_no_trp/rho_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/rho_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/rho_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/rho_z_[16][16].xg
index fc1a756..fc1a756 100644
--- a/test/whisky_test_tov_ppm_no_trp/rho_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/rho_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_3D_diagonal.xg
index 5fc62d0..5fc62d0 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[0]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_maximum.xg
index 40c3e05..40c3e05 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[0]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_minimum.xg
index b537648..b537648 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[0]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_norm1.xg
index c51f6f9..c51f6f9 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[0]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_norm2.xg
index 27190f3..27190f3 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_x_[16][16].xg
index 313887c..313887c 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_y_[16][16].xg
index 170f139..170f139 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_z_[16][16].xg
index d4d7bf4..d4d7bf4 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_3D_diagonal.xg
index 50166c2..50166c2 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[1]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_maximum.xg
index eda21c2..eda21c2 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[1]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_minimum.xg
index 95dc3b6..95dc3b6 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[1]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_norm1.xg
index d081d52..d081d52 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[1]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_norm2.xg
index 3add453..3add453 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_x_[16][16].xg
index 7eb8b57..7eb8b57 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_y_[16][16].xg
index fd405f6..fd405f6 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_z_[16][16].xg
index 9e3529f..9e3529f 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_3D_diagonal.xg
index 50166c2..50166c2 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[2]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_maximum.xg
index e28d22f..e28d22f 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[2]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_minimum.xg
index 792ec28..792ec28 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[2]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_norm1.xg
index d5fc589..d5fc589 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[2]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_norm2.xg
index d62cad9..d62cad9 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_x_[16][16].xg
index 95443ef..95443ef 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_y_[16][16].xg
index 67366fd..67366fd 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/scon[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_z_[16][16].xg
index fd405f6..fd405f6 100644
--- a/test/whisky_test_tov_ppm_no_trp/scon[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/scon[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/tau_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/tau_3D_diagonal.xg
index 8df7268..8df7268 100644
--- a/test/whisky_test_tov_ppm_no_trp/tau_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/tau_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/tau_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/tau_maximum.xg
index 9d0efd5..9d0efd5 100644
--- a/test/whisky_test_tov_ppm_no_trp/tau_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/tau_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/tau_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/tau_minimum.xg
index 717b687..717b687 100644
--- a/test/whisky_test_tov_ppm_no_trp/tau_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/tau_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/tau_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/tau_norm1.xg
index e70e38c..e70e38c 100644
--- a/test/whisky_test_tov_ppm_no_trp/tau_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/tau_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/tau_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/tau_norm2.xg
index 3176ed1..3176ed1 100644
--- a/test/whisky_test_tov_ppm_no_trp/tau_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/tau_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/tau_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/tau_x_[16][16].xg
index 8c12307..8c12307 100644
--- a/test/whisky_test_tov_ppm_no_trp/tau_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/tau_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/tau_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/tau_y_[16][16].xg
index 0970fbf..0970fbf 100644
--- a/test/whisky_test_tov_ppm_no_trp/tau_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/tau_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/tau_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/tau_z_[16][16].xg
index 0970fbf..0970fbf 100644
--- a/test/whisky_test_tov_ppm_no_trp/tau_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/tau_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_3D_diagonal.xg
index acca7f6..acca7f6 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[0]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_maximum.xg
index 76e0a5a..76e0a5a 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[0]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_minimum.xg
index 3ee44b2..3ee44b2 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[0]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_norm1.xg
index 8d17001..8d17001 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[0]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_norm2.xg
index 374aa73..374aa73 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_x_[16][16].xg
index 56d913d..56d913d 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_y_[16][16].xg
index 4fa0a71..4fa0a71 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_z_[16][16].xg
index c6a1f9e..c6a1f9e 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_3D_diagonal.xg
index 2184096..2184096 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[1]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_maximum.xg
index c344ca6..c344ca6 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[1]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_minimum.xg
index 4e4972c..4e4972c 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[1]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_norm1.xg
index a57bdec..a57bdec 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[1]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_norm2.xg
index bd86e20..bd86e20 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_x_[16][16].xg
index 10b5c02..10b5c02 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_y_[16][16].xg
index ddcbad8..ddcbad8 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_z_[16][16].xg
index ef6f58a..ef6f58a 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_3D_diagonal.xg
index 71a1d30..71a1d30 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[2]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_maximum.xg
index abf9b6c..abf9b6c 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[2]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_minimum.xg
index 27f84b4..27f84b4 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[2]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_norm1.xg
index 208fbb0..208fbb0 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[2]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_norm2.xg
index 8eb1536..8eb1536 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_x_[16][16].xg
index 193a861..193a861 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_y_[16][16].xg
index b81291f..b81291f 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/vel[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_z_[16][16].xg
index 11ca726..11ca726 100644
--- a/test/whisky_test_tov_ppm_no_trp/vel[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/vel[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/w_lorentz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_3D_diagonal.xg
index da97f23..da97f23 100644
--- a/test/whisky_test_tov_ppm_no_trp/w_lorentz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/w_lorentz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_maximum.xg
index 3e8e1ce..3e8e1ce 100644
--- a/test/whisky_test_tov_ppm_no_trp/w_lorentz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/w_lorentz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_minimum.xg
index 6874066..6874066 100644
--- a/test/whisky_test_tov_ppm_no_trp/w_lorentz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/w_lorentz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_norm1.xg
index 254515e..254515e 100644
--- a/test/whisky_test_tov_ppm_no_trp/w_lorentz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/w_lorentz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_norm2.xg
index fa8e291..fa8e291 100644
--- a/test/whisky_test_tov_ppm_no_trp/w_lorentz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp/w_lorentz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_x_[16][16].xg
index 61fcbd6..61fcbd6 100644
--- a/test/whisky_test_tov_ppm_no_trp/w_lorentz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/w_lorentz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_y_[16][16].xg
index 61fcbd6..61fcbd6 100644
--- a/test/whisky_test_tov_ppm_no_trp/w_lorentz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/w_lorentz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_z_[16][16].xg
index 61fcbd6..61fcbd6 100644
--- a/test/whisky_test_tov_ppm_no_trp/w_lorentz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp/w_lorentz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp/whisky_test_tov_ppm_no_trp.par b/test/GRHydro_test_tov_ppm_no_trp/whisky_test_tov_ppm_no_trp.par
index e69de29..e69de29 100644
--- a/test/whisky_test_tov_ppm_no_trp/whisky_test_tov_ppm_no_trp.par
+++ b/test/GRHydro_test_tov_ppm_no_trp/whisky_test_tov_ppm_no_trp.par
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/alp_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/alp_maximum.xg
index 21ad483..21ad483 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/alp_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/alp_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/alp_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/alp_minimum.xg
index fcc44a0..fcc44a0 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/alp_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/alp_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/alp_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/alp_norm1.xg
index 1386c44..1386c44 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/alp_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/alp_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/alp_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/alp_norm2.xg
index 9c6ac9a..9c6ac9a 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/alp_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/alp_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/dens_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_3D_diagonal.xg
index cff56a9..cff56a9 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/dens_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/dens_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_maximum.xg
index 5619e0d..5619e0d 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/dens_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/dens_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_minimum.xg
index efa6c30..efa6c30 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/dens_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/dens_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_norm1.xg
index 3e106fe..3e106fe 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/dens_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/dens_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_norm2.xg
index b7d7f5e..b7d7f5e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/dens_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/dens_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_x_[16][16].xg
index c5690d6..c5690d6 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/dens_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/dens_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_y_[16][16].xg
index c5690d6..c5690d6 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/dens_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/dens_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_z_[16][16].xg
index c5690d6..c5690d6 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/dens_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/dens_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/eps_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_3D_diagonal.xg
index 6f0e293..6f0e293 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/eps_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/eps_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_maximum.xg
index 0400462..0400462 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/eps_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/eps_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_minimum.xg
index 4b1b36c..4b1b36c 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/eps_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/eps_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_norm1.xg
index 26c3495..26c3495 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/eps_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/eps_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_norm2.xg
index eff4946..eff4946 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/eps_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/eps_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_x_[16][16].xg
index 07b8032..07b8032 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/eps_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/eps_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_y_[16][16].xg
index 07b8032..07b8032 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/eps_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/eps_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_z_[16][16].xg
index 07b8032..07b8032 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/eps_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/eps_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxx_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxx_maximum.xg
index a4ed763..a4ed763 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxx_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxx_minimum.xg
index be9380e..be9380e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxx_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxx_norm1.xg
index 49130e6..49130e6 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxx_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxx_norm2.xg
index f67dd11..f67dd11 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxy_maximum.xg
index 5940fc5..5940fc5 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxy_minimum.xg
index 417678d..417678d 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxy_norm1.xg
index 712351c..712351c 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxy_norm2.xg
index 70359f6..70359f6 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxz_maximum.xg
index 62ea395..62ea395 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxz_minimum.xg
index 8960b0e..8960b0e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxz_norm1.xg
index 09a6c15..09a6c15 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gxz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gxz_norm2.xg
index 8ace274..8ace274 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gyy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gyy_maximum.xg
index ea200af..ea200af 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gyy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gyy_minimum.xg
index a0698c1..a0698c1 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gyy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gyy_norm1.xg
index 802060e..802060e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gyy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gyy_norm2.xg
index 33c1021..33c1021 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gyz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gyz_maximum.xg
index e76ad98..e76ad98 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gyz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gyz_minimum.xg
index f31cd6d..f31cd6d 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gyz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gyz_norm1.xg
index d580ce7..d580ce7 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gyz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gyz_norm2.xg
index bd8126d..bd8126d 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gzz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gzz_maximum.xg
index 41cda7d..41cda7d 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gzz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gzz_minimum.xg
index 906cc79..906cc79 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gzz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gzz_norm1.xg
index 1ab43bc..1ab43bc 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/gzz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/gzz_norm2.xg
index 55828f9..55828f9 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/gzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/gzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/ham_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_3D_diagonal.xg
index f4bfcb8..f4bfcb8 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/ham_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/ham_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_maximum.xg
index f937385..f937385 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/ham_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/ham_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_minimum.xg
index 2068c67..2068c67 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/ham_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/ham_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_norm1.xg
index 800a09f..800a09f 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/ham_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/ham_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_norm2.xg
index c0b0f7b..c0b0f7b 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/ham_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/ham_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_x_[16][16].xg
index d4f2f8e..d4f2f8e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/ham_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/ham_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_y_[16][16].xg
index d7535d2..d7535d2 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/ham_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/ham_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_z_[16][16].xg
index d87badb..d87badb 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/ham_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/ham_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxx_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxx_maximum.xg
index a5713b0..a5713b0 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxx_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxx_minimum.xg
index dd328f2..dd328f2 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxx_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxx_norm1.xg
index 99958fd..99958fd 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxx_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxx_norm2.xg
index 38fac86..38fac86 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxy_maximum.xg
index 839043e..839043e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxy_minimum.xg
index 6bf0846..6bf0846 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxy_norm1.xg
index 79ca3ae..79ca3ae 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxy_norm2.xg
index 9f1c62e..9f1c62e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxz_maximum.xg
index 95e9658..95e9658 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxz_minimum.xg
index 2248b9d..2248b9d 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxz_norm1.xg
index 42adb9a..42adb9a 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kxz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kxz_norm2.xg
index 9b9b35d..9b9b35d 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kxz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kxz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kyy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kyy_maximum.xg
index a5a7d32..a5a7d32 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kyy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kyy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kyy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kyy_minimum.xg
index d4f42e0..d4f42e0 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kyy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kyy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kyy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kyy_norm1.xg
index 9931456..9931456 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kyy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kyy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kyy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kyy_norm2.xg
index 2efcd02..2efcd02 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kyy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kyy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kyz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kyz_maximum.xg
index bd60950..bd60950 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kyz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kyz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kyz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kyz_minimum.xg
index 6de315d..6de315d 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kyz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kyz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kyz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kyz_norm1.xg
index ee86832..ee86832 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kyz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kyz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kyz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kyz_norm2.xg
index c601e38..c601e38 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kyz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kyz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kzz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kzz_maximum.xg
index 1440475..1440475 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kzz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kzz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kzz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kzz_minimum.xg
index c1ec108..c1ec108 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kzz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kzz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kzz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kzz_norm1.xg
index 3b541b5..3b541b5 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kzz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kzz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/kzz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/kzz_norm2.xg
index c477cd4..c477cd4 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/kzz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/kzz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momx_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_3D_diagonal.xg
index c6ff67c..c6ff67c 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momx_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momx_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_maximum.xg
index 7ecc5ce..7ecc5ce 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momx_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momx_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_minimum.xg
index 38a2aba..38a2aba 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momx_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momx_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_norm1.xg
index 2d92da3..2d92da3 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momx_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momx_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_norm2.xg
index cfdf7f1..cfdf7f1 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momx_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momx_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_x_[16][16].xg
index 3068470..3068470 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momx_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momx_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_y_[16][16].xg
index b2efba1..b2efba1 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momx_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momx_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_z_[16][16].xg
index 8334d70..8334d70 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momx_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momx_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momy_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_3D_diagonal.xg
index c6ff67c..c6ff67c 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momy_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momy_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_maximum.xg
index 3e9ad8a..3e9ad8a 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momy_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momy_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_minimum.xg
index af574e8..af574e8 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momy_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momy_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_norm1.xg
index 34b5859..34b5859 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momy_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momy_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_norm2.xg
index cb3ad71..cb3ad71 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momy_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momy_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_x_[16][16].xg
index 9f368a3..9f368a3 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momy_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momy_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_y_[16][16].xg
index 8bc596b..8bc596b 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momy_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momy_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_z_[16][16].xg
index 45db4dd..45db4dd 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momy_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momy_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_3D_diagonal.xg
index 3fa9c07..3fa9c07 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_maximum.xg
index 0e81e0f..0e81e0f 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_minimum.xg
index 13382c1..13382c1 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_norm1.xg
index 77cc89f..77cc89f 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_norm2.xg
index 2828a2e..2828a2e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_x_[16][16].xg
index 544e4d3..544e4d3 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_y_[16][16].xg
index 97077ed..97077ed 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/momz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_z_[16][16].xg
index cec0cd6..cec0cd6 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/momz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/momz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/press_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/press_3D_diagonal.xg
index 422e33f..422e33f 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/press_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/press_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/press_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/press_maximum.xg
index c09bc33..c09bc33 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/press_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/press_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/press_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/press_minimum.xg
index 5860d41..5860d41 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/press_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/press_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/press_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/press_norm1.xg
index ae4bda8..ae4bda8 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/press_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/press_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/press_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/press_norm2.xg
index a0491bb..a0491bb 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/press_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/press_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/press_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/press_x_[16][16].xg
index a046aaa..a046aaa 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/press_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/press_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/press_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/press_y_[16][16].xg
index a046aaa..a046aaa 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/press_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/press_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/press_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/press_z_[16][16].xg
index a046aaa..a046aaa 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/press_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/press_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/rho_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_3D_diagonal.xg
index e5ae02a..e5ae02a 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/rho_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/rho_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_maximum.xg
index e7799e1..e7799e1 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/rho_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/rho_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_minimum.xg
index d5fa141..d5fa141 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/rho_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/rho_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_norm1.xg
index 89ca724..89ca724 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/rho_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/rho_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_norm2.xg
index c48146f..c48146f 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/rho_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/rho_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_x_[16][16].xg
index 8421ffd..8421ffd 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/rho_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/rho_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_y_[16][16].xg
index 8421ffd..8421ffd 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/rho_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/rho_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_z_[16][16].xg
index 8421ffd..8421ffd 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/rho_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/rho_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_3D_diagonal.xg
index eacc912..eacc912 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_maximum.xg
index f4705b6..f4705b6 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_minimum.xg
index c19986c..c19986c 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_norm1.xg
index 1636056..1636056 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_norm2.xg
index 5a7b6de..5a7b6de 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_x_[16][16].xg
index a4ba3c9..a4ba3c9 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_y_[16][16].xg
index 621d414..621d414 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_z_[16][16].xg
index 4ea289c..4ea289c 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_3D_diagonal.xg
index eacc912..eacc912 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_maximum.xg
index c4fd9bc..c4fd9bc 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_minimum.xg
index 09c9c44..09c9c44 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_norm1.xg
index 8234b52..8234b52 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_norm2.xg
index a8c6a31..a8c6a31 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_x_[16][16].xg
index 8a676b3..8a676b3 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_y_[16][16].xg
index a4ba3c9..a4ba3c9 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_z_[16][16].xg
index 4ea289c..4ea289c 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_3D_diagonal.xg
index 4cbb5fa..4cbb5fa 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_maximum.xg
index 8f0d763..8f0d763 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_minimum.xg
index e9dfe34..e9dfe34 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_norm1.xg
index 696035c..696035c 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_norm2.xg
index b9b8ea3..b9b8ea3 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_x_[16][16].xg
index d222c87..d222c87 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_y_[16][16].xg
index 09da73c..09da73c 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_z_[16][16].xg
index fe23e98..fe23e98 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/scon[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/scon[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/tau_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_3D_diagonal.xg
index d334ec4..d334ec4 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/tau_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/tau_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_maximum.xg
index bb0f57e..bb0f57e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/tau_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/tau_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_minimum.xg
index 717b687..717b687 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/tau_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/tau_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_norm1.xg
index 001040b..001040b 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/tau_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/tau_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_norm2.xg
index 5ace21b..5ace21b 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/tau_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/tau_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_x_[16][16].xg
index 7997cc3..7997cc3 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/tau_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/tau_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_y_[16][16].xg
index 7997cc3..7997cc3 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/tau_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/tau_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_z_[16][16].xg
index e61f393..e61f393 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/tau_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/tau_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_3D_diagonal.xg
index ef6f85e..ef6f85e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_maximum.xg
index e7b1deb..e7b1deb 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_minimum.xg
index 8ebb121..8ebb121 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_norm1.xg
index d75fa58..d75fa58 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_norm2.xg
index 1f2c722..1f2c722 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_x_[16][16].xg
index 9d4a424..9d4a424 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_y_[16][16].xg
index 1cf5cf1..1cf5cf1 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_z_[16][16].xg
index 45c978b..45c978b 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[0]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[0]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_3D_diagonal.xg
index ef6f85e..ef6f85e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_maximum.xg
index a1afbcb..a1afbcb 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_minimum.xg
index a3683af..a3683af 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_norm1.xg
index 7f075e2..7f075e2 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_norm2.xg
index cd494ec..cd494ec 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_x_[16][16].xg
index 00d02bd..00d02bd 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_y_[16][16].xg
index 9d4a424..9d4a424 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_z_[16][16].xg
index 45c978b..45c978b 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[1]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[1]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_3D_diagonal.xg
index ef6f85e..ef6f85e 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_maximum.xg
index 2e2fad6..2e2fad6 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_minimum.xg
index a4f91f6..a4f91f6 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_norm1.xg
index 61a6b52..61a6b52 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_norm2.xg
index 59f33a8..59f33a8 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_x_[16][16].xg
index ac35e95..ac35e95 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_y_[16][16].xg
index eb939a2..eb939a2 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_z_[16][16].xg
index 9d4a424..9d4a424 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/vel[2]_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/vel[2]_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_3D_diagonal.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_3D_diagonal.xg
index 9fafaeb..9fafaeb 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_3D_diagonal.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_3D_diagonal.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_maximum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_maximum.xg
index 2f9510d..2f9510d 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_maximum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_maximum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_minimum.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_minimum.xg
index 6874066..6874066 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_minimum.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_minimum.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_norm1.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_norm1.xg
index e5e10f5..e5e10f5 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_norm1.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_norm1.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_norm2.xg b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_norm2.xg
index 5d66fdb..5d66fdb 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_norm2.xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_norm2.xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_x_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_x_[16][16].xg
index f8129d1..f8129d1 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_x_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_x_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_y_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_y_[16][16].xg
index f8129d1..f8129d1 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_y_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_y_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_z_[16][16].xg b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_z_[16][16].xg
index f8129d1..f8129d1 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/w_lorentz_z_[16][16].xg
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/w_lorentz_z_[16][16].xg
diff --git a/test/whisky_test_tov_ppm_no_trp_ML.par b/test/GRHydro_test_tov_ppm_no_trp_ML/whisky_test_tov_ppm_no_trp_ML.par
index 260d2c4..260d2c4 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML.par
+++ b/test/GRHydro_test_tov_ppm_no_trp_ML/whisky_test_tov_ppm_no_trp_ML.par
diff --git a/test/whisky_test_shock.par b/test/GRHydrotest_shock.par
index 5411d8b..cf7d9e3 100644
--- a/test/whisky_test_shock.par
+++ b/test/GRHydrotest_shock.par
@@ -22,13 +22,13 @@ time::dtfac 				= 	0.25
 ActiveThorns = "ioutil ioascii iobasic"
 
 IO::out_fileinfo			=	"none"
-IO::out_dir 				= 	"whisky_test_shock"
+IO::out_dir 				= 	"GRHydro_test_shock"
 
 IOBasic::outInfo_every 			= 	1
 IOBasic::outInfo_vars 			= 	"HydroBase::rho"
 
 IOASCII::out1D_every 			= 	1
-IOASCII::out1D_vars 			= 	"whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon"
+IOASCII::out1D_vars 			= 	"GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon"
 
 ActiveThorns = "nanchecker mol"
 
@@ -54,15 +54,15 @@ EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 ActiveThorns = "hydrobase grhydro initbase"
 
 hydrobase::timelevels			= 2
-hydrobase::evolution_method       = "whisky"
-
-whisky::riemann_solver			=	"Roe"
-whisky::whisky_eos_type			=	"General"
-whisky::whisky_eos_table		=	"Ideal_Fluid"
-whisky::whisky_stencil			=	2
-whisky::recon_method			=	"tvd"
-whisky::tvd_limiter			=	"minmod"
-whisky::bound				=	"flat"
+hydrobase::evolution_method       = "GRHydro"
+
+GRHydro::riemann_solver			=	"Roe"
+GRHydro::GRHydro_eos_type			=	"General"
+GRHydro::GRHydro_eos_table		=	"Ideal_Fluid"
+GRHydro::GRHydro_stencil			=	2
+GRHydro::recon_method			=	"tvd"
+GRHydro::tvd_limiter			=	"minmod"
+GRHydro::bound				=	"flat"
 
 ActiveThorns = "grhydro_initdata"
 
diff --git a/test/whisky_test_shock_ppm.par b/test/GRHydrotest_shock_ppm.par
index 61e1cb0..9ef92cd 100644
--- a/test/whisky_test_shock_ppm.par
+++ b/test/GRHydrotest_shock_ppm.par
@@ -22,13 +22,13 @@ time::dtfac 				= 	0.25
 ActiveThorns = "ioutil ioascii iobasic"
 
 IO::out_fileinfo="none"
-IO::out_dir 				= 	"whisky_test_shock_ppm"
+IO::out_dir 				= 	"GRHydro_test_shock_ppm"
 
 IOBasic::outInfo_every 			= 	1
 IOBasic::outInfo_vars 			= 	"HydroBase::rho"
 
 IOASCII::out1D_every 			= 	1
-IOASCII::out1D_vars 			= 	"whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon"
+IOASCII::out1D_vars 			= 	"GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon"
 
 ActiveThorns = "nanchecker mol"
 
@@ -54,14 +54,14 @@ EOS_IdealFluid::eos_ideal_fluid_gamma	=	1.66666666666666
 ActiveThorns = "hydrobase grhydro initbase"
 
 hydrobase::timelevels			= 2
-hydrobase::evolution_method       = "whisky"
-
-whisky::riemann_solver			=	"Roe"
-whisky::whisky_eos_type			=	"General"
-whisky::whisky_eos_table		=	"Ideal_Fluid"
-whisky::whisky_stencil			=	3
-whisky::recon_method			=	"ppm"
-whisky::bound				=	"flat"
+hydrobase::evolution_method       = "GRHydro"
+
+GRHydro::riemann_solver			=	"Roe"
+GRHydro::GRHydro_eos_type			=	"General"
+GRHydro::GRHydro_eos_table		=	"Ideal_Fluid"
+GRHydro::GRHydro_stencil			=	3
+GRHydro::recon_method			=	"ppm"
+GRHydro::bound				=	"flat"
 
 ActiveThorns = "grhydro_initdata"
 
diff --git a/test/whisky_test_tov_ppm.par b/test/GRHydrotest_tov_ppm.par
index d40581c..90eb1e5 100644
--- a/test/whisky_test_tov_ppm.par
+++ b/test/GRHydrotest_tov_ppm.par
@@ -10,7 +10,7 @@ TmunuBase::prolongation_type		=	none
 time::dtfac = 0.375
 
 hydrobase::timelevels			= 2
-hydrobase::evolution_method       = "whisky"
+hydrobase::evolution_method       = "GRHydro"
 
 admbase::evolution_method        = "adm_bssn"
 admbase::lapse_evolution_method  = "1+log"
@@ -37,22 +37,22 @@ cactus::cctk_itlast   =       7
 
 methodoflines::ode_method        = "icn"
 
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-whisky::ppm_detect = "no"
-whisky::ppm_epsilon = 0.0
-whisky::ppm_omega1 = 0.52
-whisky::ppm_omega2 = 0.0
-whisky::ppm_epsilon_shock = 0.1
-whisky::ppm_eta1 = 5.0
-whisky::ppm_k0 = 0.2
+GRHydro::riemann_solver            = "Marquina"
+GRHydro::GRHydro_eos_type           = "Polytype"
+GRHydro::GRHydro_eos_table          = "2D_Polytrope"
+GRHydro::recon_method              = "ppm"
+GRHydro::GRHydro_stencil            = 3
+GRHydro::bound                     = "none"
+GRHydro::rho_abs_min               = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
+
+GRHydro::ppm_detect = "no"
+GRHydro::ppm_epsilon = 0.0
+GRHydro::ppm_omega1 = 0.52
+GRHydro::ppm_omega2 = 0.0
+GRHydro::ppm_epsilon_shock = 0.1
+GRHydro::ppm_eta1 = 5.0
+GRHydro::ppm_k0 = 0.2
 
 ADMBase::initial_data  = "tov"
 ADMBase::initial_lapse = "tov"
@@ -70,11 +70,11 @@ IOBasic::outInfo_every 			= 	1
 IOBasic::outInfo_vars 			= 	"HydroBase::rho"
 
 IO::out_fileinfo="none"
-IO::out_dir = "whisky_test_tov_ppm"
+IO::out_dir = "GRHydro_test_tov_ppm"
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"
diff --git a/test/whisky_test_tov_ppm_ML/whisky_test_tov_ppm_ML.par b/test/GRHydrotest_tov_ppm_ML.par
index 2c9282c..9d538a5 100644
--- a/test/whisky_test_tov_ppm_ML/whisky_test_tov_ppm_ML.par
+++ b/test/GRHydrotest_tov_ppm_ML.par
@@ -10,7 +10,7 @@ TmunuBase::prolongation_type		=	none
 time::dtfac = 0.375
 
 hydrobase::timelevels			= 2
-hydrobase::evolution_method       = "whisky"
+hydrobase::evolution_method       = "GRHydro"
 
 admbase::evolution_method        = "ML_BSSN_O2"
 admbase::lapse_evolution_method  = "ML_BSSN_O2"
@@ -52,22 +52,22 @@ cactus::cctk_itlast   =       7
 
 methodoflines::ode_method        = "icn"
 
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-whisky::ppm_detect = "no"
-whisky::ppm_epsilon = 0.0
-whisky::ppm_omega1 = 0.52
-whisky::ppm_omega2 = 0.0
-whisky::ppm_epsilon_shock = 0.1
-whisky::ppm_eta1 = 5.0
-whisky::ppm_k0 = 0.2
+GRHydro::riemann_solver            = "Marquina"
+GRHydro::GRHydro_eos_type           = "Polytype"
+GRHydro::GRHydro_eos_table          = "2D_Polytrope"
+GRHydro::recon_method              = "ppm"
+GRHydro::GRHydro_stencil            = 3
+GRHydro::bound                     = "none"
+GRHydro::rho_abs_min               = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
+
+GRHydro::ppm_detect = "no"
+GRHydro::ppm_epsilon = 0.0
+GRHydro::ppm_omega1 = 0.52
+GRHydro::ppm_omega2 = 0.0
+GRHydro::ppm_epsilon_shock = 0.1
+GRHydro::ppm_eta1 = 5.0
+GRHydro::ppm_k0 = 0.2
 
 ADMBase::initial_data  = "tov"
 ADMBase::initial_lapse = "tov"
@@ -88,8 +88,8 @@ IO::out_fileinfo="none"
 IO::out_dir = $parfile
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"
diff --git a/test/whisky_test_tov_ppm_eosg.par b/test/GRHydrotest_tov_ppm_eosg.par
index 84d1924..9f6f83a 100644
--- a/test/whisky_test_tov_ppm_eosg.par
+++ b/test/GRHydrotest_tov_ppm_eosg.par
@@ -10,7 +10,7 @@ TmunuBase::prolongation_type		=	none
 time::dtfac = 0.375
 
 hydrobase::timelevels			= 2
-hydrobase::evolution_method       = "whisky"
+hydrobase::evolution_method       = "GRHydro"
 
 admbase::evolution_method        = "adm_bssn"
 admbase::lapse_evolution_method  = "1+log"
@@ -37,24 +37,24 @@ cactus::cctk_itlast   =       7
 
 methodoflines::ode_method        = "icn"
 
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::use_eosgeneral            = "yes"
-whisky::eosgeneral_name           = "Polytrope"
-whisky::recon_method              = "ppm"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-whisky::ppm_detect = "no"
-whisky::ppm_epsilon = 0.0
-whisky::ppm_omega1 = 0.52
-whisky::ppm_omega2 = 0.0
-whisky::ppm_epsilon_shock = 0.1
-whisky::ppm_eta1 = 5.0
-whisky::ppm_k0 = 0.2
+GRHydro::riemann_solver            = "Marquina"
+GRHydro::GRHydro_eos_type           = "Polytype"
+GRHydro::GRHydro_eos_table          = "2D_Polytrope"
+GRHydro::use_eosgeneral            = "yes"
+GRHydro::eosgeneral_name           = "Polytrope"
+GRHydro::recon_method              = "ppm"
+GRHydro::GRHydro_stencil            = 3
+GRHydro::bound                     = "none"
+GRHydro::rho_abs_min               = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
+
+GRHydro::ppm_detect = "no"
+GRHydro::ppm_epsilon = 0.0
+GRHydro::ppm_omega1 = 0.52
+GRHydro::ppm_omega2 = 0.0
+GRHydro::ppm_epsilon_shock = 0.1
+GRHydro::ppm_eta1 = 5.0
+GRHydro::ppm_k0 = 0.2
 
 ADMBase::initial_data  = "tov"
 ADMBase::initial_lapse = "tov"
@@ -75,8 +75,8 @@ IO::out_fileinfo="none"
 IO::out_dir = $parfile
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"
diff --git a/test/whisky_test_tov_ppm_eosg_ML/whisky_test_tov_ppm_eosg_ML.par b/test/GRHydrotest_tov_ppm_eosg_ML.par
index e21a148..e21a148 100644
--- a/test/whisky_test_tov_ppm_eosg_ML/whisky_test_tov_ppm_eosg_ML.par
+++ b/test/GRHydrotest_tov_ppm_eosg_ML.par
diff --git a/test/whisky_test_tov_ppm_no_trp.par b/test/GRHydrotest_tov_ppm_no_trp.par
index 26ed27a..48c16cb 100644
--- a/test/whisky_test_tov_ppm_no_trp.par
+++ b/test/GRHydrotest_tov_ppm_no_trp.par
@@ -10,7 +10,7 @@ TmunuBase::prolongation_type		=	none
 time::dtfac = 0.375
 
 hydrobase::timelevels			= 2
-hydrobase::evolution_method       = "whisky"
+hydrobase::evolution_method       = "GRHydro"
 
 admbase::evolution_method        = "adm_bssn"
 admbase::lapse_evolution_method  = "1+log"
@@ -37,23 +37,23 @@ cactus::cctk_itlast   =       7
 
 methodoflines::ode_method        = "icn"
 
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::check_for_trivial_rp      = "no"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-whisky::ppm_detect = "no"
-whisky::ppm_epsilon = 0.0
-whisky::ppm_omega1 = 0.52
-whisky::ppm_omega2 = 0.0
-whisky::ppm_epsilon_shock = 0.1
-whisky::ppm_eta1 = 5.0
-whisky::ppm_k0 = 0.2
+GRHydro::riemann_solver            = "Marquina"
+GRHydro::GRHydro_eos_type           = "Polytype"
+GRHydro::GRHydro_eos_table          = "2D_Polytrope"
+GRHydro::recon_method              = "ppm"
+GRHydro::check_for_trivial_rp      = "no"
+GRHydro::GRHydro_stencil            = 3
+GRHydro::bound                     = "none"
+GRHydro::rho_abs_min               = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
+
+GRHydro::ppm_detect = "no"
+GRHydro::ppm_epsilon = 0.0
+GRHydro::ppm_omega1 = 0.52
+GRHydro::ppm_omega2 = 0.0
+GRHydro::ppm_epsilon_shock = 0.1
+GRHydro::ppm_eta1 = 5.0
+GRHydro::ppm_k0 = 0.2
 
 ADMBase::initial_data  = "tov"
 ADMBase::initial_lapse = "tov"
@@ -70,12 +70,12 @@ EOS_Polytrope::eos_k                = 100.0
 IOBasic::outInfo_every 			= 	1
 IOBasic::outInfo_vars 			= 	"HydroBase::rho"
 
-IO::out_dir = "whisky_test_tov_ppm_no_trp"
+IO::out_dir = "GRHydro_test_tov_ppm_no_trp"
 IO::out_fileinfo="none"
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"
diff --git a/test/whisky_test_tov_ppm_no_trp_ML/whisky_test_tov_ppm_no_trp_ML.par b/test/GRHydrotest_tov_ppm_no_trp_ML.par
index 260d2c4..b2c0608 100644
--- a/test/whisky_test_tov_ppm_no_trp_ML/whisky_test_tov_ppm_no_trp_ML.par
+++ b/test/GRHydrotest_tov_ppm_no_trp_ML.par
@@ -10,7 +10,7 @@ TmunuBase::prolongation_type		=	none
 time::dtfac = 0.375
 
 hydrobase::timelevels			= 2
-hydrobase::evolution_method       = "whisky"
+hydrobase::evolution_method       = "GRHydro"
 
 admbase::evolution_method        = "ml_bssn_O2"
 ADMBase::lapse_evolution_method   = "ML_BSSN_O2"
@@ -52,23 +52,23 @@ cactus::cctk_itlast   =       7
 
 methodoflines::ode_method        = "icn"
 
-whisky::riemann_solver            = "Marquina"
-whisky::whisky_eos_type           = "Polytype"
-whisky::whisky_eos_table          = "2D_Polytrope"
-whisky::recon_method              = "ppm"
-whisky::check_for_trivial_rp      = "no"
-whisky::whisky_stencil            = 3
-whisky::bound                     = "none"
-whisky::rho_abs_min               = 1.e-7
-whisky::initial_atmosphere_factor = 0.999
-
-whisky::ppm_detect = "no"
-whisky::ppm_epsilon = 0.0
-whisky::ppm_omega1 = 0.52
-whisky::ppm_omega2 = 0.0
-whisky::ppm_epsilon_shock = 0.1
-whisky::ppm_eta1 = 5.0
-whisky::ppm_k0 = 0.2
+GRHydro::riemann_solver            = "Marquina"
+GRHydro::GRHydro_eos_type           = "Polytype"
+GRHydro::GRHydro_eos_table          = "2D_Polytrope"
+GRHydro::recon_method              = "ppm"
+GRHydro::check_for_trivial_rp      = "no"
+GRHydro::GRHydro_stencil            = 3
+GRHydro::bound                     = "none"
+GRHydro::rho_abs_min               = 1.e-7
+GRHydro::initial_atmosphere_factor = 0.999
+
+GRHydro::ppm_detect = "no"
+GRHydro::ppm_epsilon = 0.0
+GRHydro::ppm_omega1 = 0.52
+GRHydro::ppm_omega2 = 0.0
+GRHydro::ppm_epsilon_shock = 0.1
+GRHydro::ppm_eta1 = 5.0
+GRHydro::ppm_k0 = 0.2
 
 ADMBase::initial_data  = "tov"
 ADMBase::initial_lapse = "tov"
@@ -89,8 +89,8 @@ IO::out_dir = $parfile
 IO::out_fileinfo="none"
 
 IOBasic::outScalar_every = 1
-IOBasic::outScalar_vars  = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
+IOBasic::outScalar_vars  = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum"
 
 IOASCII::out1D_every     = 1
-IOASCII::out1D_vars      = "whisky::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel whisky::dens whisky::tau whisky::scon admconstraints::ham admconstraints::momentum"
+IOASCII::out1D_vars      = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum"
 IOASCII::out_format      = ".10e"