eschnett/cactusamrex - Change WMCMZILMWKIKL6K5ROISXT23A6XTZQGSBQ3IAWMDOJMK2JERGJKQC

CarpetX: Store FabArrayBox instead of an empty MultiFab

Created by Erik Schnetter on June 5, 2020

WMCMZILMWKIKL6K5ROISXT23A6XTZQGSBQ3IAWMDOJMK2JERGJKQC

Dependencies

In channels

main

master

Change contents

Replacement in CarpetX/src/driver.cxx at line 277 [7.15972]

B:BD[5.1131] → [6.50:121]

B:BD[6.121] → [8.0:50]

  for (MFIter mfi(*leveldata.mfab0, mfitinfo); mfi.isValid(); ++mfi) {
    GridPtrDesc1 grid(leveldata, groupdata, mfi);

[5.1131]

[5.1501]

  for (MFIter mfi(*leveldata.fab, mfitinfo); mfi.isValid(); ++mfi) {
    GridPtrDesc1 grid(groupdata, mfi);

Deletion in CarpetX/src/driver.cxx at line 378 [7.15972]

B:BD[9.1645] → [10.0:39]

∅:D[10.39] → [6.937:1099]

B:BD[6.937] → [6.937:1099]

  // TODO: Make this an empty MultiFab
  leveldata.mfab0 = make_unique<MultiFab>(ba, dm, 1, ghost_size);
  assert(ba.ixType() ==
         IndexType(IndexType::CELL, IndexType::CELL, IndexType::CELL));

Insertion in CarpetX/src/driver.cxx at line 396 [7.15972]

[3.954]

[9.1646]

  leveldata.fab = make_unique<FabArrayBase>(ba, dm, 1, ghost_size);
  assert(ba.ixType() ==
         IndexType(IndexType::CELL, IndexType::CELL, IndexType::CELL));

Replacement in CarpetX/src/driver.cxx at line 914 [7.15972]
∅:D[11.4900] → [10.40:79]
B:BD[9.4281] → [10.40:79]
∅:D[10.79] → [6.1835:1901]
B:BD[6.1835] → [6.1835:1901]
```
  // TODO: Make this an empty MultiFab
  leveldata.mfab0 = make_unique<MultiFab>(ba, dm, 1, ghost_size);
```
[11.4900]
[6.1901]
```
  leveldata.fab = make_unique<FabArrayBase>(ba, dm, 1, ghost_size);
```

Replacement in CarpetX/src/driver.cxx at line 975 [7.15972]

B:BD[12.3357] → [13.1028:1105]

B:BD[13.1105] → [8.1755:1811]

        for (MFIter mfi(*leveldata.mfab0, mfitinfo); mfi.isValid(); ++mfi) {
          GridPtrDesc1 grid(leveldata, groupdata, mfi);

[12.3357]

[13.1149]

        for (MFIter mfi(*leveldata.fab, mfitinfo); mfi.isValid(); ++mfi) {
          GridPtrDesc1 grid(groupdata, mfi);

Replacement in CarpetX/src/driver.hxx at line 126 [7.15275]

∅:D[3.2102] → [6.4097:4242]

B:BD[14.33] → [6.4097:4242]

B:BD[6.4242] → [2.0:172]

∅:D[2.172] → [6.4242:4274]

B:BD[6.4242] → [6.4242:4274]

    // Empty MultiFab holding a cell-centred BoxArray for iterating
    // over grid functions.
    // TODO: Can we store the BoxArray directly?
    // The data in mfab0 is not valid. It's a dummy
    // variable to get the distribution mapping, the
    // grid size, ghost zones, etc. Only needed for
    // cctkGH.
    unique_ptr<MultiFab> mfab0;

[3.2102]

[14.33]

    // FabArrayBase object holding a cell-centred BoxArray for
    // iterating over grid functions. This stores the grid structure
    // and its distribution over all processes, but holds no data.
    unique_ptr<FabArrayBase> fab;

Replacement in CarpetX/src/interpolate.cxx at line 212 [15.373]
B:BD[15.3590] → [15.3590:3630]
```
    const MFIter mfi(*leveldata.mfab0);
```
[15.3590]
[15.3630]
```
    const MFIter mfi(*leveldata.fab);
```

Replacement in CarpetX/src/schedule.cxx at line 149 [18.531]

B:BD[16.28] → [17.119:244]

  const Box &fbx = mfp.fabbox();   // allocated array
  const Box &vbx = mfp.validbox(); // interior region (without ghosts)

[16.28]

[17.244]

  const Box &fbx = mfp.fabbox();       // allocated array
  const Box &vbx = mfp.validbox();     // interior region (without ghosts)

Replacement in CarpetX/src/schedule.cxx at line 276 [18.531]

∅:D[4.1950] → [19.5780:5851]

B:BD[19.5780] → [19.5780:5851]

        msg().c_str(), CCTK_FullVarName(groupdata.firstvarindex + vi),

[4.1950]

[4.1951]

                msg().c_str(), CCTK_FullVarName(groupdata.firstvarindex + vi),

Replacement in CarpetX/src/schedule.cxx at line 278 [18.531]

∅:D[4.2014] → [19.5906:5962]

B:BD[19.5906] → [19.5906:5962]

        string(groupdata.valid.at(tl).at(vi)).c_str());

[4.2014]

[19.5962]

                string(groupdata.valid.at(tl).at(vi)).c_str());

Replacement in CarpetX/src/schedule.cxx at line 288 [18.531]

∅:D[4.2364] → [19.6464:6535]

B:BD[19.6464] → [19.6464:6535]

        msg().c_str(), CCTK_FullVarName(groupdata.firstvarindex + vi),

[4.2364]

[4.2365]

               msg().c_str(), CCTK_FullVarName(groupdata.firstvarindex + vi),

Replacement in CarpetX/src/schedule.cxx at line 290 [18.531]

∅:D[4.2427] → [19.6590:6646]

B:BD[19.6590] → [19.6590:6646]

        string(groupdata.valid.at(tl).at(vi)).c_str());

[4.2427]

[19.6646]

               string(groupdata.valid.at(tl).at(vi)).c_str());

Replacement in CarpetX/src/schedule.cxx at line 308 [18.531]

B:BD[20.4260] → [20.4260:4331]

B:BD[20.4331] → [8.11182:11238]

  for (MFIter mfi(*leveldata.mfab0, mfitinfo); mfi.isValid(); ++mfi) {
    const GridPtrDesc1 grid(leveldata, groupdata, mfi);

[20.4260]

[20.4369]

  for (MFIter mfi(*leveldata.fab, mfitinfo); mfi.isValid(); ++mfi) {
    const GridPtrDesc1 grid(groupdata, mfi);

Replacement in CarpetX/src/schedule.cxx at line 385 [18.531]

B:BD[21.1198] → [21.1198:1269]

B:BD[21.1269] → [8.11649:11705]

  for (MFIter mfi(*leveldata.mfab0, mfitinfo); mfi.isValid(); ++mfi) {
    const GridPtrDesc1 grid(leveldata, groupdata, mfi);

[21.1198]

[21.1313]

  for (MFIter mfi(*leveldata.fab, mfitinfo); mfi.isValid(); ++mfi) {
    const GridPtrDesc1 grid(groupdata, mfi);

Replacement in CarpetX/src/schedule.cxx at line 424 [18.531]

B:BD[22.432] → [23.1007:1142]

      for (MFIter mfi(*leveldata.mfab0, mfitinfo); mfi.isValid(); ++mfi) {
        const GridPtrDesc1 grid(leveldata, groupdata, mfi);

[22.432]

[23.1142]

      for (MFIter mfi(*leveldata.fab, mfitinfo); mfi.isValid(); ++mfi) {
        const GridPtrDesc1 grid(groupdata, mfi);

Replacement in CarpetX/src/schedule.cxx at line 620 [18.531]

B:BD[24.2314] → [24.2314:2387]

    for (MFIter mfi(*leveldata.mfab0, mfitinfo); mfi.isValid(); ++mfi) {

[24.2314]

[24.2387]

    for (MFIter mfi(*leveldata.fab, mfitinfo); mfi.isValid(); ++mfi) {

Replacement in CarpetX/src/schedule.cxx at line 691 [18.531]

B:BD[24.4682] → [24.4682:4755]

    for (MFIter mfi(*leveldata.mfab0, mfitinfo); mfi.isValid(); ++mfi) {

[24.4682]

[24.4755]

    for (MFIter mfi(*leveldata.fab, mfitinfo); mfi.isValid(); ++mfi) {

Replacement in CarpetX/src/schedule.cxx at line 1314 [18.531]

B:BD[25.2271] → [23.3212:3293]

        const double pts0 = ghext->leveldata.at(0).mfab0->boxArray().d_numPts();

[25.2271]

[23.3293]

        const double pts0 = ghext->leveldata.at(0).fab->boxArray().d_numPts();

Replacement in CarpetX/src/schedule.cxx at line 1316 [18.531]

B:BD[23.3350] → [23.3350:3469]

          const int sz = leveldata.mfab0->size();
          const double pts = leveldata.mfab0->boxArray().d_numPts();

[23.3350]

[23.3469]

          const int sz = leveldata.fab->size();
          const double pts = leveldata.fab->boxArray().d_numPts();

Replacement in CarpetX/src/schedule.cxx at line 1324 [18.531]

B:BD[23.3794] → [23.3794:3849]

                                    .mfab0->boxArray()

[23.3794]

[23.3849]

                                    .fab->boxArray()

Replacement in CarpetX/src/schedule.cxx at line 1564 [18.531]

B:BD[23.4276] → [23.4276:4351]

        double pts0 = ghext->leveldata.at(0).mfab0->boxArray().d_numPts();

[23.4276]

[23.4351]

        double pts0 = ghext->leveldata.at(0).fab->boxArray().d_numPts();

Replacement in CarpetX/src/schedule.cxx at line 1567 [18.531]

B:BD[23.4445] → [23.4445:4564]

          const int sz = leveldata.mfab0->size();
          const double pts = leveldata.mfab0->boxArray().d_numPts();

[23.4445]

[23.4564]

          const int sz = leveldata.fab->size();
          const double pts = leveldata.fab->boxArray().d_numPts();

Replacement in CarpetX/src/schedule.cxx at line 1575 [18.531]

B:BD[23.4889] → [23.4889:4944]

                                    .mfab0->boxArray()

[23.4889]

[23.4944]

                                    .fab->boxArray()

Replacement in CarpetX/src/schedule.cxx at line 1806 [18.531]

B:BD[26.10768] → [6.16991:17068]

        for (MFIter mfi(*leveldata.mfab0, mfitinfo); mfi.isValid(); ++mfi) {

[26.10768]

[17.1180]

        for (MFIter mfi(*leveldata.fab, mfitinfo); mfi.isValid(); ++mfi) {

Replacement in CarpetX/src/schedule.cxx at line 1828 [18.531]

B:BD[17.1936] → [17.1936:2011]

      for (MFIter mfi(*leveldata.mfab0, mfitinfo); mfi.isValid(); ++mfi) {

[17.1936]

[17.2011]

      for (MFIter mfi(*leveldata.fab, mfitinfo); mfi.isValid(); ++mfi) {

Deletion in CarpetX/src/schedule.cxx at line 1830 [18.531]

B:BD[17.2045] → [17.2045:2164]

        assert(leveldata.mfab0->array(mfi).dataPtr() ==
               leveldata.mfab0->array(mfp.index()).dataPtr());

Replacement in CarpetX/src/schedule.cxx at line 2130 [18.531]

∅:D[4.3966] → [11.11405:11573]

∅:D[27.134] → [11.11405:11573]

B:BD[11.11405] → [11.11405:11573]

                               return "SyncGroupsByDirI on coarse level "
                                      "before prolongation";
                             });

[4.3966]

[4.3967]

              return "SyncGroupsByDirI on coarse level "
                     "before prolongation";
            });

Replacement in CarpetX/src/schedule.cxx at line 2134 [18.531]

∅:D[4.4038] → [11.11672:11771]

B:BD[11.11672] → [11.11672:11771]

                  return "SyncGroupsByDirI on fine level before prolongation";
                });

[4.4038]

[4.4039]

              return "SyncGroupsByDirI on fine level before prolongation";
            });

Replacement in CarpetX/src/schedule.cxx at line 2219 [18.531]

∅:D[4.4568] → [19.15897:16053]

B:BD[19.15897] → [19.15897:16053]

                ostringstream buf;
                buf << "Reflux: Fine level flux in direction " << d;
                return buf.str();
              });

[4.4568]

[4.4569]

            ostringstream buf;
            buf << "Reflux: Fine level flux in direction " << d;
            return buf.str();
          });

Replacement in CarpetX/src/schedule.cxx at line 2224 [18.531]

∅:D[4.4644] → [19.16154:16312]

B:BD[19.16154] → [19.16154:16312]

                ostringstream buf;
                buf << "Reflux: Coarse level flux in direction " << d;
                return buf.str();
              });

[4.4644]

[28.4737]

            ostringstream buf;
            buf << "Reflux: Coarse level flux in direction " << d;
            return buf.str();
          });