From 0ca78bf54c8503f881fc496c748b9f03a12abf02 Mon Sep 17 00:00:00 2001 From: eschnett Date: Mon, 16 May 2011 01:48:37 +0000 Subject: Correct loopcontrol arguments git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Slab/trunk@78 2e825fa2-fb71-486d-8b7f-a5ff3f0f6cb8 --- src/slab.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/slab.cc b/src/slab.cc index c032af8..4fdf9c8 100644 --- a/src/slab.cc +++ b/src/slab.cc @@ -820,7 +820,7 @@ copy_data (const vector &info, # pragma omp parallel CCTK_LOOP3(Slab_copy_in_noxpose, i,j,k, 0,0,0, srcdetailleni,srcdetaillenj,srcdetaillenk, - srcleni,srcleni*srclenj,srcleni*srclenj*srclenk) + srcleni,srclenj,srclenk) { int const srcindi = srcdetailoffi + i - srcoffi; int const srcindj = srcdetailoffj + j - srcoffj; @@ -844,7 +844,7 @@ copy_data (const vector &info, // Interchange i and j loops CCTK_LOOP3(Slab_copy_in_xposexy, j,i,k, 0,0,0, srcdetaillenj,srcdetailleni,srcdetaillenk, - srcleni,srcleni*srclenj,srcleni*srclenj*srclenk) + srclenj,srcleni,srclenk) { int const srcindi = srcdetailoffi + i - srcoffi; int const srcindj = srcdetailoffj + j - srcoffj; @@ -867,7 +867,7 @@ copy_data (const vector &info, # pragma omp parallel CCTK_LOOP3(Slab_copy_in_xposegeneral, i,j,k, 0,0,0, srcdetailleni,srcdetaillenj,srcdetaillenk, - srcleni,srcleni*srclenj,srcleni*srclenj*srclenk) + srcleni,srclenj,srclenk) { int ipos[SLAB_MAXDIM]; ipos[0] = i; @@ -942,7 +942,7 @@ copy_data_back (const vector &info, # pragma omp parallel CCTK_LOOP3(Slab_copy_back_noflip, i,j,k, 0,0,0, dstdetailleni,dstdetaillenj,dstdetaillenk, - dstleni,dstleni*dstlenj,dstleni*dstlenj*dstlenk) + dstleni,dstlenj,dstlenk) { int const dstindi = dstdetailoffi + i - dstoffi; int const dstindj = dstdetailoffj + j - dstoffj; @@ -965,7 +965,7 @@ copy_data_back (const vector &info, # pragma omp parallel CCTK_LOOP3(Slab_copy_back_flipx, i,j,k, 0,0,0, dstdetailleni,dstdetaillenj,dstdetaillenk, - dstleni,dstleni*dstlenj,dstleni*dstlenj*dstlenk) + dstleni,dstlenj,dstlenk) { int const dstindi = dstdetailoffi + (dstdetailleni - 1 - i) - dstoffi; int const dstindj = dstdetailoffj + j - dstoffj; @@ -988,7 +988,7 @@ copy_data_back (const vector &info, # pragma omp parallel CCTK_LOOP3(Slab_copy_back_flipy, i,j,k, 0,0,0, dstdetailleni,dstdetaillenj,dstdetaillenk, - dstleni,dstleni*dstlenj,dstleni*dstlenj*dstlenk) + dstleni,dstlenj,dstlenk) { int const dstindi = dstdetailoffi + i - dstoffi; int const dstindj = dstdetailoffj + (dstdetaillenj - 1 - j) - dstoffj; @@ -1011,7 +1011,7 @@ copy_data_back (const vector &info, # pragma omp parallel CCTK_LOOP3(Slab_copy_back_flipxy, i,j,k, 0,0,0, dstdetailleni,dstdetaillenj,dstdetaillenk, - dstleni,dstleni*dstlenj,dstleni*dstlenj*dstlenk) + dstleni,dstlenj,dstlenk) { int const dstindi = dstdetailoffi + (dstdetailleni - 1 - i) - dstoffi; int const dstindj = dstdetailoffj + (dstdetaillenj - 1 - j) - dstoffj; @@ -1034,7 +1034,7 @@ copy_data_back (const vector &info, # pragma omp parallel CCTK_LOOP3(Slab_copy_back_flipgeneral, i,j,k, 0,0,0, dstdetailleni,dstdetaillenj,dstdetaillenk, - dstleni,dstleni*dstlenj,dstleni*dstlenj*dstlenk) + dstleni,dstlenj,dstlenk) { int const dstindi = dstdetailoffi + (flip_x ? dstdetailleni - 1 - i : i) - dstoffi; -- cgit v1.2.3