* modify reconstruction:

  * get rid of nonsensical re-computation of the conserved tracer
  * remove support for shift_state = 0 and get rid of unnecessary 
    assignments.




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

1 files changed, 5 insertions, 24 deletions

diff --git a/src/GRHydro_ENOReconstruct_drv.F90 b/src/GRHydro_ENOReconstruct_drv.F90
index 65ff19c..0fcf71f 100644
--- a/src/GRHydro_ENOReconstruct_drv.F90
+++ b/src/GRHydro_ENOReconstruct_drv.F90
@@ -1,7 +1,7 @@
  /*@@
    @file      GRHydro_ENOReconstruct_drv.F90
    @date      Tue Jul 19 13:22:03 EDT 2011
-   @author    Bruno C. Mundim, Joshua Faber
+   @author    Bruno C. Mundim, Joshua Faber, Christian D. Ott
    @desc 
    Driver routine to perform the ENO reconstruction.
    @enddesc 
@@ -31,7 +31,7 @@
  /*@@
    @routine    GRHydro_ENOReconstruct_drv
    @date       Tue Jul 19 13:24:34 EDT 2011
-   @author     Luca Baiotti, Ian Hawke, Bruno C. Mundim, Joshua Faber
+   @author     Luca Baiotti, Ian Hawke, Bruno C. Mundim, Joshua Faber, Christian D. Ott
    @desc 
    A driver routine to do ENO reconstruction. 
    @enddesc 
@@ -54,16 +54,13 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
   integer :: nx, ny, nz, i, j, k, itracer
 
   logical, dimension(:,:,:), allocatable :: trivial_rp
-!!$  logical, dimension(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)) :: trivial_rp
 
   CCTK_INT :: type_bitsx, trivialx, not_trivialx, &
        &type_bitsy, trivialy, not_trivialy, &
        &type_bitsz, trivialz, not_trivialz
 
   CCTK_REAL, dimension(:,:,:),allocatable :: &
-       &psi4, lbetax, lbetay, lbetaz, dum, dump, dumm
-!!$  CCTK_REAL, dimension(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)) :: &
-!!$       &psi4, lbetax, lbetay, lbetaz
+       &dum, dump, dumm
 
   CCTK_INT :: ierr
 
@@ -73,16 +70,12 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
   end if
   
 !!$ The dum variables are used as dummies if MHD on but divergence cleaning off
-  allocate(psi4(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),&
-       lbetax(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),&
-       lbetay(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),&
-       lbetaz(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),&
-       dum(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),&
+  allocate(dum(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),&
        dump(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),&
        dumm(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),STAT=ierr)
 
   if (ierr .ne. 0) then
-    call CCTK_WARN(0, "Allocation problems with lbeta")
+    call CCTK_WARN(0, "Allocation problems with dum dump dumm")
   end if
   
   call SpaceMask_GetTypeBits(type_bitsx, "Hydro_RiemannProblemX")
@@ -112,7 +105,6 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
      do j=1,cctk_lsh(2)
         do i=1,cctk_lsh(1)
            trivial_rp(i,j,k) = .false.
-           psi4(i,j,k) = 1.0d0
            rhoplus(i,j,k) = 0.0d0
            rhominus(i,j,k)= 0.0d0
            epsplus(i,j,k) = 0.0d0
@@ -147,16 +139,6 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
               Y_e_minus(i,j,k) = 0.0d0
            endif
 
-           if (shift_state .ne. 0) then
-             lbetax(i,j,k) = betax(i,j,k)
-             lbetay(i,j,k) = betay(i,j,k)
-             lbetaz(i,j,k) = betaz(i,j,k)
-           else
-             lbetax(i,j,k) = 0.d0
-             lbetay(i,j,k) = 0.d0
-             lbetaz(i,j,k) = 0.d0
-           end if
-
         enddo
      enddo
   enddo
@@ -425,7 +407,6 @@ subroutine GRHydro_ENOReconstruct_drv(CCTK_ARGUMENTS)
 !!$ ENO ends.
 
   deallocate(trivial_rp)
-  deallocate(psi4, lbetax, lbetay, lbetaz)
   deallocate(dum,dump,dumm)
 
 end subroutine GRHydro_ENOReconstruct_drv