eschnett/cactusamrex - Change S35YBBYVGDOD2QD7J24NYTKBFY4MINXCS6JECEPBKNVSQX5ONTFQC

CarpetX: loopcontrol: small cleanups

Created by Erik Schnetter on February 27, 2020

S35YBBYVGDOD2QD7J24NYTKBFY4MINXCS6JECEPBKNVSQX5ONTFQC

Dependencies

In channels

main

master

Change contents

Replacement in CarpetX/src/loopcontrol.h at line 8 [4.775]

B:BD[4.861] → [4.861:909]

// this must minic the GridDescBase in loop.hxx

[4.861]

[4.909]

// This file must mimic the GridDescBase in loop.hxx.

Replacement in CarpetX/src/loopcontrol.h at line 26 [4.775]

B:BD[4.1242] → [4.1242:1414]

// replicate looping constructs in loop.hxx as good as we can, given that there
// is only one CCTK_LOOP macro thta cannot distinguish between cell and vertex
// variables

[4.1242]

[4.1414]

// Replicate looping constructs in loop.hxx as good as we can, given that there
// is only one CCTK_LOOP macro that cannot distinguish between cell- and
// vertex-centred variables.

Replacement in CarpetX/src/loopcontrol.h at line 30 [4.775]

B:BD[4.1417] → [4.1417:1674]

// this is not quite the way LoopControl does it which would involve changing
// LC_LOOP3STROFF_NORMAL which no longer knows what it needs to loop over and
// is only given the imin/imax ranges that Cactus thinks are required but has
// no idea about tiles

[4.1417]

[4.1674]

// This is not quite the way LoopControl does it, which would involve changing
// LC_LOOP3STROFF_NORMAL, which no longer knows what it needs to loop over and
// is only given the imin/imax ranges that Cactus thinks are required, but has
// no idea about tiles.

Replacement in CarpetX/src/loopcontrol.h at line 35 [4.775]

B:BD[4.1675] → [4.1675:1737]

B:BD[4.1737] → [2.0:62]

∅:D[2.62] → [4.1799:2155]

B:BD[4.1799] → [4.1799:2155]

#define LC_LOOP3_BOX(name, i,j,k, grid, imin,imax, inormal) \
for (int d = 0; d < LC_DIM; ++d)                            \
  if (imin[d] >= imax[d])                                   \
    return;                                                 \
                                                            \
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) {

[4.1675]

[4.2155]

#define LC_LOOP3_BOX(name, i, j, k, grid, imin, imax, inormal)                 \
  do {                                                                         \
    for (int d = 0; d < LC_DIM; ++d)                                           \
      if (imin[d] >= imax[d])                                                  \
        return;                                                                \
                                                                               \
    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) {

Replacement in CarpetX/src/loopcontrol.h at line 45 [4.775]

B:BD[4.2156] → [4.2156:2344]

#define LC_ENDLOOP3_BOX(name)                               \
    }                                                       \
  }                                                         \
}

[4.2156]

[4.2344]

#define LC_ENDLOOP3_BOX(name)                                                  \
  }                                                                            \
  }                                                                            \
  }                                                                            \
  }                                                                            \
  while (0)

Replacement in CarpetX/src/loopcontrol.h at line 52 [4.775]
B:BD[4.2345] → [4.2345:2376]
```
/* Replace CCTK_LOOP macros */
```
[4.2345]
[4.2376]
```
// Replace CCTK_LOOP macros
```

Replacement in CarpetX/src/loopcontrol.h at line 62 [4.775]

∅:D[3.267] → [4.2597:2925]

B:BD[4.2597] → [4.2597:2925]

B:BD[4.2925] → [2.63:227]

∅:D[2.227] → [4.3007:3089]

B:BD[4.3007] → [4.3007:3089]

B:BD[4.3089] → [2.228:474]

∅:D[2.474] → [4.3335:3417]

B:BD[4.3335] → [4.3335:3417]

B:BD[4.3417] → [2.475:557]

∅:D[2.557] → [4.3417:3499]

B:BD[4.3417] → [4.3417:3499]

B:BD[4.3581] → [4.3581:3635]

#define CCTK_LOOP3_ALL(name, cctki3_cctkGH_, i,j,k)                             \
do {                                                                            \
  GridDescBase_t grid = LC_CreateGridDesc(cctki3_cctkGH_);                      \
  int imin[LC_DIM], imax[LC_DIM], inormal[LC_DIM];                              \
  const int offset[LC_DIM] = {1, 1, 1};                                         \
  for (int d = 0; d < LC_DIM; ++d) {                                            \
    imin[d] = grid.tmin[d];                                                     \
    imax[d] = grid.tmax[d] + (grid.tmax[d] >= grid.lsh[d] ? offset[d] : 0);     \
    if(imax[d] > grid.lsh[d] + offset[d]) {                                     \
      imax[d] = grid.lsh[d] + offset[d];                                        \
    }                                                                           \
    inormal[d] = 0;                                                             \
  }                                                                             \
  LC_LOOP3_BOX(name, i,j,k, grid, imin,imax, inormal)

[4.2597]

[4.3635]

#define CCTK_LOOP3_ALL(name, cctki3_cctkGH_, i, j, k)                          \
  do {                                                                         \
    const GridDescBase_t grid = LC_CreateGridDesc(cctki3_cctkGH_);             \
    int imin[LC_DIM] CCTK_ATTRIBUTE_UNUSED,                                    \
        imax[LC_DIM] CCTK_ATTRIBUTE_UNUSED,                                    \
        inormal[LC_DIM] CCTK_ATTRIBUTE_UNUSED;                                 \
    const int offset[LC_DIM] = {1, 1, 1};                                      \
    for (int d = 0; d < LC_DIM; ++d) {                                         \
      imin[d] = grid.tmin[d];                                                  \
      imax[d] = grid.tmax[d] + (grid.tmax[d] >= grid.lsh[d] ? offset[d] : 0);  \
      if (imax[d] > grid.lsh[d] + offset[d])                                   \
        imax[d] = grid.lsh[d] + offset[d];                                     \
      inormal[d] = 0;                                                          \
    }                                                                          \
    LC_LOOP3_BOX(name, i, j, k, grid, imin, imax, inormal) {

Replacement in CarpetX/src/loopcontrol.h at line 78 [4.775]

B:BD[4.3636] → [4.3636:3800]

B:BD[4.3800] → [2.558:569]

#define CCTK_ENDLOOP3_ALL(name)                                                 \
  LC_ENDLOOP3_BOX(name)                                                         \
} while(0)

[4.3636]

[4.3802]

#define CCTK_ENDLOOP3_ALL(name)                                                \
  }                                                                            \
  LC_ENDLOOP3_BOX(name);                                                       \
  }                                                                            \
  while (0)