fix function argument lists of calls to the eigenproblem functions

put eigenproblem functions into module to be able to check function argument list automatically in the future



git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@35 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45

6 files changed, 64 insertions, 60 deletions

diff --git a/src/Whisky_Eigenproblem.F90 b/src/Whisky_Eigenproblem.F90
index e0a96ea..e971e1d 100644
--- a/src/Whisky_Eigenproblem.F90
+++ b/src/Whisky_Eigenproblem.F90
@@ -19,6 +19,10 @@
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
+module Whisky_Eigenproblem
+  implicit none
+
+
  /*@@
    @routine    eigenvalues
    @date       Sat Jan 26 01:26:20 2002
@@ -35,9 +39,10 @@
 
 @@*/
 
+CONTAINS
+
 subroutine eigenvalues(handle,rho,velx,vely,velz,eps,w_lorentz,&
      lam,gxx,gxy,gxz,gyy,gyz,gzz,u,alp,beta)
-
   implicit none
 
   DECLARE_CCTK_PARAMETERS
@@ -1130,3 +1135,6 @@ subroutine eigenproblem_general(&
   roeflux5 = rflux(5)
 
 end subroutine eigenproblem_general
+
+end module Whisky_Eigenproblem
+
diff --git a/src/Whisky_FluxSplit.F90 b/src/Whisky_FluxSplit.F90
index f9bb3ba..f08c301 100644
--- a/src/Whisky_FluxSplit.F90
+++ b/src/Whisky_FluxSplit.F90
@@ -30,6 +30,8 @@
 
 subroutine Whisky_FSAlpha(CCTK_ARGUMENTS)
 
+  use Whisky_Eigenproblem
+
   implicit none
   
   DECLARE_CCTK_ARGUMENTS
@@ -102,7 +104,6 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS)
                gyz      (i,j,k), &
                gzz      (i,j,k), &
                uxx             , &
-               det             , &
                alp      (i,j,k), &
                beta               )  
 
@@ -160,7 +161,6 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS)
                gxz      (i,j,k), &
                gxx      (i,j,k), &
                uyy             , &
-               det             , &
                alp      (i,j,k), &
                beta               )  
 
@@ -218,7 +218,6 @@ subroutine Whisky_FSAlpha(CCTK_ARGUMENTS)
                gxy      (i,j,k), &
                gyy      (i,j,k), &
                uzz             , &
-               det             , &
                alp      (i,j,k), &
                beta               )  
 
@@ -527,6 +526,8 @@ subroutine Whisky_SplitFlux_1D(handle, nx, &
      densfminus, sxfminus, syfminus, szfminus, taufminus, &
      densflux, sxflux, syflux, szflux, tauflux)
 
+  use Whisky_Eigenproblem
+
   implicit none
 
   DECLARE_CCTK_PARAMETERS
@@ -601,7 +602,6 @@ subroutine Whisky_SplitFlux_1D(handle, nx, &
          0.5d0 * (gyz      (i) + gyz      (i+1)), &
          0.5d0 * (gzz      (i) + gzz      (i+1)), &
          0.5d0 * (u        (i) + u        (i+1)), &
-         0.5d0 * (det      (i) + det      (i+1)), &
          0.5d0 * (alp      (i) + alp      (i+1)), &
          0.5d0 * (beta     (i) + beta     (i+1)), &
          lambda,&
diff --git a/src/Whisky_HLLE.F90 b/src/Whisky_HLLE.F90
index 638c363..2e4fd68 100644
--- a/src/Whisky_HLLE.F90
+++ b/src/Whisky_HLLE.F90
@@ -33,6 +33,7 @@
 
 subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS)
 
+  USE Whisky_Eigenproblem
   implicit none
   
   DECLARE_CCTK_ARGUMENTS
@@ -214,19 +215,17 @@ subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS)
           
           if (flux_direction == 1) then
             call eigenvalues_general(&
-                 prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5), &
-                 prim_m(6),cs2_m, &
+                 prim_m(2),prim_m(3),prim_m(4),cs2_m, &
                  lamminus,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,&
                  psi4h*gyyh,psi4h*gyzh,psi4h*gzzh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call eigenvalues_general(&
-                 prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5), &
-                 prim_p(6),cs2_p, &
+                 prim_p(2),prim_p(3),prim_p(4),cs2_p, &
                  lamplus,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,&
                  psi4h*gyyh,psi4h*gyzh,psi4h*gzzh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call num_x_flux(cons_p(1),cons_p(2),cons_p(3),cons_p(4),cons_p(5),&
                  fplus(1),fplus(2),fplus(3),fplus(4),fplus(5),&
                  prim_p(2),prim_p(6), &
@@ -237,19 +236,17 @@ subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS)
                  avg_det,avg_alp,avg_beta)
           else if (flux_direction == 2) then
             call eigenvalues_general(&
-                 prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5), &
-                 prim_m(6),cs2_m, &
+                 prim_m(3),prim_m(4),prim_m(2),cs2_m, &
                  lamminus,&
                  psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,&
                  psi4h*gzzh,psi4h*gxzh,psi4h*gxxh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call eigenvalues_general(&
-                 prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5), &
-                 prim_p(6),cs2_p, &
+                 prim_p(3),prim_p(4),prim_p(2),cs2_p, &
                  lamplus,&
                  psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,&
                  psi4h*gzzh,psi4h*gxzh,psi4h*gxxh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call num_x_flux(cons_p(1),cons_p(3),cons_p(4),cons_p(2),cons_p(5),&
                  fplus(1),fplus(3),fplus(4),fplus(2),fplus(5),&
                  prim_p(3),prim_p(6), &
@@ -260,19 +257,17 @@ subroutine Whisky_HLLEGeneral(CCTK_ARGUMENTS)
                  avg_det,avg_alp,avg_beta)
           else if (flux_direction == 3) then
             call eigenvalues_general(&
-                 prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5), &
-                 prim_m(6),cs2_m, &
+                 prim_m(4),prim_m(2),prim_m(3),cs2_m, &
                  lamminus,&
                  psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call eigenvalues_general(&
-                 prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5), &
-                 prim_p(6),cs2_p, &
+                 prim_p(4),prim_p(2),prim_p(3),cs2_p, &
                  lamplus,&
                  psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call num_x_flux(cons_p(1),cons_p(4),cons_p(2),cons_p(3),cons_p(5),&
                  fplus(1),fplus(4),fplus(2),fplus(3),fplus(5), &
                  prim_p(4),prim_p(6), &
@@ -348,6 +343,7 @@ end subroutine Whisky_HLLEGeneral
 
 subroutine Whisky_HLLE_TracerGeneral(CCTK_ARGUMENTS)
 
+  USE Whisky_Eigenproblem
 
   implicit none
   
@@ -472,57 +468,51 @@ subroutine Whisky_HLLE_TracerGeneral(CCTK_ARGUMENTS)
           
           if (flux_direction == 1) then
             call eigenvalues_general(&
-                 prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5), &
-                 prim_m(6),cs2_m, &
+                 prim_m(2),prim_m(3),prim_m(4),cs2_m, &
                  lamminus,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,&
                  psi4h*gyyh,psi4h*gyzh,psi4h*gzzh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call eigenvalues_general(&
-                 prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5), &
-                 prim_p(6),cs2_p, &
+                 prim_p(2),prim_p(3),prim_p(4),cs2_p, &
                  lamplus,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,&
                  psi4h*gyyh,psi4h*gyzh,psi4h*gzzh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             fplus(:)  = (velxplus(i,j,k)  - avg_beta / avg_alp) * &
                  cons_tracerplus(i,j,k,:)
             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_general(&
-                 prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5), &
-                 prim_m(6),cs2_m, &
+                 prim_m(3),prim_m(4),prim_m(2),cs2_m, &
                  lamminus,&
                  psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,&
                  psi4h*gzzh,psi4h*gxzh,psi4h*gxxh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call eigenvalues_general(&
-                 prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5), &
-                 prim_p(6),cs2_p, &
+                 prim_p(3),prim_p(4),prim_p(2),cs2_p, &
                  lamplus,&
                  psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,&
                  psi4h*gzzh,psi4h*gxzh,psi4h*gxxh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             fplus(:)  = (velyplus(i,j,k)  - avg_beta / avg_alp) * &
                  cons_tracerplus(i,j,k,:)
             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_general(&
-                 prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5), &
-                 prim_m(6),cs2_m, &
+                 prim_m(4),prim_m(2),prim_m(3),cs2_m, &
                  lamminus,&
                  psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call eigenvalues_general(&
-                 prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5), &
-                 prim_p(6),cs2_p, &
+                 prim_p(4),prim_p(2),prim_p(3),cs2_p, &
                  lamplus,&
                  psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             fplus(:)  = (velzplus(i,j,k) - avg_beta / avg_alp) * &
                  cons_tracerplus(i,j,k,:)
             fminus(:) = (velzminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * &
diff --git a/src/Whisky_HLLEPoly.F90 b/src/Whisky_HLLEPoly.F90
index e3892e9..ad250f7 100644
--- a/src/Whisky_HLLEPoly.F90
+++ b/src/Whisky_HLLEPoly.F90
@@ -31,6 +31,7 @@
 @@*/
 
 subroutine Whisky_HLLE(CCTK_ARGUMENTS)
+  USE Whisky_Eigenproblem
 
   implicit none
   
@@ -192,13 +193,13 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
                  w_lorentzminus(i+xoffset,j+yoffset,k+zoffset),&
                  lamminus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,&
                  psi4h*gyzh,psi4h*gzzh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call eigenvalues(whisky_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,&
                  psi4h*gyzh,psi4h*gzzh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call num_x_flux(consp(1),consp(2),consp(3),consp(4),consp(5),&
                  fplus(1),fplus(2),fplus(3),fplus(4),&
                  fplus(5),velxplus(i,j,k),pressplus(i,j,k),&
@@ -219,13 +220,13 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
                  w_lorentzminus(i+xoffset,j+yoffset,k+zoffset),&
                  lamminus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,&
                  psi4h*gxzh,psi4h*gxxh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call eigenvalues(whisky_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,&
                  psi4h*gxzh,psi4h*gxxh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call num_x_flux(consp(1),consp(3),consp(4),consp(2),consp(5),&
                  fplus(1),fplus(3),fplus(4),fplus(2),&
                  fplus(5),velyplus(i,j,k),pressplus(i,j,k),&
@@ -246,13 +247,13 @@ subroutine Whisky_HLLE(CCTK_ARGUMENTS)
                  w_lorentzminus(i+xoffset,j+yoffset,k+zoffset),&
                  lamminus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call eigenvalues(whisky_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,&
                  psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
-                 usendh,avg_det,avg_alp,avg_beta)
+                 usendh,avg_alp,avg_beta)
             call num_x_flux(consp(1),consp(4),consp(2),consp(3),consp(5),&
                  fplus(1),fplus(4),fplus(2),fplus(3),&
                  fplus(5),velzplus(i,j,k),pressplus(i,j,k),avg_det,&
@@ -321,6 +322,8 @@ end subroutine Whisky_HLLE
 
 subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
 
+  USE Whisky_Eigenproblem
+
   implicit none
   
   DECLARE_CCTK_ARGUMENTS
@@ -440,13 +443,13 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
                w_lorentzminus(i+xoffset,j+yoffset,k+zoffset),&
                lamminus,psi4h*gxxh,psi4h*gxyh,psi4h*gxzh,psi4h*gyyh,&
                psi4h*gyzh,psi4h*gzzh,&
-               usendh,avg_det,avg_alp,avg_beta)
+               usendh,avg_alp,avg_beta)
           call eigenvalues(whisky_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,&
                psi4h*gyzh,psi4h*gzzh,&
-               usendh,avg_det,avg_alp,avg_beta)
+               usendh,avg_alp,avg_beta)
           fplus(:)  = (velxplus(i,j,k)  - avg_beta / avg_alp) * &
                cons_tracerplus(i,j,k,:)
           fminus(:) = (velxminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * &
@@ -461,13 +464,13 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
                w_lorentzminus(i+xoffset,j+yoffset,k+zoffset),&
                lamminus,psi4h*gyyh,psi4h*gyzh,psi4h*gxyh,psi4h*gzzh,&
                psi4h*gxzh,psi4h*gxxh,&
-               usendh,avg_det,avg_alp,avg_beta)
+               usendh,avg_alp,avg_beta)
           call eigenvalues(whisky_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,&
                psi4h*gxzh,psi4h*gxxh,&
-               usendh,avg_det,avg_alp,avg_beta)
+               usendh,avg_alp,avg_beta)
           fplus(:)  = (velyplus(i,j,k)  - avg_beta / avg_alp) * &
                cons_tracerplus(i,j,k,:)
           fminus(:) = (velyminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * &
@@ -482,13 +485,13 @@ subroutine Whisky_HLLE_Tracer(CCTK_ARGUMENTS)
                w_lorentzminus(i+xoffset,j+yoffset,k+zoffset),&
                lamminus,psi4h*gzzh,psi4h*gxzh,psi4h*gyzh,&
                psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
-               usendh,avg_det,avg_alp,avg_beta)
+               usendh,avg_alp,avg_beta)
           call eigenvalues(whisky_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,&
                psi4h*gxxh,psi4h*gxyh,psi4h*gyyh,&
-               usendh,avg_det,avg_alp,avg_beta)
+               usendh,avg_alp,avg_beta)
           fplus(:)  = (velzplus(i,j,k) - avg_beta / avg_alp) * &
                cons_tracerplus(i,j,k,:)
           fminus(:) = (velzminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * &
diff --git a/src/Whisky_PPM.F90 b/src/Whisky_PPM.F90
index 344c3d1..e249831 100644
--- a/src/Whisky_PPM.F90
+++ b/src/Whisky_PPM.F90
@@ -58,6 +58,7 @@ subroutine SimplePPM_1d(handle,poly,&
      dir, ni, nj, nrx, nry, nrz, ev_l, ev_r, xw)
 
   USE Whisky_Scalars
+  USE Whisky_Eigenproblem
 
   implicit none
 
@@ -244,7 +245,7 @@ trivial_rp = .true.
                  D_UPW(rho), D_UPW(velx), D_UPW(vely), D_UPW(velz), &
                  D_UPW(eps), D_UPW(w_lorentz), lam, &
                  agxx, agxy, agxz, agyy, agyz, agzz, &
-                 uxx, det, D_UPW(alp), D_UPW(beta))
+                 uxx, D_UPW(alp), D_UPW(beta))
       l_ev_l(i)=lam(1)
       l_ev_r(i)=lam(5)
       xwind(i) = (lam(1) + lam(5)) / (abs(lam(1)) + abs(lam(5)))
diff --git a/src/Whisky_RoeSolver.F90 b/src/Whisky_RoeSolver.F90
index ec9570f..aaf31c2 100644
--- a/src/Whisky_RoeSolver.F90
+++ b/src/Whisky_RoeSolver.F90
@@ -32,6 +32,7 @@
 
 subroutine Whisky_RoeSolve(CCTK_ARGUMENTS)
   
+  USE Whisky_Eigenproblem
   implicit none
   DECLARE_CCTK_ARGUMENTS
   DECLARE_CCTK_PARAMETERS
@@ -236,7 +237,7 @@ subroutine Whisky_RoeSolve(CCTK_ARGUMENTS)
             call eigenproblem(whisky_eos_handle,rhoave, velxave, &
                  velyave, velzave, epsave, w_lorentzave, &
                  gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, &
-                 usendh,avg_det, avg_alp,avg_beta,qdiff(1),qdiff(2), &
+                 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
@@ -247,7 +248,7 @@ subroutine Whisky_RoeSolve(CCTK_ARGUMENTS)
             call eigenproblem(whisky_eos_handle,rhoave, velyave, &
                  velzave, velxave, epsave, w_lorentzave, &
                  gyyh,gyzh,gxyh,gzzh,gxzh,gxxh, &
-                 usendh,avg_det, avg_alp,avg_beta,qdiff(1),qdiff(3), &
+                 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
@@ -258,7 +259,7 @@ subroutine Whisky_RoeSolve(CCTK_ARGUMENTS)
             call eigenproblem(whisky_eos_handle,rhoave, velzave, &
                  velxave, velyave, epsave, w_lorentzave, &
                  gzzh,gxzh,gyzh,gxxh,gxyh,gyyh, &
-                 usendh,avg_det, avg_alp,avg_beta,qdiff(1),qdiff(4), &
+                 usendh, avg_alp,avg_beta,qdiff(1),qdiff(4), &
                  qdiff(2),qdiff(3),qdiff(5),roeflux(1),roeflux(4),&
                  roeflux(2),roeflux(3),roeflux(5))
           else
@@ -348,6 +349,7 @@ end subroutine Whisky_RoeSolve
 subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS)
   
   USE Whisky_Scalars
+  use Whisky_Eigenproblem
 
   implicit none
 
@@ -545,7 +547,7 @@ subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS)
                  prim_ave(1),prim_ave(2),prim_ave(3),prim_ave(4),prim_ave(5), &
                  prim_ave(6),cs2_ave,dpdeps_ave, &
                  gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, &
-                 usendh,avg_det,avg_alp,avg_beta, &
+                 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
@@ -553,7 +555,7 @@ subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS)
                  prim_ave(1),prim_ave(3),prim_ave(4),prim_ave(2),prim_ave(5), &
                  prim_ave(6),cs2_ave,dpdeps_ave, &
                  gyyh,gyzh,gxyh,gzzh,gxzh,gxxh, &
-                 usendh,avg_det,avg_alp,avg_beta, &
+                 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
@@ -561,7 +563,7 @@ subroutine Whisky_RoeSolveGeneral(CCTK_ARGUMENTS)
                  prim_ave(1),prim_ave(4),prim_ave(2),prim_ave(3),prim_ave(5), &
                  prim_ave(6),cs2_ave,dpdeps_ave, &
                  gzzh,gxzh,gyzh,gxxh,gxyh,gyyh, &
-                 usendh,avg_det,avg_alp,avg_beta, &
+                 usendh,avg_alp,avg_beta, &
                  qdiff(1),qdiff(4),qdiff(2),qdiff(3),qdiff(5), &
                  roeflux(1),roeflux(4),roeflux(2),roeflux(3),roeflux(5))
           else