For new interp.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDAxiOddBrillBH/trunk@28 b6f3ac56-194f-0410-8878-cdf6079d7f1b

3 files changed, 28 insertions, 8 deletions

diff --git a/param.ccl b/param.ccl
index d93f448..b4932b3 100644
--- a/param.ccl
+++ b/param.ccl
@@ -63,3 +63,7 @@ BOOLEAN verbose ""
 {
 } "yes"
 
+INT interpolation_order "Order for interpolation" STEERABLE = ALWAYS
+{
+  1:3 :: "Choose between first, second, and third-order"
+} 1
diff --git a/src/IDAxiOddBrillBH.F b/src/IDAxiOddBrillBH.F
index 2c8dd75..141e904 100644
--- a/src/IDAxiOddBrillBH.F
+++ b/src/IDAxiOddBrillBH.F
@@ -382,17 +382,33 @@ c     Compute eta,q,phi at the each points of cartesian grid
          enddo
       enddo
 
-      call CCTK_InterpHandle (handle, "simple_local")
      
 c     Find the local origin of the spatial coordinates
 c     ------------------------------------------------
 
       npoints = nx*ny*nz
+
+c     Interpolator handle.
+
+      handle = -1
+
+      if (interpolation_order .eq. 1) then
+        call CCTK_InterpHandle (handle, "first-order uniform cartesian")
+      else if (interpolation_order .eq. 2) then
+        call CCTK_InterpHandle (handle, "second-order uniform cartesian")
+      else if (interpolation_order .eq. 3) then
+        call CCTK_InterpHandle (handle, "third-order uniform cartesian")
+      endif
+
+      if (handle .lt. 0) then
+        call CCTK_WARN (0, "Couldn't get handle for interpolation operator")
+      endif
       
-      call CCTK_Interp (ierror,cctkGH,handle,npoints,2,6,6,
-     $     ne,nq,abseta,q,
+      call CCTK_InterpLocal  (ierror,cctkGH,handle,npoints,2,6,6,
+     $     ne,nq,etagrd,qgrd,
+     $     CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,
+     $     abseta,q,
      $     CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,
-     $     etagrd(1),qgrd(1),deta,dq,
      $     psi2dv,detapsisph,dqpsisph,detaetapsisph,detaqpsisph,
      $     dqqpsisph,
      $     CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,CCTK_VARIABLE_REAL,
diff --git a/test/test_axioddbh.par b/test/test_axioddbh.par
index 49a067b..47e02e6 100755
--- a/test/test_axioddbh.par
+++ b/test/test_axioddbh.par
@@ -2,7 +2,7 @@
 #!DESC "Initial data for axisymmetric distored black hole"
 ######################################################################
 
-ActiveThorns = "time ADMconstraints pugh pughreduce pughslab interp cartgrid3d einstein ADM IDAxiOddBrillBH ioascii iobasic ioutil"
+ActiveThorns = "time ADMconstraints pugh pughreduce pughslab pughinterp cartgrid3d einstein ADM IDAxiOddBrillBH ioascii iobasic ioutil"
 
 # GENERAL 
 
@@ -35,9 +35,9 @@ axiodd::sigma    = 1.0
 axiodd::byJ      = 0.0
 axiodd::n        = 5
 axiodd::etamax   = 6.0
-axiodd::neta     = 302
-axiodd::ntheta   = 54
-interp::order    = 2
+axiodd::neta     = 102
+axiodd::ntheta   = 27
+axiodd::interpolatioin_order = 1
 
 # GAUGE
 einstein::slicing    = "geodesic"