eschnett/cactusamrex - Change AEVGZIZEUIC52MCK3J4V547YEV2R4YQL3JUJW7FSP4R34PSZ43DAC

Handle grid function pointers in driver

Created by Erik Schnetter on July 12, 2019

AEVGZIZEUIC52MCK3J4V547YEV2R4YQL3JUJW7FSP4R34PSZ43DAC

Dependencies

In channels

main

master

Change contents

Deletion in AMReX/src/AMReX.hxx at line 14 [3.15275]
B:BD[3.15516] → [4.1274:1292]
```
#include <vector>
```
Insertion in AMReX/src/AMReX.hxx at line 36 [3.15275]
[3.15872]
[3.15872]
```
  // TODO: use StateData
```
Deletion in AMReX/src/AMReX.hxx at line 42 [3.15275]
B:BD[4.1362] → [4.1362:1424]
∅:D[4.1424] → [3.15908:15909]
B:BD[3.15908] → [3.15908:15909]
```
// This needs to go away again!
extern vector<MFIter *> mfis;
```
Deletion in AMReX/src/driver.cxx at line 28 [3.15972]
B:BD[3.16267] → [5.74:75]
B:BD[5.75] → [4.77:100]
```
vector<MFIter *> mfis;
```

Insertion in AMReX/src/schedule.cxx at line 87 [2.531]

[2.3011]

  for (int d = 0; d < dim; ++d)
    cctkGH->cctk_levfac[d] = undefined;
  for (int d = 0; d < dim; ++d)
    cctkGH->cctk_levoff[d] = undefined;
  for (int d = 0; d < dim; ++d)
    cctkGH->cctk_levoffdenom[d] = 0;

Replacement in AMReX/src/schedule.cxx at line 97 [2.531]

B:BD[2.3116] → [2.3116:3311]

  const Box &fbx = mfi.fabbox();   // allocated array
  const Box &vbx = mfi.validbox(); // interior region (without ghosts)
  const Box &bx = mfi.tilebox();   // current region (without ghosts)

[2.3116]

[2.3311]

  const Box &fbx = mfi.fabbox(); // allocated array
  // const Box &vbx = mfi.validbox();     // interior region (without ghosts)
  const Box &bx = mfi.tilebox();       // current region (without ghosts)
  const Box &gbx = mfi.growntilebox(); // current region (with ghosts)

Replacement in AMReX/src/schedule.cxx at line 104 [2.531]

B:BD[2.3361] → [2.3361:3424]

    cctkGH->cctk_lsh[d] = bx[orient(d, 1)] - bx[orient(d, 0)];

[2.3361]

[2.3424]

    cctkGH->cctk_lsh[d] = bx[orient(d, 1)] - bx[orient(d, 0)] + 1;

Replacement in AMReX/src/schedule.cxx at line 108 [2.531]

B:BD[2.3478] → [2.3478:3543]

    cctkGH->cctk_ash[d] = fbx[orient(d, 1)] - fbx[orient(d, 0)];

[2.3478]

[2.3543]

    cctkGH->cctk_ash[d] = fbx[orient(d, 1)] - fbx[orient(d, 0)] + 1;

Replacement in AMReX/src/schedule.cxx at line 119 [2.531]

B:BD[2.3797] → [2.3797:3873]

      cctkGH->cctk_bbox[2 * d + f] = bx[orient(d, f)] == vbx[orient(d, f)];

[2.3797]

[2.3873]

      cctkGH->cctk_bbox[2 * d + f] = bx[orient(d, f)] != gbx[orient(d, f)];
  // Grid function pointers
  const Dim3 imin = lbound(bx);
  const Array4<CCTK_REAL> &vars = ghext->mfab.array(mfi);
  for (int vi = 0; vi < 4; ++vi)
    cctkGH->data[vi][0] = vars.ptr(imin.x, imin.y, imin.z, vi);

Insertion in AMReX/src/schedule.cxx at line 132 [2.531]

[2.4059]

  for (int d = 0; d < dim; ++d)
    cctkGH->cctk_lbnd[d] = undefined;
  for (int d = 0; d < dim; ++d)
    cctkGH->cctk_ubnd[d] = undefined;
  for (int d = 0; d < dim; ++d)
    for (int f = 0; f < 2; ++f)
      cctkGH->cctk_bbox[2 * d + f] = undefined;
  int nvars = CCTK_NumVars();
  for (int vi = 0; vi < nvars; ++vi)
    cctkGH->data[vi][0] = nullptr;

Deletion in AMReX/src/schedule.cxx at line 181 [2.531]
B:BD[2.5189] → [2.5189:5238]
```
    mfis.resize(omp_get_max_threads(), nullptr);
```
Deletion in AMReX/src/schedule.cxx at line 185 [2.531]
B:BD[2.5425] → [2.5425:5469]
```
      mfis.at(omp_get_thread_num()) = &mfi;
```

Insertion in AMReX/src/schedule.cxx at line 186 [2.531]

[2.5506]

      // CCTK_VINFO("gsh=[%d,%d,%d]", cctkGH->cctk_gsh[0], cctkGH->cctk_gsh[1],
      //            cctkGH->cctk_gsh[2]);
      // CCTK_VINFO("ash=[%d,%d,%d]", cctkGH->cctk_ash[0], cctkGH->cctk_ash[1],
      //            cctkGH->cctk_ash[2]);
      // CCTK_VINFO("lbnd=[%d,%d,%d]", cctkGH->cctk_lbnd[0], cctkGH->cctk_lbnd[1],
      //            cctkGH->cctk_lbnd[2]);
      // CCTK_VINFO("lsh=[%d,%d,%d]", cctkGH->cctk_lsh[0], cctkGH->cctk_lsh[1],
      //            cctkGH->cctk_lsh[2]);
      // CCTK_VINFO("nghostzones=[%d,%d,%d]", cctkGH->cctk_nghostzones[0],
      //            cctkGH->cctk_nghostzones[1], cctkGH->cctk_nghostzones[2]);

Deletion in AMReX/src/schedule.cxx at line 198 [2.531]
B:BD[2.5564] → [2.5564:5582]
```
    mfis.clear();
```
Replacement in AMReX/src/schedule.cxx at line 204 [2.531]
B:BD[2.5695] → [2.5695:5721]
```
    // Call function once
```
[2.5695]
[2.5721]
```
    // Call function just once
```

Replacement in WaveToyAMReX/interface.ccl at line 14 [3.10196]

B:BD[4.1617] → [4.1617:1716]

# CCTK_REAL phi TYPE=gf
# {
#   phi
#   phi_p
#   phi_p_p
# } "Scalar potential for wave equation"

[4.1617]

CCTK_REAL phi TYPE=gf
{
  phi
  phi_p
  phi_p_p
  err
} "Scalar potential for wave equation"

Insertion in WaveToyAMReX/src/wavetoy.cxx at line 17 [3.37]
[3.297]
[3.297]
```
constexpr int dim = 3;
```
Replacement in WaveToyAMReX/src/wavetoy.cxx at line 30 [3.37]
B:BD[3.632] → [3.632:660]
```
  T Lx = 4, Ly = 4, Lz = 4;
```
[3.632]
[3.660]
```
  T Lx = 2, Ly = 2, Lz = 2;
```
Replacement in WaveToyAMReX/src/wavetoy.cxx at line 44 [3.37]
B:BD[4.2346] → [4.2346:2378]
```
  for (int d = 0; d < 3; ++d) {
```
[4.2346]
[4.2378]
```
  for (int d = 0; d < dim; ++d) {
```

Insertion in WaveToyAMReX/src/wavetoy.cxx at line 49 [3.37]

[4.2525]

  CCTK_VINFO("x0=[%g,%g,%g]", cctkGH->cctk_origin_space[0],
             cctkGH->cctk_origin_space[1], cctkGH->cctk_origin_space[2]);
  CCTK_VINFO("dx=[%g,%g,%g]", cctkGH->cctk_delta_space[0],
             cctkGH->cctk_delta_space[1], cctkGH->cctk_delta_space[2]);
  CCTK_REAL mindx = 1.0 / 0.0;
  for (int d = 0; d < dim; ++d)
    mindx = fmin(mindx, cctkGH->cctk_delta_space[d]);

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 59 [3.37]

B:BD[4.2553] → [4.2553:2602]

  cctkGH->cctk_delta_time = 0.5 / ghext->ncells;

[4.2553]

[4.2602]

  cctkGH->cctk_delta_time = 0.5 * mindx;
  CCTK_VINFO("t=%g", cctkGH->cctk_time);
  CCTK_VINFO("dt=%g", cctkGH->cctk_delta_time);

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 68 [3.37]
B:BD[3.3929] → [4.2606:2640]
```
  const CCTK_REAL t0 = cctk_time;
```
[3.3929]
[4.2640]
```
  const CCTK_REAL t = cctk_time;
```

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 70 [3.37]

∅:D[4.2680] → [3.4072:4195]

B:BD[3.4072] → [3.4072:4195]

B:BD[3.4195] → [4.2681:2826]

∅:D[4.2826] → [3.4451:4452]

B:BD[3.4451] → [3.4451:4452]

B:BD[3.4452] → [4.2827:2957]

∅:D[4.2957] → [3.4590:4591]

B:BD[3.4590] → [3.4590:4591]

B:BD[3.4591] → [4.2958:3072]

  const CCTK_REAL *restrict const x0 = ghext->geom.ProbLo();
  const CCTK_REAL *restrict const x1 = ghext->geom.ProbHi();
  // Initialize phi
  const MFIter &mfi = *mfis.at(omp_get_thread_num());
  const Box &fbx = mfi.fabbox();
  const Box &bx = mfi.growntilebox();
  const Dim3 amin = lbound(fbx);
  const Dim3 amax = ubound(fbx);
  const Dim3 imin = lbound(bx);
  const Dim3 imax = ubound(bx);
  constexpr int di = 1;
  const int dj = di * (amax.x - amin.x + 1);
  const int dk = dj * (amax.y - amin.y + 1);

[4.2680]

[3.4711]

  const CCTK_REAL *restrict const x0 = cctk_origin_space;
  const CCTK_REAL *restrict const dx = cctk_delta_space;

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 73 [3.37]

B:BD[3.4712] → [4.3073:3245]

∅:D[4.3245] → [3.4890:4891]

B:BD[3.4890] → [3.4890:4891]

B:BD[3.4891] → [4.3246:3330]

  const Array4<CCTK_REAL> &vars = ghext->mfab.array(mfi);
  CCTK_REAL *restrict const phi = vars.ptr(0, 0, 0, 0);
  CCTK_REAL *restrict const phi_p = vars.ptr(0, 0, 0, 1);
  for (int k = imin.z; k <= imax.z; ++k)
    for (int j = imin.y; j <= imax.y; ++j)

[3.4712]

[3.4979]

  for (int k = 0; k < cctk_lsh[2]; ++k)
    for (int j = 0; j < cctk_lsh[1]; ++j)

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 76 [3.37]

B:BD[3.4996] → [4.3331:3756]

      for (int i = imin.x; i <= imax.x; ++i) {
        const int idx = i * di + j * dj + k * dk;
        CCTK_REAL x = linterp(x0[0], x1[0], -1, 2 * ghext->ncells - 1, 2 * i);
        CCTK_REAL y = linterp(x0[1], x1[1], -1, 2 * ghext->ncells - 1, 2 * j);
        CCTK_REAL z = linterp(x0[2], x1[2], -1, 2 * ghext->ncells - 1, 2 * k);
        phi[idx] = standing(t0, x, y, z);
        phi_p[idx] = standing(t0 - dt, x, y, z);

[3.4996]

[4.3756]

      for (int i = 0; i < cctk_lsh[0]; ++i) {
        const int idx = CCTK_GFINDEX3D(cctkGH, i, j, k);
        CCTK_REAL x = x0[0] + (cctk_lbnd[0] + i) * dx[0];
        CCTK_REAL y = x0[1] + (cctk_lbnd[1] + j) * dx[1];
        CCTK_REAL z = x0[2] + (cctk_lbnd[2] + k) * dx[2];
        phi[idx] = standing(t, x, y, z);
        phi_p[idx] = standing(t - dt, x, y, z);

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 95 [3.37]

B:BD[4.4059] → [4.4059:4107]

  cctkGH->cctk_time += cctkGH->cctk_delta_time;

[4.4059]

[3.5449]

  // cctkGH->cctk_time += cctkGH->cctk_delta_time;
  CCTK_VINFO("t=%g", cctkGH->cctk_time);

Deletion in WaveToyAMReX/src/wavetoy.cxx at line 102 [3.37]

B:BD[3.5612] → [3.5612:5782]


  // Cycle time levels
  MultiFab::Copy(ghext->mfab, ghext->mfab, 1, 2, 1, ghext->nghostzones);
  MultiFab::Copy(ghext->mfab, ghext->mfab, 0, 1, 1, ghext->nghostzones);

Deletion in WaveToyAMReX/src/wavetoy.cxx at line 106 [3.37]

B:BD[3.5889] → [3.5889:5905]

B:BD[3.5905] → [4.4206:4326]

∅:D[4.4326] → [3.6138:6139]

B:BD[3.6138] → [3.6138:6139]

B:BD[3.6139] → [4.4327:4457]

∅:D[4.4457] → [3.6277:6278]

B:BD[3.6277] → [3.6277:6278]

  // Evolve phi
  const MFIter &mfi = *mfis.at(omp_get_thread_num());
  const Box &fbx = mfi.fabbox();
  const Box &bx = mfi.tilebox();
  const Dim3 amin = lbound(fbx);
  const Dim3 amax = ubound(fbx);
  const Dim3 imin = lbound(bx);
  const Dim3 imax = ubound(bx);

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 107 [3.37]

B:BD[4.4482] → [4.4482:4572]

∅:D[4.4572] → [3.6398:6399]

B:BD[3.6398] → [3.6398:6399]

B:BD[3.6399] → [4.4573:4817]

  const int dj = di * (amax.x - amin.x + 1);
  const int dk = dj * (amax.y - amin.y + 1);
  const Array4<CCTK_REAL> &vars = ghext->mfab.array(mfi);
  CCTK_REAL *restrict const phi = vars.ptr(0, 0, 0, 0);
  const CCTK_REAL *restrict const phi_p = vars.ptr(0, 0, 0, 1);
  const CCTK_REAL *restrict const phi_p_p = vars.ptr(0, 0, 0, 2);

[4.4482]

[3.6651]

  const int dj = di * cctk_ash[0];
  const int dk = dj * cctk_ash[1];

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 110 [3.37]

B:BD[3.6652] → [4.4818:4902]

  for (int k = imin.z; k <= imax.z; ++k)
    for (int j = imin.y; j <= imax.y; ++j)

[3.6652]

[3.6740]

  for (int k = 0; k < cctk_lsh[2]; ++k)
    for (int j = 0; j < cctk_lsh[1]; ++j)

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 113 [3.37]

B:BD[3.6757] → [4.4903:5000]

      for (int i = imin.x; i <= imax.x; ++i) {
        const int idx = i * di + j * dj + k * dk;

[3.6757]

[4.5000]

      for (int i = 0; i < cctk_lsh[0]; ++i) {
        const int idx = CCTK_GFINDEX3D(cctkGH, i, j, k);

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 138 [3.37]

B:BD[3.7556] → [4.5550:5584]

∅:D[4.5584] → [3.7592:7714]

B:BD[3.7592] → [3.7592:7714]

  const CCTK_REAL t0 = cctk_time;
  const CCTK_REAL *restrict const x0 = ghext->geom.ProbLo();
  const CCTK_REAL *restrict const x1 = ghext->geom.ProbHi();

[3.7556]

[3.7714]

  const CCTK_REAL t = cctk_time;
  const CCTK_REAL *restrict const x0 = cctk_origin_space;
  const CCTK_REAL *restrict const dx = cctk_delta_space;

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 142 [3.37]

B:BD[3.7715] → [4.5585:5710]

∅:D[4.5710] → [3.7971:7972]

B:BD[3.7971] → [3.7971:7972]

B:BD[3.7972] → [4.5711:5841]

∅:D[4.5841] → [3.8110:8111]

B:BD[3.8110] → [3.8110:8111]

B:BD[3.8111] → [4.5842:5956]

∅:D[4.5956] → [3.8231:8232]

B:BD[3.8231] → [3.8231:8232]

B:BD[3.8232] → [4.5957:6133]

∅:D[4.6133] → [3.8414:8415]

B:BD[3.8414] → [3.8414:8415]

B:BD[3.8415] → [4.6134:6218]

  const MFIter &mfi = *mfis.at(omp_get_thread_num());
  const Box &fbx = mfi.fabbox();
  const Box &bx = mfi.growntilebox();
  const Dim3 amin = lbound(fbx);
  const Dim3 amax = ubound(fbx);
  const Dim3 imin = lbound(bx);
  const Dim3 imax = ubound(bx);
  constexpr int di = 1;
  const int dj = di * (amax.x - amin.x + 1);
  const int dk = dj * (amax.y - amin.y + 1);
  const Array4<CCTK_REAL> &vars = ghext->mfab.array(mfi);
  CCTK_REAL *restrict const err = vars.ptr(0, 0, 0, 3);
  const CCTK_REAL *restrict const phi = vars.ptr(0, 0, 0, 0);
  for (int k = imin.z; k <= imax.z; ++k)
    for (int j = imin.y; j <= imax.y; ++j)

[3.7715]

[3.8503]

  for (int k = 0; k < cctk_lsh[2]; ++k)
    for (int j = 0; j < cctk_lsh[1]; ++j)

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 145 [3.37]

B:BD[3.8520] → [4.6219:6606]

      for (int i = imin.x; i <= imax.x; ++i) {
        const int idx = i * di + j * dj + k * dk;
        CCTK_REAL x = linterp(x0[0], x1[0], -1, 2 * ghext->ncells - 1, 2 * i);
        CCTK_REAL y = linterp(x0[1], x1[1], -1, 2 * ghext->ncells - 1, 2 * j);
        CCTK_REAL z = linterp(x0[2], x1[2], -1, 2 * ghext->ncells - 1, 2 * k);
        err[idx] = phi[idx] - standing(t0, x, y, z);

[3.8520]

[4.6606]

      for (int i = 0; i < cctk_lsh[0]; ++i) {
        const int idx = CCTK_GFINDEX3D(cctkGH, i, j, k);
        CCTK_REAL x = x0[0] + (cctk_lbnd[0] + i) * dx[0];
        CCTK_REAL y = x0[1] + (cctk_lbnd[1] + j) * dx[1];
        CCTK_REAL z = x0[2] + (cctk_lbnd[2] + k) * dx[2];
        err[idx] = phi[idx] - standing(t, x, y, z);

Replacement in WaveToyAMReX/src/wavetoy.cxx at line 161 [3.37]

B:BD[3.9237] → [3.9237:9315]

                           {"phi", "phi_p", "phi_p_p", "error"}, ghext->geom,

[3.9237]

[4.6615]

                           {"phi", "phi_p", "phi_p_p", "err"}, ghext->geom,

Handle grid function pointers in driver

Dependencies

In channels

Change contents

Deletion in AMReX/src/AMReX.hxx at line 14 [3.15275]

Insertion in AMReX/src/AMReX.hxx at line 36 [3.15275]

Deletion in AMReX/src/AMReX.hxx at line 42 [3.15275]

Deletion in AMReX/src/driver.cxx at line 28 [3.15972]