From f097b0d44bae95b86e1c5640792b066d3fbbfde2 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@850bcc8b-0e4f-0410-8c26-8d28fbf1eda9>
Date: Sun, 20 Jan 2013 22:08:39 +0000
Subject: Use cctk_ash instead of cctk_lsh where necessary

git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Dissipation/trunk@55 850bcc8b-0e4f-0410-8c26-8d28fbf1eda9
---
 src/basegrid.c     |  2 +-
 src/setup_epsdis.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/basegrid.c b/src/basegrid.c
index ad54931..66add65 100644
--- a/src/basegrid.c
+++ b/src/basegrid.c
@@ -20,7 +20,7 @@ void dissipation_basegrid (CCTK_ARGUMENTS)
     }
   }
 
-  for (d=0;d<cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2];d++) {
+  for (d=0;d<cctk_ash[0]*cctk_ash[1]*cctk_ash[2];d++) {
     epsdisA[d]=epsdis;
   }
 }
diff --git a/src/setup_epsdis.c b/src/setup_epsdis.c
index 8703c63..7afce0d 100644
--- a/src/setup_epsdis.c
+++ b/src/setup_epsdis.c
@@ -14,7 +14,7 @@
 #include "util_Table.h"
 
 #define MAXDIM 3
-#define REFLEVEL ((int)(0.1 + log10((CCTK_REAL)(cctk_levfac[0]))/log10(2.0)))
+#define REFLEVEL (ilogb(cctk_levfac[0]))
 
 void
 setup_epsdis (CCTK_ARGUMENTS)
@@ -22,6 +22,7 @@ setup_epsdis (CCTK_ARGUMENTS)
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
 
+  int ai,aj,ak;
   int ni,nj,nk;
   int i,j,k,s,l,m;
   int index,indexP;
@@ -43,15 +44,18 @@ setup_epsdis (CCTK_ARGUMENTS)
                (double)cctk_time);
   }
 
+  ai=cctk_ash[0];
+  aj=cctk_ash[1];
+  ak=cctk_ash[2];
   ni=cctk_lsh[0];
   nj=cctk_lsh[1];
   nk=cctk_lsh[2];
 
   if (epsdis_for_level[reflvl] > 0.0)
-    for (i=0; i<ni*nj*nk; ++i)
+    for (i=0; i<ai*aj*ak; ++i)
       epsdisA[i] = epsdis_for_level[reflvl];
   else
-    for (i=0;i<ni*nj*nk;i++)
+    for (i=0;i<ai*aj*ak;i++)
       epsdisA[i]=epsdis;
 
   if (extra_dissipation_at_outerbound) 
-- 
cgit v1.2.3