eschnett/cactusamrex - Change 3BFBGMNXEPJUUTSJDJ222PQATNDNX4GGRJA2PZBPMWFMG2ZRGH2AC

ODESolvers: Correct severe looping buf

Created by Erik Schnetter on January 23, 2020

3BFBGMNXEPJUUTSJDJ222PQATNDNX4GGRJA2PZBPMWFMG2ZRGH2AC

Dependencies

In channels

master

main

Change contents

Deletion in ODESolvers/src/solve.cxx at line 23 [3.541]
B:BD[3.941] → [3.941:942]
B:BD[3.942] → [4.114:174]
```
struct varid_t {
  int gi, vi, tl;
  varid_t() = delete;
};
```
Replacement in ODESolvers/src/solve.cxx at line 27 [3.541]
∅:D[4.177] → [5.158:185]
B:BD[3.1039] → [5.158:185]
B:BD[5.185] → [4.178:204]
```
  vector<string> varnames;
  vector<varid_t> varids;
```
[4.177]
[3.1039]
```
  vector<string> groupnames;
  vector<int> groupids;
```

Replacement in ODESolvers/src/solve.cxx at line 50 [3.541]

B:BD[4.327] → [4.327:438]

  for (const varid_t &varid : varids) {
    if (varid.gi >= 0) {
      assert(varid.vi >= 0 && varid.tl >= 0);

[4.327]

[4.438]

  for (const int groupid : groupids) {
    if (groupid >= 0) {

Replacement in ODESolvers/src/solve.cxx at line 53 [3.541]

B:BD[4.502] → [4.502:722]

        const auto &groupdata = *leveldata.groupdata.at(varid.gi);
        CarpetX::check_valid(leveldata, groupdata, varid.vi, varid.tl, [&]() {
          return "ODESolver before calculating state vector";
        });

[4.502]

[4.722]

        const auto &groupdata = *leveldata.groupdata.at(groupid);
        for (int vi = 0; vi < groupdata.numvars; ++vi) {
          const int tl = 0;
          CarpetX::check_valid(leveldata, groupdata, vi, tl, [&]() {
            return "ODESolver before calculating state vector";
          });
        }

Replacement in ODESolvers/src/solve.cxx at line 70 [3.541]

B:BD[3.1710] → [5.186:216]

B:BD[5.216] → [4.761:805]

  result.varnames = varnames;
  result.varids.resize(size, {-1, -1, -1});

[3.1710]

  result.groupnames = groupnames;
  result.groupids.resize(size, -1);

Replacement in ODESolvers/src/solve.cxx at line 77 [3.541]

B:BD[5.244] → [5.244:355]

      CCTK_VERROR("statecomp_t::copy.x: Variable %s contains nans",
                  varnames.at(n).c_str());

[5.244]

[3.1847]

      CCTK_VERROR("statecomp_t::copy.x: Group %s contains nans",
                  groupnames.at(n).c_str());

Replacement in ODESolvers/src/solve.cxx at line 83 [3.541]

B:BD[5.383] → [5.383:501]

      CCTK_VERROR("statecomp_t::copy.y: Variable %s contains nans",
                  result.varnames.at(n).c_str());

[5.383]

[3.2045]

      CCTK_VERROR("statecomp_t::copy.y: Group %s contains nans",
                  result.groupnames.at(n).c_str());

Replacement in ODESolvers/src/solve.cxx at line 93 [3.541]

B:BD[3.2167] → [3.2167:2229]

void statecomp_t::axpy(const statecomp_t &y, CCTK_REAL alpha,

[3.2167]

[3.2229]

void statecomp_t::axpy(const statecomp_t &y, const CCTK_REAL alpha,

Replacement in ODESolvers/src/solve.cxx at line 102 [3.541]

B:BD[5.611] → [5.611:724]

      CCTK_VERROR("statecomp_t::axpy.x: Variable %s contains nans",
                  x.varnames.at(n).c_str());

[5.611]

[3.2574]

      CCTK_VERROR("statecomp_t::axpy.x: Group %s contains nans",
                  x.groupnames.at(n).c_str());

Replacement in ODESolvers/src/solve.cxx at line 107 [3.541]

B:BD[5.837] → [5.837:950]

      CCTK_VERROR("statecomp_t::axpy.y: Variable %s contains nans",
                  y.varnames.at(n).c_str());

[5.837]

[3.2696]

      CCTK_VERROR("statecomp_t::axpy.y: Group %s contains nans",
                  y.groupnames.at(n).c_str());

Replacement in ODESolvers/src/solve.cxx at line 114 [3.541]

B:BD[3.2731] → [3.2731:2860]

void statecomp_t::lincomb(const statecomp_t &z, CCTK_REAL alpha,
                          const statecomp_t &x, CCTK_REAL beta,

[3.2731]

[3.2860]

void statecomp_t::lincomb(const statecomp_t &z, const CCTK_REAL alpha,
                          const statecomp_t &x, const CCTK_REAL beta,

Replacement in ODESolvers/src/solve.cxx at line 126 [3.541]

B:BD[5.1130] → [5.1130:1246]

      CCTK_VERROR("statecomp_t::lincomb.x: Variable %s contains nans",
                  x.varnames.at(n).c_str());

[5.1130]

[5.1246]

      CCTK_VERROR("statecomp_t::lincomb.x: Group %s contains nans",
                  x.groupnames.at(n).c_str());

Replacement in ODESolvers/src/solve.cxx at line 129 [3.541]

B:BD[5.1285] → [5.1285:1401]

      CCTK_VERROR("statecomp_t::lincomb.y: Variable %s contains nans",
                  y.varnames.at(n).c_str());

[5.1285]

[3.3244]

      CCTK_VERROR("statecomp_t::lincomb.y: Group %s contains nans",
                  y.groupnames.at(n).c_str());

Replacement in ODESolvers/src/solve.cxx at line 135 [3.541]

B:BD[5.1560] → [5.1560:1666]

      CCTK_VERROR("statecomp_t::lincomb.z %s contains nans",
                  z.varnames.at(n).c_str());

[5.1560]

[3.3395]

      CCTK_VERROR("statecomp_t::lincomb.z: Group %s contains nans",
                  z.groupnames.at(n).c_str());

Replacement in ODESolvers/src/solve.cxx at line 187 [3.541]
B:BD[3.3606] → [3.3606:3646]
```
  const CCTK_REAL dt = CCTK_DELTA_TIME;
```
[3.3606]
[3.3646]
```
  const CCTK_REAL dt = cctk_delta_time;
```

Replacement in ODESolvers/src/solve.cxx at line 203 [3.541]

B:BD[4.1245] → [4.1245:1302]

∅:D[4.1302] → [5.2769:2803]

∅:D[6.184] → [5.2769:2803]

B:BD[3.4077] → [5.2769:2803]

B:BD[5.2803] → [4.1303:1497]

∅:D[4.1497] → [5.2867:2901]

∅:D[6.310] → [5.2867:2901]

B:BD[3.4137] → [5.2867:2901]

B:BD[5.2901] → [4.1498:1704]

B:BD[4.1704] → [2.18:75]

∅:D[4.1704] → [3.4201:4211]

∅:D[2.75] → [3.4201:4211]

∅:D[6.444] → [3.4201:4211]

B:BD[3.4201] → [3.4201:4211]

        for (int vi = 0; vi < groupdata.numvars; ++vi) {
          var.varnames.push_back(
              CCTK_FullVarName(groupdata.firstvarindex + vi));
          var.varids.push_back(varid_t{groupdata.groupindex, vi, tl});
          var.mfabs.push_back(groupdata.mfab.at(tl).get());
          rhs.varnames.push_back(
              CCTK_FullVarName(rhs_groupdata.firstvarindex + vi));
          rhs.varids.push_back(varid_t{rhs_groupdata.groupindex, vi, tl});
          rhs.mfabs.push_back(rhs_groupdata.mfab.at(tl).get());
          if (leveldata.level == 0)
            ++nvars;
        }

[4.1245]

[3.4211]

        var.groupnames.push_back(CCTK_GroupName(groupdata.groupindex));
        var.groupids.push_back(groupdata.groupindex);
        var.mfabs.push_back(groupdata.mfab.at(tl).get());
        rhs.groupnames.push_back(CCTK_GroupName(rhs_groupdata.groupindex));
        rhs.groupids.push_back(rhs_groupdata.groupindex);
        rhs.mfabs.push_back(rhs_groupdata.mfab.at(tl).get());
        if (leveldata.level == 0)
          nvars += groupdata.numvars;