From d2f76b11d9192edd5e82e3d17aa670802d8871e3 Mon Sep 17 00:00:00 2001 From: tradke Date: Mon, 7 Jul 2003 21:30:20 +0000 Subject: Get the input variable indices for the interpolator as INTEGER and then copy it into the CCTK_INT array. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinder/trunk@343 89daf98e-ef62-4674-b946-b8ff9de2216c --- src/AHFinder_dis.F | 20 +++++++++++++------- src/AHFinder_gau.F | 23 +++++++++++++++-------- src/AHFinder_int.F | 29 +++++++++++++++++++---------- 3 files changed, 47 insertions(+), 25 deletions(-) diff --git a/src/AHFinder_dis.F b/src/AHFinder_dis.F index 44faf91..01bb346 100644 --- a/src/AHFinder_dis.F +++ b/src/AHFinder_dis.F @@ -22,7 +22,7 @@ DECLARE_CCTK_FUNCTIONS integer i,l,m - integer np,npoints,ierror + integer np,npoints,vindex,ierror integer param_table_handle,interp_handle,coord_system_handle character(30) options_string character(128) operator @@ -514,12 +514,18 @@ interp_coords(2) = CCTK_PointerTo(ya) interp_coords(3) = CCTK_PointerTo(za) - call CCTK_VarIndex (in_array_indices(1), "admbase::gxx") - call CCTK_VarIndex (in_array_indices(2), "admbase::gyy") - call CCTK_VarIndex (in_array_indices(3), "admbase::gzz") - call CCTK_VarIndex (in_array_indices(4), "admbase::gxy") - call CCTK_VarIndex (in_array_indices(5), "admbase::gxz") - call CCTK_VarIndex (in_array_indices(6), "admbase::gyz") + call CCTK_VarIndex (vindex, "admbase::gxx") + in_array_indices(1) = vindex + call CCTK_VarIndex (vindex, "admbase::gyy") + in_array_indices(2) = vindex + call CCTK_VarIndex (vindex, "admbase::gzz") + in_array_indices(3) = vindex + call CCTK_VarIndex (vindex, "admbase::gxy") + in_array_indices(4) = vindex + call CCTK_VarIndex (vindex, "admbase::gxz") + in_array_indices(5) = vindex + call CCTK_VarIndex (vindex, "admbase::gyz") + in_array_indices(6) = vindex out_arrays(1) = CCTK_PointerTo(txx) out_arrays(2) = CCTK_PointerTo(tyy) diff --git a/src/AHFinder_gau.F b/src/AHFinder_gau.F index cbdb6d5..0e97711 100644 --- a/src/AHFinder_gau.F +++ b/src/AHFinder_gau.F @@ -31,7 +31,7 @@ logical firstcal(4) integer i,j,k,l,m,n,p - integer npoints + integer npoints,vindex integer param_table_handle,interp_handle,coord_system_handle,sum_handle integer ierror character(len=128) :: operator @@ -706,13 +706,20 @@ interp_coords(2) = CCTK_PointerTo(ya) interp_coords(3) = CCTK_PointerTo(za) - call CCTK_VarIndex (in_array_indices(1), "admbase::gxx") - call CCTK_VarIndex (in_array_indices(2), "admbase::gyy") - call CCTK_VarIndex (in_array_indices(3), "admbase::gzz") - call CCTK_VarIndex (in_array_indices(4), "admbase::gxy") - call CCTK_VarIndex (in_array_indices(5), "admbase::gxz") - call CCTK_VarIndex (in_array_indices(6), "admbase::gyz") - call CCTK_VarIndex (in_array_indices(7), "ahfinder::ahfgauss") + call CCTK_VarIndex (vindex, "admbase::gxx") + in_array_indices(1) = vindex + call CCTK_VarIndex (vindex, "admbase::gyy") + in_array_indices(2) = vindex + call CCTK_VarIndex (vindex, "admbase::gzz") + in_array_indices(3) = vindex + call CCTK_VarIndex (vindex, "admbase::gxy") + in_array_indices(4) = vindex + call CCTK_VarIndex (vindex, "admbase::gxz") + in_array_indices(5) = vindex + call CCTK_VarIndex (vindex, "admbase::gyz") + in_array_indices(6) = vindex + call CCTK_VarIndex (vindex, "ahfinder::ahfgauss") + in_array_indices(7) = vindex out_arrays(1) = CCTK_PointerTo(txx) out_arrays(2) = CCTK_PointerTo(tyy) diff --git a/src/AHFinder_int.F b/src/AHFinder_int.F index e3c9833..170a7ab 100644 --- a/src/AHFinder_int.F +++ b/src/AHFinder_int.F @@ -31,7 +31,7 @@ integer npt,npp integer l_ntheta,l_nphi,theta0,phi0 integer npoints - integer auxi + integer auxi,vindex integer ierror integer interp_handle,coord_system_handle @@ -641,15 +641,24 @@ interp_coords(2) = CCTK_PointerTo(ya) interp_coords(3) = CCTK_PointerTo(za) - call CCTK_VarIndex (in_array_indices(1), "admbase::gxx") - call CCTK_VarIndex (in_array_indices(2), "admbase::gyy") - call CCTK_VarIndex (in_array_indices(3), "admbase::gzz") - call CCTK_VarIndex (in_array_indices(4), "admbase::gxy") - call CCTK_VarIndex (in_array_indices(5), "admbase::gxz") - call CCTK_VarIndex (in_array_indices(6), "admbase::gyz") - call CCTK_VarIndex (in_array_indices(7), "ahfinder::ahf_exp") - call CCTK_VarIndex (in_array_indices(8), "ahfinder::ahmask") - call CCTK_VarIndex (in_array_indices(9), "ahfinder::ahfgradn") + call CCTK_VarIndex (vindex, "admbase::gxx") + in_array_indices(1) = vindex + call CCTK_VarIndex (vindex, "admbase::gyy") + in_array_indices(2) = vindex + call CCTK_VarIndex (vindex, "admbase::gzz") + in_array_indices(3) = vindex + call CCTK_VarIndex (vindex, "admbase::gxy") + in_array_indices(4) = vindex + call CCTK_VarIndex (vindex, "admbase::gxz") + in_array_indices(5) = vindex + call CCTK_VarIndex (vindex, "admbase::gyz") + in_array_indices(6) = vindex + call CCTK_VarIndex (vindex, "ahfinder::ahf_exp") + in_array_indices(7) = vindex + call CCTK_VarIndex (vindex, "ahfinder::ahmask") + in_array_indices(8) = vindex + call CCTK_VarIndex (vindex, "ahfinder::ahfgradn") + in_array_indices(9) = vindex out_arrays(1) = CCTK_PointerTo(txx) out_arrays(2) = CCTK_PointerTo(tyy) -- cgit v1.2.3