eschnett/cactusamrex - Change EHF2P5PKVTMAUL5R5QSZ3DS3VLE7Z6SHJTCZAGRBTQ66Y7HZKNYQC

Merge commit 'f8f1d61' into rhaas/gridscalars

Created by Roland Haas on October 17, 2019

EHF2P5PKVTMAUL5R5QSZ3DS3VLE7Z6SHJTCZAGRBTQ66Y7HZKNYQC

Dependencies

In channels

master

main

Change contents

Replacement in AMReX/src/driver.cxx at line 166 [7.15972]

B:BD[2.2100] → [2.2100:2146]

        check_valid(scalargroupdata, vi, tl);

[2.2100]

[2.2146]

        check_valid(scalargroupdata, vi, tl, [&]() {
            return "SetupGlobals";
          });

Resurrecting zombie bytes in AMReX/src/schedule.cxx at line 301 [9.531]

B:B[8.797] → [2.5602:6153]

BD:B[8.797] → [2.5602:6153]

  }
}
// Set grid scalars to nan
void poison_invalid(const GHExt::GlobalData::ScalarGroupData &scalargroupdata, int vi,
                    int tl) {
  DECLARE_CCTK_PARAMETERS;
  if (!poison_undefined_values)
    return;
  const valid_t &valid = scalargroupdata.valid.at(tl).at(vi);
  if (valid.valid_int && valid.valid_bnd)
    return;
  // scalar have no boundary so we expect it to alway be valid
  assert(valid.valid_bnd);
  if (!valid.valid_int) {
    CCTK_REAL *restrict const ptr = scalargroupdata.data.at(tl).at(vi);
    *ptr = 0.0 / 0.0;

Insertion in AMReX/src/schedule.cxx at line 301 [9.531]

[10.798]

[2.5602]

        "level %d; expected valid %s",
        msg().c_str(), CCTK_FullVarName(groupdata.firstvarindex + vi),
        leveldata.level, tl, where);

Deletion in AMReX/src/schedule.cxx at line 324 [9.531]

B:BD[10.798] → [4.0:39]

∅:D[4.39] → [10.799:907]

B:BD[8.688] → [10.799:907]

        "level %d; expected valid %s",
        msg().c_str(), CCTK_FullVarName(groupdata.firstvarindex + vi),
        leveldata.level, tl, where);

Resurrecting zombie bytes in AMReX/src/schedule.cxx at line 325 [9.531]
B:B[8.801] → [2.6154:6276]
BD:B[8.801] → [2.6154:6276]
```
}
// Ensure grid scalars are not nan
void check_valid(const GHExt::GlobalData::ScalarGroupData &scalargroupdata, int vi,
```

Replacement in AMReX/src/schedule.cxx at line 329 [9.531]

B:BD[2.6276] → [2.6276:6303]

BD:BD[2.6276] → [2.6276:6303]

                 int tl) {

[2.6276]

[2.6303]

                 int tl,
                 const function<string()> &msg) {

Replacement in AMReX/src/schedule.cxx at line 354 [9.531]

B:BD[2.7034] → [2.7034:7187]

BD:BD[2.7034] → [2.7034:7187]

    CCTK_VERROR("Grid Scalar \"%s\" has nans on time level %d; expected valid %s",
                CCTK_FullVarName(scalargroupdata.firstvarindex + vi),

[2.7034]

[2.7187]

    CCTK_VERROR("%s: Grid Scalar \"%s\" has nans on time level %d; expected valid %s",
                msg().c_str(), CCTK_FullVarName(scalargroupdata.firstvarindex + vi),

Insertion in AMReX/src/schedule.cxx at line 508 [9.531]
[9.2290]
[2.7920]
```
  assert(in_global_mode(cctkGH));
```
Deletion in AMReX/src/schedule.cxx at line 531 [9.531]
B:BD[9.2290] → [6.974:1008]
```
  assert(in_global_mode(cctkGH));
```
Resurrecting zombie bytes in AMReX/src/schedule.cxx at line 1237 [9.531]
B:B[11.9041] → [2.11810:11867]
BD:B[11.9041] → [2.11810:11867]
```
    const auto &restrict globaldata = ghext->globaldata;
```

Replacement in AMReX/src/schedule.cxx at line 1265 [9.531]

B:BD[2.12564] → [2.12564:12643]

          check_valid(leveldata, leveldata.groupdata.at(rd.gi), rd.vi, rd.tl);

[2.12564]

[2.12643]

          check_valid(leveldata, leveldata.groupdata.at(rd.gi), rd.vi, rd.tl, [&]() {
            ostringstream buf;
            buf << "CallFunction iteration " << cctkGH->cctk_iteration << " "
                << attribute->where << ": " << attribute->thorn
                << "::" << attribute->routine << " checking input";
            return buf.str();
          });

Replacement in AMReX/src/schedule.cxx at line 1273 [9.531]

B:BD[2.12660] → [2.12660:12735]

          check_valid(globaldata.scalargroupdata.at(rd.gi), rd.vi, rd.tl);

[2.12660]

[2.12735]

          check_valid(globaldata.scalargroupdata.at(rd.gi), rd.vi, rd.tl, [&]() {
            ostringstream buf;
            buf << "CallFunction iteration " << cctkGH->cctk_iteration << " "
                << attribute->where << ": " << attribute->thorn
                << "::" << attribute->routine << " checking input";
            return buf.str();
          });

Deletion in AMReX/src/schedule.cxx at line 1281 [9.531]

B:BD[11.10147] → [10.908:1245]

        check_valid(leveldata, groupdata, rd.vi, rd.tl, [&]() {
          ostringstream buf;
          buf << "CallFunction iteration " << cctkGH->cctk_iteration << " "
              << attribute->where << ": " << attribute->thorn
              << "::" << attribute->routine << " checking input";
          return buf.str();
        });

Resurrecting zombie bytes in AMReX/src/schedule.cxx at line 1365 [9.531]
B:B[11.10435] → [2.13201:13252]
BD:B[11.10435] → [2.13201:13252]
```
    auto &restrict globaldata = ghext->globaldata;
```

Replacement in AMReX/src/schedule.cxx at line 1383 [9.531]

B:BD[2.13699] → [2.13699:13778]

          check_valid(leveldata, leveldata.groupdata.at(wr.gi), wr.vi, wr.tl);

[2.13699]

[2.13778]

          check_valid(leveldata, leveldata.groupdata.at(wr.gi), wr.vi, wr.tl, [&]() {
            ostringstream buf;
            buf << "CallFunction iteration " << cctkGH->cctk_iteration << " "
                << attribute->where << ": " << attribute->thorn
                << "::" << attribute->routine << " checking output";
            return buf.str();
          });

Replacement in AMReX/src/schedule.cxx at line 1391 [9.531]

B:BD[2.13795] → [2.13795:13870]

          check_valid(globaldata.scalargroupdata.at(wr.gi), wr.vi, wr.tl);

[2.13795]

[2.13870]

          check_valid(globaldata.scalargroupdata.at(wr.gi), wr.vi, wr.tl, [&]() {
            ostringstream buf;
            buf << "CallFunction iteration " << cctkGH->cctk_iteration << " "
                << attribute->where << ": " << attribute->thorn
                << "::" << attribute->routine << " checking output";
            return buf.str();
          });

Deletion in AMReX/src/schedule.cxx at line 1399 [9.531]

B:BD[11.11024] → [10.1246:1584]

        check_valid(leveldata, groupdata, wr.vi, wr.tl, [&]() {
          ostringstream buf;
          buf << "CallFunction iteration " << cctkGH->cctk_iteration << " "
              << attribute->where << ": " << attribute->thorn
              << "::" << attribute->routine << " checking output";
          return buf.str();
        });

Insertion in AMReX/src/schedule.cxx at line 1404 [9.531]
[5.429]
[5.429]
```
    auto &restrict globaldata = ghext->globaldata;
```

Replacement in AMReX/src/schedule.cxx at line 1409 [9.531]

B:BD[5.678] → [5.678:745]

        auto &restrict groupdata = leveldata.groupdata.at(inv.gi);

[5.678]

[5.745]

        cGroup group;
        int ierr = CCTK_GroupData(inv.gi, &group);
        assert(!ierr);
        GHExt::CommonGroupData * groupdata = group.grouptype == CCTK_GF ?
          static_cast<GHExt::CommonGroupData *>(&leveldata.groupdata.at(inv.gi)) :
          static_cast<GHExt::CommonGroupData *>(&globaldata.scalargroupdata.at(inv.gi));

Replacement in AMReX/src/schedule.cxx at line 1417 [9.531]

B:BD[5.790] → [5.790:853]

        valid_t &have = groupdata.valid.at(inv.tl).at(inv.vi);

[5.790]

[5.853]

        valid_t &have = groupdata->valid.at(inv.tl).at(inv.vi);

Replacement in AMReX/src/schedule.cxx at line 1421 [9.531]

B:BD[5.984] → [5.984:1324]

        check_valid(leveldata, groupdata, inv.vi, inv.tl, [&]() {
          ostringstream buf;
          buf << "CallFunction iteration " << cctkGH->cctk_iteration << " "
              << attribute->where << ": " << attribute->thorn
              << "::" << attribute->routine << " checking output";
          return buf.str();
        });

[5.984]

[5.1324]

        if (group.grouptype == CCTK_GF) {
          check_valid(leveldata, leveldata.groupdata.at(inv.gi), inv.vi, inv.tl, [&]() {
            ostringstream buf;
            buf << "CallFunction iteration " << cctkGH->cctk_iteration << " "
                << attribute->where << ": " << attribute->thorn
                << "::" << attribute->routine << " checking output";
            return buf.str();
          });
        } else {
          check_valid(globaldata.scalargroupdata.at(inv.gi), inv.vi, inv.tl, [&]() {
            ostringstream buf;
            buf << "CallFunction iteration " << cctkGH->cctk_iteration << " "
                << attribute->where << ": " << attribute->thorn
                << "::" << attribute->routine << " checking output";
            return buf.str();
          });
        }

Replacement in AMReX/src/schedule.hxx at line 89 [9.5992]

B:BD[2.14484] → [2.14484:14510]

                 int tl);

[2.14484]

[2.14510]

                 int tl, const function<string()> &msg);