eschnett/cactusamrex - Change E7WUAZCMU5IUJMF4SPNX3CDXGZACKOJDQBH2DHVJXWUQH3ULQGJQC

CarpetX: reverted an if...else change The else was functionally unnecessary, and the original code did not use else. The reversion makes comparison of changes easier for reviewers. This commit also includes the clang-format changes, which are purely cosmetic.

Created by Samuel Cupp on October 21, 2020

E7WUAZCMU5IUJMF4SPNX3CDXGZACKOJDQBH2DHVJXWUQH3ULQGJQC

Dependencies

In channels

main

Change contents

Replacement in CarpetX/src/driver.cxx at line 638 [5.15972]

B:BD[3.3504] → [4.123:199]

    if (group.grouptype != CCTK_SCALAR and group.grouptype != CCTK_ARRAY) {

[3.3504]

[3.3578]

    if (group.grouptype != CCTK_SCALAR and group.grouptype != CCTK_ARRAY)

Replacement in CarpetX/src/driver.cxx at line 640 [5.15972]

B:BD[4.2089] → [4.2089:2102]

B:BD[4.2102] → [2.0:79]

∅:D[2.79] → [4.2147:2253]

B:BD[4.2147] → [4.2147:2253]

B:BD[4.2253] → [2.80:110]

    } else {
      assert(group.grouptype == CCTK_ARRAY || group.grouptype == CCTK_SCALAR);
      assert(group.vartype == CCTK_VARIABLE_REAL);
      assert(group.disttype == CCTK_DISTRIB_CONSTANT);
      assert(group.dim >= 0);

[3.3594]

[4.2302]

    assert(group.grouptype == CCTK_ARRAY || group.grouptype == CCTK_SCALAR);
    assert(group.vartype == CCTK_VARIABLE_REAL);
    assert(group.disttype == CCTK_DISTRIB_CONSTANT);
    assert(group.dim >= 0);

Replacement in CarpetX/src/driver.cxx at line 645 [5.15972]

B:BD[4.2303] → [4.2303:2785]

      globaldata.arraygroupdata.at(gi) =
          make_unique<GHExt::GlobalData::ArrayGroupData>();
      GHExt::GlobalData::ArrayGroupData &arraygroupdata =
          *globaldata.arraygroupdata.at(gi);
      arraygroupdata.groupindex = gi;
      arraygroupdata.firstvarindex = CCTK_FirstVarIndexI(gi);
      arraygroupdata.numvars = group.numvars;
      arraygroupdata.do_checkpoint = get_group_checkpoint_flag(gi);
      arraygroupdata.do_restrict = get_group_restrict_flag(gi);

[4.2303]

[3.3769]

    globaldata.arraygroupdata.at(gi) =
        make_unique<GHExt::GlobalData::ArrayGroupData>();
    GHExt::GlobalData::ArrayGroupData &arraygroupdata =
        *globaldata.arraygroupdata.at(gi);
    arraygroupdata.groupindex = gi;
    arraygroupdata.firstvarindex = CCTK_FirstVarIndexI(gi);
    arraygroupdata.numvars = group.numvars;
    arraygroupdata.do_checkpoint = get_group_checkpoint_flag(gi);
    arraygroupdata.do_restrict = get_group_restrict_flag(gi);

Replacement in CarpetX/src/driver.cxx at line 655 [5.15972]

B:BD[3.3770] → [4.2786:3009]

      CCTK_INT const *const *const sz = CCTK_GroupSizesI(gi);
      arraygroupdata.array_size = 1;
      for (int d = 0; d < group.dim; ++d) {
        arraygroupdata.array_size = arraygroupdata.array_size * *sz[d];
      }

[3.3770]

[3.4244]

    CCTK_INT const *const *const sz = CCTK_GroupSizesI(gi);
    arraygroupdata.array_size = 1;
    for (int d = 0; d < group.dim; ++d) {
      arraygroupdata.array_size = arraygroupdata.array_size * *sz[d];
    }

Replacement in CarpetX/src/driver.cxx at line 661 [5.15972]

B:BD[3.4245] → [4.3010:3487]

      // Set up dynamic data
      arraygroupdata.dimension = group.dim;
      arraygroupdata.activetimelevels = 1;
      for (int d = 0; d < group.dim; ++d) {
        arraygroupdata.lsh[d] = *sz[d];
        arraygroupdata.ash[d] = *sz[d];
        arraygroupdata.gsh[d] = *sz[d];
        arraygroupdata.nghostzones[d] = 0;
        arraygroupdata.lbnd[d] = 0;
        arraygroupdata.ubnd[d] = *sz[d]-1;
        arraygroupdata.bbox[2*d] = arraygroupdata.bbox[2*d+1] = 1;
      }

[3.4245]

[4.3487]

    // Set up dynamic data
    arraygroupdata.dimension = group.dim;
    arraygroupdata.activetimelevels = 1;
    for (int d = 0; d < group.dim; ++d) {
      arraygroupdata.lsh[d] = *sz[d];
      arraygroupdata.ash[d] = *sz[d];
      arraygroupdata.gsh[d] = *sz[d];
      arraygroupdata.nghostzones[d] = 0;
      arraygroupdata.lbnd[d] = 0;
      arraygroupdata.ubnd[d] = *sz[d]-1;
      arraygroupdata.bbox[2*d] = arraygroupdata.bbox[2*d+1] = 1;
    }

Replacement in CarpetX/src/driver.cxx at line 674 [5.15972]

B:BD[4.3488] → [4.3488:4350]

      // Allocate data
      arraygroupdata.data.resize(group.numtimelevels);
      arraygroupdata.valid.resize(group.numtimelevels);
      for (int tl = 0; tl < int(arraygroupdata.data.size()); ++tl) {
        arraygroupdata.data.at(tl).resize(arraygroupdata.numvars*arraygroupdata.array_size);
        why_valid_t why([] { return "SetupGlobals"; });
        arraygroupdata.valid.at(tl).resize(arraygroupdata.numvars, why);
        for (int vi = 0; vi < arraygroupdata.numvars; ++vi) {
          // TODO: decide that valid_bnd == false always and rely on
          // initialization magic?
          valid_t valid;
          valid.valid_int = false;
          valid.valid_outer = true;
          valid.valid_ghosts = true;
          arraygroupdata.valid.at(tl).at(vi).set(valid,
                                                  [] { return "SetupGlobals"; });

[4.3488]

[3.5058]

    // Allocate data
    arraygroupdata.data.resize(group.numtimelevels);
    arraygroupdata.valid.resize(group.numtimelevels);
    for (int tl = 0; tl < int(arraygroupdata.data.size()); ++tl) {
      arraygroupdata.data.at(tl).resize(arraygroupdata.numvars*arraygroupdata.array_size);
      why_valid_t why([] { return "SetupGlobals"; });
      arraygroupdata.valid.at(tl).resize(arraygroupdata.numvars, why);
      for (int vi = 0; vi < arraygroupdata.numvars; ++vi) {
        // TODO: decide that valid_bnd == false always and rely on
        // initialization magic?
        valid_t valid;
        valid.valid_int = false;
        valid.valid_outer = true;
        valid.valid_ghosts = true;
        arraygroupdata.valid.at(tl).at(vi).set(valid,
                                                [] { return "SetupGlobals"; });

Replacement in CarpetX/src/driver.cxx at line 691 [5.15972]

B:BD[3.5059] → [4.4351:4594]

          // TODO: make poison_invalid and check_invalid virtual members of
          // CommonGroupData
          poison_invalid(arraygroupdata, vi, tl);
          check_valid(arraygroupdata, vi, tl, [] { return "SetupGlobals"; });
        }

[3.5059]

[3.5286]

        // TODO: make poison_invalid and check_invalid virtual members of
        // CommonGroupData
        poison_invalid(arraygroupdata, vi, tl);
        check_valid(arraygroupdata, vi, tl, [] { return "SetupGlobals"; });

Deletion in CarpetX/src/schedule.cxx at line 522 [6.531]
B:BD[2.1196] → [2.1196:1229]
```
    atomic<size_t> nan_count{0};
```