From 39d5f5e568fecb8cf28f7a13418c472b14a85966 Mon Sep 17 00:00:00 2001
From: cott <cott@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45>
Date: Fri, 27 Aug 2010 20:30:51 +0000
Subject: * remove dependence on StaticConformal * change calculation of the
 determinant of the 3-metric from   a subroutine call to a macro.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@152 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45
---
 src/GRHydro_Marquina.F90 | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

(limited to 'src/GRHydro_Marquina.F90')

diff --git a/src/GRHydro_Marquina.F90 b/src/GRHydro_Marquina.F90
index 9d1e946..f3c2030 100644
--- a/src/GRHydro_Marquina.F90
+++ b/src/GRHydro_Marquina.F90
@@ -15,6 +15,7 @@
 #include "cctk_Parameters.h"
 #include "cctk_Functions.h"
 
+#include "GRHydro_Macros.h"
 #include "SpaceMask.h"
 
  /*@@
@@ -139,21 +140,9 @@ subroutine GRHydro_Marquina(CCTK_ARGUMENTS)
           gzzh = 0.5d0 * (gzz(i+xoffset,j+yoffset,k+zoffset) + &
                gzz(i,j,k))
 
-          if (conformal_state > 0) then
-
-            psi4h = (0.5d0*(psi(i,j,k)+psi(i+xoffset,j+yoffset,k+zoffset)))**4
-            gxxh = gxxh * psi4h
-            gxyh = gxyh * psi4h
-            gxzh = gxzh * psi4h
-            gyyh = gyyh * psi4h
-            gyzh = gyzh * psi4h
-            gzzh = gzzh * psi4h
-
-          end if
-
 !!$ routine to calculate the determinant of the metric
 
-          call SpatialDeterminant(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,avg_det)
+         avg_det = SPATIAL_DETERMINANT(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh)
           
 !!$ If the Riemann problem is trivial, just calculate the fluxes from the 
 !!$ left state and skip to the next cell
@@ -491,22 +480,10 @@ subroutine GRHydro_MarquinaGeneral(CCTK_ARGUMENTS)
         gzzh = 0.5d0 * (gzz(i+xoffset,j+yoffset,k+zoffset) + &
              gzz(i,j,k))
         
-        if (conformal_state > 0) then
-          
-          psi4h = (0.5d0*(psi(i,j,k)+psi(i+xoffset,j+yoffset,k+zoffset)))**4
-          gxxh = gxxh * psi4h
-          gxyh = gxyh * psi4h
-          gxzh = gxzh * psi4h
-          gyyh = gyyh * psi4h
-          gyzh = gyzh * psi4h
-          gzzh = gzzh * psi4h
-          
-        end if
-        
 !!$ routine to calculate the determinant of the metric
         
-        call SpatialDeterminant(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,avg_det)
-        
+        avg_det = SPATIAL_DETERMINANT(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh)
+
 !!$ If the Riemann problem is trivial the flux is already correct
         
         if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, trivial)) then
-- 
cgit v1.2.3