diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-10-01 17:25:25 -0500 |
---|---|---|
committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-10-01 17:25:25 -0500 |
commit | 8fcf7d4dad24185d7a59426281557933d7e718b9 (patch) | |
tree | 9019e09009e165091a2ee5ab52c05dd2dc6fce07 /Carpet/CarpetReduce/src/mask_init.c | |
parent | 28bdc89b87b8e6f64c747034c46b1414dcaba224 (diff) |
CarpetReduce: Use LoopControl
Diffstat (limited to 'Carpet/CarpetReduce/src/mask_init.c')
-rw-r--r-- | Carpet/CarpetReduce/src/mask_init.c | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/Carpet/CarpetReduce/src/mask_init.c b/Carpet/CarpetReduce/src/mask_init.c index 129f95dcc..c1545a4fe 100644 --- a/Carpet/CarpetReduce/src/mask_init.c +++ b/Carpet/CarpetReduce/src/mask_init.c @@ -4,6 +4,8 @@ #include <util_Table.h> +#include <loopcontrol.h> + void @@ -29,17 +31,17 @@ MaskBase_InitMask (CCTK_ARGUMENTS) CCTK_INFO ("Initialising to weight 1"); } -#pragma omp parallel for - for (int k=0; k<cctk_lsh[2]; ++k) { - for (int j=0; j<cctk_lsh[1]; ++j) { - for (int i=0; i<cctk_lsh[0]; ++i) { - - int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); - weight[ind] = 1.0; - - } - } - } +#pragma omp parallel + LC_LOOP3(MaskBase_InitMask_interior, + i,j,k, + 0,0,0, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2], + cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) + { + + int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); + weight[ind] = 1.0; + + } LC_ENDLOOP3(MaskBase_InitMask_interior); @@ -69,17 +71,17 @@ MaskBase_InitMask (CCTK_ARGUMENTS) } /* Loop over the boundary slab */ -#pragma omp parallel for - for (int k=imin[2]; k<imax[2]; ++k) { - for (int j=imin[1]; j<imax[1]; ++j) { - for (int i=imin[0]; i<imax[0]; ++i) { - - int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); - weight[ind] = 0.0; - - } - } - } +#pragma omp parallel + LC_LOOP3(MaskBase_InitMask_ghosts, + i,j,k, + imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], + cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) + { + + int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); + weight[ind] = 0.0; + + } LC_ENDLOOP3(MaskBase_InitMask_ghosts); } } @@ -138,17 +140,17 @@ MaskBase_InitMask (CCTK_ARGUMENTS) } /* Loop over the boundary slab */ -#pragma omp parallel for - for (int k=imin[2]; k<imax[2]; ++k) { - for (int j=imin[1]; j<imax[1]; ++j) { - for (int i=imin[0]; i<imax[0]; ++i) { - - int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); - weight[ind] = 0.0; - - } - } - } +#pragma omp parallel + LC_LOOP3(MaskBase_InitMask_boundary, + i,j,k, + imin[0],imin[1],imin[2], imax[0],imax[1],imax[2], + cctk_lsh[0],cctk_lsh[1],cctk_lsh[2]) + { + + int const ind = CCTK_GFINDEX3D (cctkGH, i, j, k); + weight[ind] = 0.0; + + } LC_ENDLOOP3(MaskBase_InitMask_boundary); } } |