Fixing some coord stuff

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/Extract/trunk@22 5301f0c2-dbc4-4cee-b2f5-8d7afba4d129

4 files changed, 22 insertions, 21 deletions

diff --git a/par/Extract.par b/par/Extract.par
index 2364079..e0c2337 100644
--- a/par/Extract.par
+++ b/par/Extract.par
@@ -2,9 +2,9 @@
 # Extract.par:   Extracts from Schwarzschild Black Hole
 #################################################################
 
-ActiveThorns = "pugh adm iobasic cartgrid3d time einstein interp extract idanalyticbh"
+ActiveThorns = "pugh pughslab adm ioutil iobasic cartgrid3d time einstein interp extract idanalyticbh"
 
-io::outdir = "gab"
+io::outdir = "Extract"
 driver::global_nx = 30
 driver::global_ny = 30
 driver::global_nz = 30
diff --git a/src/D3_extract.F b/src/D3_extract.F
index 854ae1d..e2b9980 100644
--- a/src/D3_extract.F
+++ b/src/D3_extract.F
@@ -172,8 +172,6 @@ c     ------------------------------------------------------------------
 
       if (myproc .eq. 0) then 
 
-         print *,psis(5,5)
-
 c     ------------------------------------------------------------------
 c
 c     3. Transform tensor components to polar coordinates on 2-surface
diff --git a/src/D3_to_D2.F b/src/D3_to_D2.F
index 377c453..7d49d0a 100644
--- a/src/D3_to_D2.F
+++ b/src/D3_to_D2.F
@@ -116,9 +116,9 @@ c     -----------------------
 
 c     Find the local origin of the spatial coordinates
 c     ------------------------------------------------
-      call CCTK_CoordLocalRange(ierror,cctkGH,xmin,xmax,"x")
-      call CCTK_CoordLocalRange(ierror,cctkGH,ymin,ymax,"y")
-      call CCTK_CoordLocalRange(ierror,cctkGH,zmin,zmax,"z")
+      call CCTK_CoordLocalRange(ierror,cctkGH,xmin,xmax,-1,"x","cart3d")
+      call CCTK_CoordLocalRange(ierror,cctkGH,ymin,ymax,-1,"y","cart3d")
+      call CCTK_CoordLocalRange(ierror,cctkGH,zmin,zmax,-1,"z","cart3d")
 
 
 c     Project un-physical metric and conformal factor  onto sphere
diff --git a/test/test_extract_par b/test/test_extract_par
index d930492..30f6531 100644
--- a/test/test_extract_par
+++ b/test/test_extract_par
@@ -1,7 +1,8 @@
 # DESC "Extract waveforms from BH"
 
 
-ActiveThorns = "cartgrid3d time idanalyticBH pugh Extract Einstein interp ioutil"
+ActiveThorns = "cartgrid3d time idanalyticBH adm pughslab pugh Extract Einstein interp ioutil"
+
 
 driver::global_nx = 15
 driver::global_ny = 15
@@ -16,27 +17,29 @@ time::dtfac = 0.2
 cactus::cctk_itlast = 5   
 IO::out_every       = 1      
 
+einstein::evolution_system="adm"
 einstein::initial_data           = "schwarzschild" 
+einstein::slicing = "geodesic"
 idanalyticbh::mass	        = 1 
 
-io::outdir          = "./test_Extract"
+io::outdir          = "test_Extract"
 
 ### Extraction parameters
 
 interp::order = 2
 
-extract::Extract_num_detectors = 2
-extract::Extract_itout         = 1
+extract::num_detectors = 2
+extract::itout         = 1
 
-extract::Extract_Nt        = 100
-extract::Extract_Np        = 100
-extract::Extract_origin_x  = 0.
-extract::Extract_origin_y  = 0.
-extract::Extract_origin_z  = 0.
+extract::Nt        = 100
+extract::Np        = 100
+extract::origin_x  = 0.
+extract::origin_y  = 0.
+extract::origin_z  = 0.
 
-extract::Extract_all_modes  = "yes"
-extract::Extract_l_mode     = 4 
-extract::Extract_m_mode     = 0 
+extract::all_modes  = "yes"
+extract::l_mode     = 4 
+extract::m_mode     = 0 
 
-extract::Extract_detector1 = 2.5 
-extract::Extract_detector2 = 3.0
+extract::detector1 = 2.5 
+extract::detector2 = 3.0