eschnett/cactusamrex - Change WV2J4VRLSW42SGIRDLF326LLC7L2ABAMSZ3YKABS532K27U3X3CAC

AMReX: Allocate grid scalars as vector, not as vector of pointers

Created by Erik Schnetter on October 18, 2019

WV2J4VRLSW42SGIRDLF326LLC7L2ABAMSZ3YKABS532K27U3X3CAC

Dependencies

In channels

master

main

Change contents

Deletion in AMReX/src/driver.cxx at line 160 [5.15972]

B:BD[3.206] → [4.177:269]

      scalargroupdata.data.at(tl).at(0) =
          new CCTK_REAL[scalargroupdata.numvars];

Deletion in AMReX/src/driver.cxx at line 161 [5.15972]
B:BD[6.1610] → [6.1610:1663]
B:BD[6.1663] → [4.270:367]
∅:D[4.367] → [6.1723:1724]
∅:D[7.168] → [6.1723:1724]
B:BD[6.1723] → [6.1723:1724]
```
        // TODO: find out something that avoid new ?
        scalargroupdata.data.at(tl).at(vi) =
            scalargroupdata.data.at(tl).at(0) + vi;
```

Replacement in AMReX/src/driver.hxx at line 109 [5.15275]

B:BD[6.2887] → [6.2887:3027]

B:BD[6.3027] → [2.0:30]

∅:D[2.30] → [6.3027:3095]

B:BD[6.3027] → [6.3027:3095]

      // TODO: find out how to do this without a pointer to a single double but
      // also working around const vector<CCTK_REAL> issues
      // TODO: use unique_ptr
      vector<vector<CCTK_REAL *> > data; // [time level][var index]

[6.2887]

[6.3095]

      vector<vector<CCTK_REAL> > data; // [time level][var index]

Replacement in AMReX/src/io.cxx at line 344 [8.107]

B:BD[6.5381] → [6.5381:5440]

      file << "\t" << *scalargroupdata.data.at(tl).at(vi);

[6.5381]

[9.2278]

      file << "\t" << scalargroupdata.data.at(tl).at(vi);

Replacement in AMReX/src/schedule.cxx at line 345 [11.531]

B:BD[6.6059] → [6.6059:6131]

    CCTK_REAL *restrict const ptr = scalargroupdata.data.at(tl).at(vi);

[6.6059]

[6.6131]

    CCTK_REAL *restrict const ptr =
        const_cast<CCTK_REAL *>(&scalargroupdata.data.at(tl).at(vi));

Replacement in AMReX/src/schedule.cxx at line 367 [11.531]

B:BD[6.6643] → [6.6643:6715]

    CCTK_REAL *restrict const ptr = scalargroupdata.data.at(tl).at(vi);

[6.6643]

[6.6715]

    const CCTK_REAL *restrict const ptr = &scalargroupdata.data.at(tl).at(vi);

Replacement in AMReX/src/schedule.cxx at line 525 [11.531]

B:BD[6.7813] → [6.7813:7891]

          cctkGH->data[scalargroupdata.firstvarindex + vi][tl] = vars.at(vi);

[6.7813]

[6.7891]

          cctkGH->data[scalargroupdata.firstvarindex + vi][tl] =
              const_cast<CCTK_REAL *>(&vars.at(vi));