From cab5e105cd238e4f7cf02512e33083d6c1c44075 Mon Sep 17 00:00:00 2001 From: tradke Date: Wed, 19 Dec 2001 00:00:37 +0000 Subject: Fixed CCTK_INT<->int datatype problems which weren't liked by the T3E compiler. git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGHSlab/trunk@69 10716dce-81a3-4424-a2c8-48026a0d3035 --- src/Hyperslab.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Hyperslab.c b/src/Hyperslab.c index dd5f840..5812c1a 100644 --- a/src/Hyperslab.c +++ b/src/Hyperslab.c @@ -771,6 +771,8 @@ int Hyperslab_GetHyperslab (const cGH *GH, if (errormsg && ! strcmp (errormsg, "Given normal vector isn't axis-parallel")) { int mapping; + CCTK_INT my_directions[3], my_global_origin[3]; + CCTK_INT my_extents[1], my_downsample_[1], my_hsize[1]; if (hdim != 1 || vinfo.dim != 3) @@ -780,10 +782,23 @@ int Hyperslab_GetHyperslab (const cGH *GH, return (-1); } - mapping = Hyperslab_DefineGlobalMappingByIndex (GH, vindex, 1, directions, - global_origin, extents, - downsample_, -1, - target_proc, NULL, hsize); + /* need to convert this into CCTK_INT vectors */ + my_directions[0] = directions[0]; + my_directions[1] = directions[1]; + my_directions[2] = directions[2]; + my_global_origin[0] = global_origin[0]; + my_global_origin[1] = global_origin[1]; + my_global_origin[2] = global_origin[2]; + my_extents[0] = extents[0]; + my_downsample_[0] = downsample_[0]; + + mapping = Hyperslab_DefineGlobalMappingByIndex (GH, vindex, 1,my_directions, + my_global_origin,my_extents, + my_downsample_, -1, + target_proc, NULL,my_hsize); + /* convert result back into int */ + hsize[0] = my_hsize[0]; + if (mapping < 0) { CCTK_WARN (1, "Failed to define hyperslab mapping for 3D diagonal"); -- cgit v1.2.3