eschnett/cactusamrex - Change FS7Q6TUHBK5WSRDC3TM6KV2BPGWATRBLDHFGEJ72BR3FRDEOC3WAC

CarpetX: use nullptr in and unique_ptr to mark invalid groups both globals and grid functions have a full CCTK_NumGroups sized vector so I mark ones that are of the "wrong" type with a nullptr

Created by Roland Haas on December 16, 2019

FS7Q6TUHBK5WSRDC3TM6KV2BPGWATRBLDHFGEJ72BR3FRDEOC3WAC

Dependencies

In channels

main

master

Change contents

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

B:BD[6.931] → [6.931:988]

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

[6.931]

[8.166]

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

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

B:BD[9.133] → [9.133:176]

        globaldata.scalargroupdata.at(gi);

[9.133]

[10.1195]

        *(globaldata.scalargroupdata.at(gi) =
          make_unique<GHExt::GlobalData::ScalarGroupData>());

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

B:BD[11.2024] → [11.2024:2097]

    GHExt::LevelData::GroupData &groupdata = leveldata.groupdata.at(gi);

[11.2024]

[12.354]

    GHExt::LevelData::GroupData &groupdata =
      *(leveldata.groupdata.at(gi) =
        make_unique<GHExt::LevelData::GroupData>());

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

B:BD[13.2046] → [13.2046:2102]

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

[13.2046]

[13.2102]

    const auto &groupdata = *leveldata.groupdata.at(gi);

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

B:BD[13.2264] → [13.2264:2321]

            leveldata.groupdata.at(groupdata.fluxes[d]);

[13.2264]

[13.2321]

            *leveldata.groupdata.at(groupdata.fluxes[d]);

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

∅:D[10.2417] → [11.2992:3122]

B:BD[11.2992] → [11.2992:3122]

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

[10.2417]

[11.3122]

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

Replacement in CarpetX/src/driver.cxx at line 694 [7.15972]
∅:D[10.2552] → [11.4368:4427]
B:BD[11.4368] → [11.4368:4427]
```
    auto &restrict groupdata = leveldata.groupdata.at(gi);
```
[10.2552]
[14.0]
```
    auto &restrict groupdata = *leveldata.groupdata.at(gi);
```

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

B:BD[15.2191] → [15.2191:2262]

    auto &restrict coarsegroupdata = coarseleveldata.groupdata.at(gi);

[15.2191]

[15.2262]

    auto &restrict coarsegroupdata = *coarseleveldata.groupdata.at(gi);

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

B:BD[10.3170] → [10.3170:3232]

    vector<ScalarGroupData> scalargroupdata; // [group index]

[10.3170]

[10.3232]

    vector<unique_ptr<ScalarGroupData> > scalargroupdata; // [group index]

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

B:BD[10.3381] → [10.3381:3431]

    vector<GroupData> groupdata; // [group index]

[10.3381]

[16.309]

    vector<unique_ptr<GroupData> > groupdata; // [group index]

Replacement in CarpetX/src/io.cxx at line 51 [17.107]

∅:D[10.3612] → [15.4498:4571]

B:BD[15.4498] → [15.4498:4571]

    auto &restrict groupdata0 = ghext->leveldata.at(0).groupdata.at(gi);

[10.3612]

[15.4571]

    auto &restrict groupdata0 = *ghext->leveldata.at(0).groupdata.at(gi);

Replacement in CarpetX/src/io.cxx at line 80 [17.107]

B:BD[15.5578] → [15.5578:5656]

        mfabs.at(leveldata.level) = &*leveldata.groupdata.at(gi).mfab.at(tl);

[15.5578]

[15.5656]

        mfabs.at(leveldata.level) = &*leveldata.groupdata.at(gi)->mfab.at(tl);

Replacement in CarpetX/src/io.cxx at line 129 [17.107]
∅:D[15.6902] → [18.6040:6096]
B:BD[18.6040] → [18.6040:6096]
```
    const auto &groupdata = leveldata.groupdata.at(gi);
```
[18.6040]
[18.6096]
```
    const auto &groupdata = *leveldata.groupdata.at(gi);
```

Replacement in CarpetX/src/io.cxx at line 180 [17.107]

∅:D[10.3747] → [19.162:235]

B:BD[20.500] → [19.162:235]

    auto &restrict groupdata0 = ghext->leveldata.at(0).groupdata.at(gi);

[10.3747]

[19.235]

    auto &restrict groupdata0 = *ghext->leveldata.at(0).groupdata.at(gi);

Replacement in CarpetX/src/io.cxx at line 245 [17.107]
B:BD[21.493] → [21.493:529]
```
        leveldata.groupdata.at(gi);
```
[21.493]
[22.1148]
```
        *leveldata.groupdata.at(gi);
```

Replacement in CarpetX/src/io.cxx at line 255 [17.107]

B:BD[22.1328] → [22.1328:1391]

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

[22.1328]

[22.1391]

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

Replacement in CarpetX/src/io.cxx at line 330 [17.107]
B:BD[10.5192] → [10.5192:5235]
```
        globaldata.scalargroupdata.at(gi);
```
[10.5192]
[10.5235]
```
        *globaldata.scalargroupdata.at(gi);
```

Replacement in CarpetX/src/linsolve.cxx at line 64 [5.115]

B:BD[5.2098] → [5.2098:2171]

    const auto &restrict groupdata_rhs = leveldata.groupdata.at(gi_rhs);

[5.2098]

[5.2171]

    const auto &restrict groupdata_rhs = *leveldata.groupdata.at(gi_rhs);

Replacement in CarpetX/src/linsolve.cxx at line 66 [5.115]

B:BD[5.2225] → [5.2225:2298]

    const auto &restrict groupdata_sol = leveldata.groupdata.at(gi_sol);

[5.2225]

[5.2298]

    const auto &restrict groupdata_sol = *leveldata.groupdata.at(gi_sol);

Replacement in CarpetX/src/linsolve.cxx at line 68 [5.115]

B:BD[5.2352] → [5.2352:2425]

    const auto &restrict groupdata_res = leveldata.groupdata.at(gi_res);

[5.2352]

[5.2425]

    const auto &restrict groupdata_res = *leveldata.groupdata.at(gi_res);

Replacement in CarpetX/src/reduction.cxx at line 114 [21.870]

B:BD[22.3754] → [22.3754:3819]

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

[22.3683]

[22.3819]

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

Replacement in CarpetX/src/reduction.cxx at line 133 [21.870]

B:BD[22.4085] → [22.4085:4162]

      const auto &restrict fine_groupdata = fine_leveldata.groupdata.at(gi);

[22.4085]

[22.4162]

      const auto &restrict fine_groupdata = *fine_leveldata.groupdata.at(gi);

Replacement in CarpetX/src/schedule.cxx at line 522 [23.531]

B:BD[10.7541] → [10.7541:7615]

      auto &restrict scalargroupdata = globaldata.scalargroupdata.at(gi);

[10.7541]

[10.7615]

      auto &restrict scalargroupdata = *globaldata.scalargroupdata.at(gi);

Replacement in CarpetX/src/schedule.cxx at line 548 [23.531]

B:BD[10.8240] → [10.8240:8314]

      auto &restrict scalargroupdata = globaldata.scalargroupdata.at(gi);

[10.8240]

[10.8314]

      auto &restrict scalargroupdata = *globaldata.scalargroupdata.at(gi);

Replacement in CarpetX/src/schedule.cxx at line 631 [23.531]

B:BD[10.8772] → [10.8772:8831]

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

[10.8772]

[3.0]

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

Replacement in CarpetX/src/schedule.cxx at line 694 [23.531]

B:BD[10.9053] → [10.9053:9112]

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

[10.9053]

[20.1652]

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

Replacement in CarpetX/src/schedule.cxx at line 1037 [23.531]

B:BD[10.9348] → [10.9348:9409]

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

[10.9348]

[12.5721]

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

Replacement in CarpetX/src/schedule.cxx at line 1064 [23.531]

B:BD[10.9729] → [10.9729:9803]

      auto &restrict scalargroupdata = globaldata.scalargroupdata.at(gi);

[10.9729]

[9.1488]

      auto &restrict scalargroupdata = *globaldata.scalargroupdata.at(gi);

Replacement in CarpetX/src/schedule.cxx at line 1099 [23.531]

B:BD[10.10504] → [10.10504:10565]

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

[10.10504]

[20.1770]

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

Replacement in CarpetX/src/schedule.cxx at line 1135 [23.531]

B:BD[10.10880] → [10.10880:10954]

      auto &restrict scalargroupdata = globaldata.scalargroupdata.at(gi);

[10.10880]

[10.10954]

      auto &restrict scalargroupdata = *globaldata.scalargroupdata.at(gi);

Replacement in CarpetX/src/schedule.cxx at line 1271 [23.531]

B:BD[4.333] → [4.333:407]

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

[4.333]

[4.407]

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

Replacement in CarpetX/src/schedule.cxx at line 1298 [23.531]

B:BD[4.1618] → [4.1618:1675]

            ghext->globaldata.scalargroupdata.at(rd.gi);

[4.1618]

[8.9404]

            *ghext->globaldata.scalargroupdata.at(rd.gi);

Replacement in CarpetX/src/schedule.cxx at line 1345 [23.531]

B:BD[4.2716] → [4.2716:2784]

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

[4.2716]

[4.2784]

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

Replacement in CarpetX/src/schedule.cxx at line 1356 [23.531]

B:BD[4.3172] → [4.3172:3229]

            ghext->globaldata.scalargroupdata.at(wr.gi);

[4.3172]

[4.3229]

            *ghext->globaldata.scalargroupdata.at(wr.gi);

Replacement in CarpetX/src/schedule.cxx at line 1425 [23.531]

B:BD[4.3576] → [4.3576:3644]

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

[4.3576]

[4.3644]

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

Replacement in CarpetX/src/schedule.cxx at line 1442 [23.531]

B:BD[4.4284] → [4.4284:4341]

            ghext->globaldata.scalargroupdata.at(wr.gi);

[4.4284]

[8.10790]

            *ghext->globaldata.scalargroupdata.at(wr.gi);

Replacement in CarpetX/src/schedule.cxx at line 1467 [23.531]

B:BD[4.4926] → [4.4926:4995]

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

[4.4926]

[4.4995]

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

Replacement in CarpetX/src/schedule.cxx at line 1484 [23.531]

B:BD[4.5642] → [4.5642:5700]

            ghext->globaldata.scalargroupdata.at(inv.gi);

[4.5642]

[24.745]

            *ghext->globaldata.scalargroupdata.at(inv.gi);

Replacement in CarpetX/src/schedule.cxx at line 1564 [23.531]
∅:D[10.14025] → [25.3153:3214]
B:BD[26.4154] → [25.3153:3214]
```
      auto &restrict groupdata = leveldata.groupdata.at(gi);
```
[10.14025]
[20.2186]
```
      auto &restrict groupdata = *leveldata.groupdata.at(gi);
```

Replacement in CarpetX/src/schedule.cxx at line 1598 [23.531]

B:BD[27.2347] → [27.2347:2422]

        auto &restrict coarsegroupdata = coarseleveldata.groupdata.at(gi);

[27.2347]

[28.1019]

        auto &restrict coarsegroupdata = *coarseleveldata.groupdata.at(gi);

Replacement in CarpetX/src/schedule.cxx at line 1695 [23.531]

∅:D[10.14160] → [13.3525:3639]

B:BD[13.3525] → [13.3525:3639]

    auto &groupdata = leveldata.groupdata.at(gi);
    const auto &finegroupdata = fineleveldata.groupdata.at(gi);

[10.14160]

[13.3639]

    auto &groupdata = *leveldata.groupdata.at(gi);
    const auto &finegroupdata = *fineleveldata.groupdata.at(gi);

Replacement in CarpetX/src/schedule.cxx at line 1708 [23.531]

B:BD[13.4262] → [13.4262:4410]

        const auto &flux_finegroupdata = fineleveldata.groupdata.at(flux_gi);
        const auto &flux_groupdata = leveldata.groupdata.at(flux_gi);

[13.4262]

[13.4410]

        const auto &flux_finegroupdata = *fineleveldata.groupdata.at(flux_gi);
        const auto &flux_groupdata = *leveldata.groupdata.at(flux_gi);

Replacement in CarpetX/src/schedule.cxx at line 1718 [23.531]

B:BD[13.5075] → [13.5075:5223]

        const auto &flux_finegroupdata = fineleveldata.groupdata.at(flux_gi);
        const auto &flux_groupdata = leveldata.groupdata.at(flux_gi);

[13.5075]

[13.5223]

        const auto &flux_finegroupdata = *fineleveldata.groupdata.at(flux_gi);
        const auto &flux_groupdata = *leveldata.groupdata.at(flux_gi);

Replacement in CarpetX/src/schedule.cxx at line 1786 [23.531]

∅:D[2.692] → [29.631:681]

∅:D[11.8769] → [29.631:681]

B:BD[29.631] → [29.631:681]

B:BD[29.681] → [27.2856:2920]

    auto &groupdata = leveldata.groupdata.at(gi);
    const auto &finegroupdata = fineleveldata.groupdata.at(gi);

[2.692]

[13.5788]

    auto &groupdata = *leveldata.groupdata.at(gi);
    const auto &finegroupdata = *fineleveldata.groupdata.at(gi);