some fixes here and there

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

4 files changed, 3 insertions, 8 deletions

diff --git a/interface.ccl b/interface.ccl
index 48a5456..29c56be 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -81,4 +81,4 @@ CCTK_REAL simple_wave_output TYPE=GF TIMELEVELS=1 tags='checkpoint="no"'
 
 private:
 
-int whisky_init_data_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level Whisky is working on right now"
+CCTK_INT whisky_init_data_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level Whisky is working on right now"
diff --git a/param.ccl b/param.ccl
index bf3e928..64a8aad 100644
--- a/param.ccl
+++ b/param.ccl
@@ -94,7 +94,6 @@ USES real whisky_perc_ptol ""
 USES real whisky_del_ptol ""
 USES string whisky_eos_type ""
 USES string whisky_eos_table ""
-USES string tvd_limiter ""
 USES real rho_abs_min
 USES real rho_rel_min
 USES REAL initial_rho_abs_min
diff --git a/src/Whisky_Con2Prim.F90 b/src/Whisky_Con2Prim.F90
index b067738..626b02d 100644
--- a/src/Whisky_Con2Prim.F90
+++ b/src/Whisky_Con2Prim.F90
@@ -51,7 +51,7 @@ subroutine Whisky_con2primtest(CCTK_ARGUMENTS)
   CCTK_REAL pmin, epsmin
   CCTK_INT C2P_failed
   logical epsnegative
-  
+
 #ifdef _EOS_BASE_INC_
 #undef _EOS_BASE_INC_
 #endif
diff --git a/src/Whisky_ReconstructTest.F90 b/src/Whisky_ReconstructTest.F90
index 9bc8e66..3302748 100644
--- a/src/Whisky_ReconstructTest.F90
+++ b/src/Whisky_ReconstructTest.F90
@@ -36,12 +36,8 @@ subroutine Whisky_reconstruction_test(CCTK_ARGUMENTS)
   
   integer i, j, k, nx, ny, nz, ierr
 
-  CCTK_INT, dimension(3) :: excision_descriptors
   logical, dimension(:,:,:), allocatable :: trivial_rp
 
-  excision_descriptors(1)=-1
-  excision_descriptors(2)=-1
-  excision_descriptors(3)=-1
   allocate(trivial_rp(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)),STAT=ierr)
   if (ierr .ne. 0) then
     call CCTK_WARN(0, "Allocation problems with trivial_rp")
@@ -69,7 +65,7 @@ subroutine Whisky_reconstruction_test(CCTK_ARGUMENTS)
   end do
   
   call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
-       rho, rhoplus, rhominus, trivial_rp, space_mask, excision_descriptors)
+       rho, rhoplus, rhominus, trivial_rp, hydro_excision_mask)
   deallocate(trivial_rp)
   
   open(unit=11,file='original.dat',status='unknown')