eschnett/cactusamrex - Change ER6QNVNNYMJOPQ3UH3KONKGUIYLCPCR5AIAYD6BVKV43TDU6ZBUQC

CarpetX: Add some std:: declarations to avoid ambiguity

Created by Erik Schnetter on December 18, 2019

ER6QNVNNYMJOPQ3UH3KONKGUIYLCPCR5AIAYD6BVKV43TDU6ZBUQC

Dependencies

In channels

master

main

Change contents

Replacement in CarpetX/src/loop.hxx at line 421 [4.5481]

B:BD[3.6366] → [3.6366:6410]

∅:D[3.6410] → [5.10889:10956]

B:BD[4.7538] → [5.10889:10956]

B:BD[5.10956] → [3.6411:6467]

      imin[d] = max(tmin[d], ghost_offset);
      imax[d] = min(tmax[d] + (tmax[d] >= lsh[d] ? offset[d] : 0),
                    lsh[d] + offset[d] - ghost_offset);

[3.6366]

[4.7576]

      imin[d] = std::max(tmin[d], ghost_offset);
      imax[d] = std::min(tmax[d] + (tmax[d] >= lsh[d] ? offset[d] : 0),
                         lsh[d] + offset[d] - ghost_offset);

Replacement in CarpetX/src/loop.hxx at line 436 [4.5481]

B:BD[4.7778] → [4.7778:7824]

B:BD[4.7824] → [5.11178:11303]

      imin[d] = max(tmin[d], nghostzones[d]);
      imax[d] = min(tmax[d] + (tmax[d] >= lsh[d] ? offset[d] : 0),
                    lsh[d] + offset[d] - nghostzones[d]);

[4.7778]

[4.7879]

      imin[d] = std::max(tmin[d], nghostzones[d]);
      imax[d] = std::min(tmax[d] + (tmax[d] >= lsh[d] ? offset[d] : 0),
                         lsh[d] + offset[d] - nghostzones[d]);

Replacement in CarpetX/src/loop.hxx at line 484 [4.5481]

B:BD[4.8441] → [2.4286:4436]

              imin[d] = max(tmin[d], imin[d]);
              imax[d] =
                  min(tmax[d] + (tmax[d] >= lsh[d] ? offset[d] : 0), imax[d]);

[4.8441]

[4.8724]

              imin[d] = std::max(tmin[d], imin[d]);
              imax[d] = std::min(tmax[d] + (tmax[d] >= lsh[d] ? offset[d] : 0),
                                 imax[d]);

Replacement in CarpetX/src/loop.hxx at line 535 [4.5481]

B:BD[2.6077] → [2.6077:6227]

              imin[d] = max(tmin[d], imin[d]);
              imax[d] =
                  min(tmax[d] + (tmax[d] >= lsh[d] ? offset[d] : 0), imax[d]);

[2.6077]

[2.6227]

              imin[d] = std::max(tmin[d], imin[d]);
              imax[d] = std::min(tmax[d] + (tmax[d] >= lsh[d] ? offset[d] : 0),
                                 imax[d]);