eschnett/cactusamrex - Change 2DD222JSYRPHTXKSRXLSOMSCQPZUORNFLLO2P3GMIDELAAMD5MEQC

Rename some ghext variables

Created by Erik Schnetter on July 15, 2019

2DD222JSYRPHTXKSRXLSOMSCQPZUORNFLLO2P3GMIDELAAMD5MEQC

Dependencies

In channels

master

main

Change contents

Replacement in AMReX/src/driver.cxx at line 102 [4.15972]

B:BD[3.312] → [3.312:459]

  const int nlevels = 1;
  ghext->levels.resize(nlevels);
  const int lev = 0;
  GHExt::Level &level = ghext->levels.at(lev);
  level.level = lev;

[3.312]

[5.1195]

  const int nlevels = 2;
  ghext->leveldata.resize(nlevels);
  for (int level = 0; level < nlevels; ++level) {
    GHExt::LevelData &leveldata = ghext->leveldata.at(level);
    leveldata.level = level;

Replacement in AMReX/src/driver.cxx at line 108 [4.15972]

∅:D[5.1196] → [4.16540:16603]

B:BD[4.16540] → [4.16540:16603]

B:BD[4.16603] → [6.682:756]

∅:D[6.756] → [4.16699:16729]

B:BD[4.16699] → [4.16699:16729]

B:BD[4.16729] → [3.460:490]

  // Define box array
  IntVect dom_lo(AMREX_D_DECL(0, 0, 0));
  IntVect dom_hi(AMREX_D_DECL(ncells_x - 1, ncells_y - 1, ncells_z - 1));
  Box domain(dom_lo, dom_hi);
  level.grids.define(domain);

[5.1196]

[4.16757]

    // Define box array
    IntVect box_lo(AMREX_D_DECL(0, 0, 0));
    IntVect box_hi(AMREX_D_DECL(ncells_x - 1, ncells_y - 1, ncells_z - 1));
    Box box(box_lo, box_hi);
    leveldata.grids.define(box);

Replacement in AMReX/src/driver.cxx at line 114 [4.15972]

B:BD[4.16758] → [4.16758:16881]

B:BD[4.16881] → [3.491:529]

  // Break up box array into chunks no larger than max_grid_size along
  // each direction
  const int max_grid_size = 32;
  level.grids.maxSize(max_grid_size);

[4.16758]

[4.16917]

    // Break up box array into chunks no larger than max_grid_size along
    // each direction
    const int max_grid_size = 32;
    leveldata.grids.maxSize(max_grid_size);

Replacement in AMReX/src/driver.cxx at line 119 [4.15972]

B:BD[4.16918] → [4.16918:16943]

B:BD[4.16943] → [6.757:810]

  // Define physical box
  RealBox real_box({AMREX_D_DECL(xmin, ymin, zmin)},

[4.16918]

[6.810]

    // Define physical box
    RealBox domain({AMREX_D_DECL(xmin, ymin, zmin)},

Replacement in AMReX/src/driver.cxx at line 123 [4.15972]

B:BD[4.17048] → [4.17048:17145]

B:BD[4.17145] → [3.530:611]

  // Define geometry
  Vector<int> is_periodic(AMREX_SPACEDIM, 1); // periodic in all directions
  level.geom.define(domain, &real_box, CoordSys::cartesian, is_periodic.data());

[4.17048]

[4.17300]

    // Define geometry
    Vector<int> is_periodic(AMREX_SPACEDIM, 1); // periodic in all directions
    leveldata.geom.define(box, &domain, CoordSys::cartesian,
                          is_periodic.data());

Replacement in AMReX/src/driver.cxx at line 128 [4.15972]

B:BD[4.17301] → [4.17301:17324]

B:BD[4.17324] → [3.612:661]

  // Distributed boxes
  level.dmap = DistributionMapping(level.grids);

[4.17301]

[4.17361]

    // Distributed boxes
    leveldata.dmap = DistributionMapping(leveldata.grids);

Replacement in AMReX/src/driver.cxx at line 131 [4.15972]

B:BD[4.17362] → [7.453:495]

B:BD[7.495] → [3.662:699]

∅:D[3.699] → [7.533:827]

B:BD[7.533] → [7.533:827]

  const int numgroups = CCTK_NumGroups();
  level.groupdata.resize(numgroups);
  for (int gi = 0; gi < numgroups; ++gi) {
    cGroup group;
    int ierr = CCTK_GroupData(gi, &group);
    assert(!ierr);
    assert(group.grouptype == CCTK_GF);
    assert(group.vartype == CCTK_VARIABLE_REAL);
    assert(group.disttype == CCTK_DISTRIB_DEFAULT);
    assert(group.dim == dim);

[4.17362]

[7.827]

    const int numgroups = CCTK_NumGroups();
    leveldata.groupdata.resize(numgroups);
    for (int gi = 0; gi < numgroups; ++gi) {
      cGroup group;
      int ierr = CCTK_GroupData(gi, &group);
      assert(!ierr);
      assert(group.grouptype == CCTK_GF);
      assert(group.vartype == CCTK_VARIABLE_REAL);
      assert(group.disttype == CCTK_DISTRIB_DEFAULT);
      assert(group.dim == dim);

Replacement in AMReX/src/driver.cxx at line 142 [4.15972]

B:BD[7.828] → [3.700:765]

∅:D[3.765] → [7.887:981]

B:BD[7.887] → [7.887:981]

    GHExt::Level::GroupData &groupdata = level.groupdata.at(gi);
    groupdata.firstvarindex = CCTK_FirstVarIndexI(gi);
    groupdata.numvars = group.numvars;

[7.828]

[7.1032]

      GHExt::LevelData::GroupData &groupdata = leveldata.groupdata.at(gi);
      groupdata.firstvarindex = CCTK_FirstVarIndexI(gi);
      groupdata.numvars = group.numvars;

Replacement in AMReX/src/driver.cxx at line 146 [4.15972]

B:BD[7.1033] → [2.23:286]

    // Allocate grid hierarchies
    groupdata.mfab.resize(group.numtimelevels);
    for (int tl = 0; tl < int(groupdata.mfab.size()); ++tl) {
      groupdata.mfab.at(tl) = make_unique<MultiFab>(
          level.grids, level.dmap, groupdata.numvars, ghost_size);

[7.1033]

[2.286]

      // Allocate grid hierarchies
      groupdata.mfab.resize(group.numtimelevels);
      for (int tl = 0; tl < int(groupdata.mfab.size()); ++tl) {
        groupdata.mfab.at(tl) = make_unique<MultiFab>(
            leveldata.grids, leveldata.dmap, groupdata.numvars, ghost_size);
      }

Replacement in AMReX/src/driver.cxx at line 153 [4.15972]
∅:D[2.292] → [7.1200:1204]
∅:D[6.977] → [7.1200:1204]
∅:D[3.904] → [7.1200:1204]
B:BD[7.1200] → [7.1200:1204]
```
  }
```
[2.292]
[8.415]
```
  } // for level
```
Replacement in AMReX/src/driver.hxx at line 31 [4.15275]
B:BD[3.1] → [3.1:18]
```
  struct Level {
```
[3.1]
[3.18]
```
  struct LevelData {
```
Replacement in AMReX/src/driver.hxx at line 46 [4.15275]
B:BD[7.314] → [3.286:310]
```
  vector<Level> levels;
```
[7.314]
[4.15872]
```
  vector<LevelData> leveldata;
```

Replacement in AMReX/src/io.cxx at line 35 [9.107]

∅:D[2.500] → [3.946:1058]

B:BD[3.946] → [3.946:1058]

    for (const auto &restrict level : ghext->levels) {
      auto &restrict groupdata = level.groupdata.at(gi);

[2.500]

[2.501]

    for (const auto &restrict leveldata : ghext->leveldata) {
      auto &restrict groupdata = leveldata.groupdata.at(gi);

Replacement in AMReX/src/io.cxx at line 46 [9.107]

B:BD[2.829] → [2.829:893]

        buf << ".rl" << setw(2) << setfill('0') << level.level;

[2.829]

[2.893]

        buf << ".rl" << setw(2) << setfill('0') << leveldata.level;

Replacement in AMReX/src/io.cxx at line 62 [9.107]

B:BD[2.1276] → [2.1276:1349]

                                 level.geom, cctk_time, cctk_iteration);

[2.1276]

[9.1475]

                                 leveldata.geom, cctk_time, cctk_iteration);

Replacement in AMReX/src/schedule.cxx at line 133 [8.531]

B:BD[3.2329] → [3.2329:2389]

                      const GHExt::Level &restrict level) {

[3.2329]

[6.1955]

                      const GHExt::LevelData &restrict leveldata) {

Replacement in AMReX/src/schedule.cxx at line 157 [8.531]

B:BD[3.2633] → [3.2633:2693]

                      const GHExt::Level &restrict level) {

[3.2633]

[8.2942]

                      const GHExt::LevelData &restrict leveldata) {

Replacement in AMReX/src/schedule.cxx at line 169 [8.531]

B:BD[8.3051] → [3.2694:2811]

void enter_local_mode(cGH *restrict cctkGH, GHExt::Level &restrict level,
                      const MFIter &mfi) {

[8.3051]

[10.241]

void enter_local_mode(cGH *restrict cctkGH,
                      GHExt::LevelData &restrict leveldata, const MFIter &mfi) {

Replacement in AMReX/src/schedule.cxx at line 197 [8.531]

B:BD[10.792] → [3.2812:2865]

  for (auto &restrict groupdata : level.groupdata) {

[10.792]

[2.1400]

  for (auto &restrict groupdata : leveldata.groupdata) {

Replacement in AMReX/src/schedule.cxx at line 207 [8.531]

B:BD[8.3875] → [3.2866:2946]

void leave_local_mode(cGH *restrict cctkGH, const GHExt::Level &restrict level,

[8.3875]

[3.2946]

void leave_local_mode(cGH *restrict cctkGH,
                      const GHExt::LevelData &restrict leveldata,

Replacement in AMReX/src/schedule.cxx at line 221 [8.531]

B:BD[10.1200] → [3.2990:3043]

  for (auto &restrict groupdata : level.groupdata) {

[10.1200]

[2.1652]

  for (auto &restrict groupdata : leveldata.groupdata) {

Replacement in AMReX/src/schedule.cxx at line 386 [8.531]

B:BD[6.2170] → [2.1722:1769]

∅:D[2.1769] → [3.3157:3212]

B:BD[3.3157] → [3.3157:3212]

  for (auto &restrict level : ghext->levels) {
    for (auto &restrict groupdata : level.groupdata) {

[6.2170]

[2.1770]

  for (auto &restrict leveldata : ghext->leveldata) {
    for (auto &restrict groupdata : leveldata.groupdata) {

Replacement in AMReX/src/schedule.cxx at line 452 [8.531]

B:BD[11.2229] → [3.3469:3520]

B:BD[3.3520] → [2.2077:2137]

∅:D[2.2137] → [3.3573:3616]

B:BD[3.3573] → [3.3573:3616]

      for (auto &restrict level : ghext->levels) {
        MultiFab &mfab = *level.groupdata.at(0).mfab.at(0);
        enter_level_mode(threadGH, level);

[11.2229]

[3.3616]

      for (auto &restrict leveldata : ghext->leveldata) {
        MultiFab &mfab = *leveldata.groupdata.at(0).mfab.at(0);
        enter_level_mode(threadGH, leveldata);

Replacement in AMReX/src/schedule.cxx at line 458 [8.531]

B:BD[3.3778] → [3.3778:3828]

          enter_local_mode(threadGH, level, mfi);

[3.3778]

[3.3828]

          enter_local_mode(threadGH, leveldata, mfi);

Replacement in AMReX/src/schedule.cxx at line 460 [8.531]

B:BD[3.3888] → [3.3888:3938]

          leave_local_mode(threadGH, level, mfi);

[3.3888]

[3.3938]

          leave_local_mode(threadGH, leveldata, mfi);

Replacement in AMReX/src/schedule.cxx at line 462 [8.531]

B:BD[3.3948] → [3.3948:3991]

        leave_level_mode(threadGH, level);

[3.3948]

[11.2391]

        leave_level_mode(threadGH, leveldata);

Replacement in AMReX/src/schedule.cxx at line 493 [8.531]

B:BD[12.392] → [2.2138:2185]

  for (auto &restrict level : ghext->levels) {

[12.392]

[3.4086]

  for (auto &restrict leveldata : ghext->leveldata) {

Replacement in AMReX/src/schedule.cxx at line 496 [8.531]

B:BD[3.4154] → [3.4154:4211]

      auto &restrict groupdata = level.groupdata.at(gi);

[3.4154]

[2.2186]

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

Replacement in AMReX/src/schedule.cxx at line 503 [8.531]

B:BD[2.2444] → [2.2444:2515]

        groupdata.mfab.at(tl)->FillBoundary(level.geom.periodicity());

[2.2444]

[3.4311]

        groupdata.mfab.at(tl)->FillBoundary(leveldata.geom.periodicity());