eschnett/cactusamrex - Change 24A4OZBZBQ6QXIQ3EOOCQIBTOWRA32TMSQ4CCL3LKIJVJPKZFHVQC

Make interpolation order choice more generic

Created by Erik Schnetter on August 27, 2019

24A4OZBZBQ6QXIQ3EOOCQIBTOWRA32TMSQ4CCL3LKIJVJPKZFHVQC

Dependencies

In channels

master

main

Change contents

Replacement in AMReX/param.ccl at line 157 [4.17918]

B:BD[3.58] → [3.58:133]

  0 :: "piecewise continuous"
  1 :: "linear"
  2 :: "quadratic"
  4 :: ""

[3.58]

[5.0]

  0:* :: ""

Replacement in AMReX/src/driver.cxx at line 4 [4.15972]
B:BD[6.36] → [3.134:167]
```
#include "prolongate_3d_rf2.hxx"
```
[6.36]
[3.167]
```
#include "prolongate_3d_vc_rf2.hxx"
```
Deletion in AMReX/src/driver.cxx at line 15 [4.15972]
B:BD[7.1022] → [7.1022:1054]
```
#include <AMReX_Interpolater.H>
```

Replacement in AMReX/src/driver.cxx at line 176 [4.15972]

B:BD[7.2450] → [3.192:227]

Interpolater *get_interpolator() {

[7.2450]

[3.227]

Interpolater *get_interpolator(const array<int, dim> indextype) {

Replacement in AMReX/src/driver.cxx at line 178 [4.15972]

B:BD[3.254] → [3.254:449]

  switch (prolongation_order) {
  case 0:
    return &pc_interp;
  case 1:
    return &cell_bilinear_interp;
  case 2:
    return &quadratic_interp;
  case 4:
    return &prolongate3d_cc_rf2_o4;

[3.254]

[3.449]


  if (indextype == array<int, dim>{0, 0, 0}) {
    // Vertex centred
    switch (prolongation_order) {
    case 1:
      return &node_bilinear_interp;
    case 5:
      return &prolongate3d_vc_rf2_o5;
    }

Insertion in AMReX/src/driver.cxx at line 188 [4.15972]

[3.453]


  if (indextype == array<int, dim>{1, 1, 1}) {
    // Cell centred
    switch (prolongation_order) {
    case 0:
      return &pc_interp;
    case 1:
      return &cell_bilinear_interp;
    case 2:
      return &quadratic_interp;
    case 4:
      return &prolongate3d_cc_rf2_o4;
    }
  }

Deletion in AMReX/src/driver.cxx at line 235 [4.15972]
B:BD[7.2799] → [3.470:527]
```
  Interpolater *const interpolator = get_interpolator();
```

Insertion in AMReX/src/driver.cxx at line 242 [4.15972]

[7.3180]

    Interpolater *const interpolator = get_interpolator(groupdata.indextype);

Deletion in AMReX/src/driver.cxx at line 309 [4.15972]
B:BD[7.4233] → [3.564:621]
```
  Interpolater *const interpolator = get_interpolator();
```

Insertion in AMReX/src/driver.cxx at line 337 [4.15972]

[8.2320]

[7.5501]

    Interpolater *const interpolator = get_interpolator(groupdata.indextype);

Insertion in AMReX/src/driver.hxx at line 15 [4.15275]
[9.3199]
[4.15427]
```
#include <AMReX_Interpolater.H>
```
Insertion in AMReX/src/driver.hxx at line 18 [4.15275]
[4.15498]
[10.2172]
```
#include <array>
```
Insertion in AMReX/src/driver.hxx at line 113 [4.15275]
[4.15908]
[11.4387]
```
Interpolater *get_interpolator(const array<int, dim> indextype);
```

Replacement in AMReX/src/make.code.defn at line 4 [4.15114]

B:BD[4.15192] → [6.180:299]

SRCS = driver.cxx io.cxx level.cxx prolongate_3d_cc_rf2.cxx prolongate_3d_rf2.cxx reduction.cxx schedule.cxx timer.cxx

[4.15192]

[4.15209]

SRCS = driver.cxx io.cxx level.cxx prolongate_3d_cc_rf2.cxx prolongate_3d_vc_rf2.cxx reduction.cxx schedule.cxx timer.cxx

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 22 [6.327]

B:BD[6.636] → [6.636:941]

static inline size_t index3(size_t const i, size_t const j, size_t const k,
                            size_t const padexti, size_t const padextj,
                            size_t const padextk, size_t const exti,
                            size_t const extj, size_t const extk) {
#ifdef CARPET_DEBUG

[6.636]

[6.941]

namespace {
inline size_t index3(size_t const i, size_t const j, size_t const k,
                     size_t const padexti, size_t const padextj,
                     size_t const padextk, size_t const exti, size_t const extj,
                     size_t const extk) {
#ifdef CACTUS_DEBUG

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 38 [6.327]

B:BD[6.1140] → [6.1140:1270]

template <typename T> inline T ipow_helper(T x, unsigned int y) {                                         T z = y & 1 ? x : T(1);

[6.1140]

[6.1270]

template <typename T> inline T ipow_helper(T x, unsigned int y) {
  T z = y & 1 ? x : T(1);

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 42 [6.327]

B:BD[6.1302] → [6.1302:1420]

    if (y & 1)                                                                                                z *= x;

[6.1302]

[6.1420]

    if (y & 1)
      z *= x;

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 46 [6.327]

B:BD[6.1436] → [6.1436:1541]

[6.1436]

[6.1541]

Insertion in AMReX/src/prolongate_3d_cc_rf2.cxx at line 53 [6.327]
[6.1683]
[6.1683]
```
} // namespace
```
Deletion in AMReX/src/prolongate_3d_cc_rf2.cxx at line 137 [6.327]
B:BD[6.4109] → [6.4109:4110]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 328 [6.327]

B:BD[6.11476] → [6.11476:11636]

    T *restrict const dst,
    int const *restrict flo, int const *restrict fhi, //dstpadext,
    int const *restrict fblo, int const *restrict fbhi, //dstext,

[6.11476]

[6.11636]

    T *restrict const dst, int const *restrict flo,
    int const *restrict fhi,                            // dstpadext,
    int const *restrict fblo, int const *restrict fbhi, // dstext,

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 332 [6.327]

B:BD[6.11715] → [6.11715:11804]

    T const *restrict const src,
    int const *restrict clo, int const *restrict chi) {

[6.11715]

[6.11804]

    T const *restrict const src, int const *restrict clo,
    int const *restrict chi) {

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 341 [6.327]
B:BD[6.11976] → [6.11976:12028]
```
  //if (any(srcbbox.stride() <= regbbox.stride() or
```
[6.11976]
[6.12028]
```
  // if (any(srcbbox.stride() <= regbbox.stride() or
```

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 346 [6.327]

B:BD[6.12144] → [6.12144:12208]

  //if (any(srcbbox.stride() != reffact2 * dstbbox.stride())) {

[6.12144]

[6.12208]

  // if (any(srcbbox.stride() != reffact2 * dstbbox.stride())) {

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 349 [6.327]

B:BD[6.12238] → [6.12238:12321]

  //      "Internal error: source strides are not twice the destination strides");

[6.12238]

[6.12321]

  //      "Internal error: source strides are not twice the destination
  //      strides");

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 353 [6.327]
B:BD[6.12328] → [6.12328:12370]
```
  //if (any(dstbbox.stride() % 2 != 0)) {
```
[6.12328]
[6.12370]
```
  // if (any(dstbbox.stride() % 2 != 0)) {
```
Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 359 [6.327]
B:BD[6.12527] → [6.12527:12554]
```
  //if (regbbox.empty()) {
```
[6.12527]
[6.12554]
```
  // if (regbbox.empty()) {
```

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 363 [6.327]

B:BD[6.12623] → [6.12623:12794]

  int const regext[3] = {fbhi[0] - fblo[0] + 1, fbhi[1] - fblo[1] + 1, fbhi[2] - fblo[2] + 1};
  //assert(all((regbbox.lower() - srcbbox.lower() + regbbox.stride() / 2) %

[6.12623]

[6.12794]

  int const regext[3] = {fbhi[0] - fblo[0] + 1, fbhi[1] - fblo[1] + 1,
                         fbhi[2] - fblo[2] + 1};
  // assert(all((regbbox.lower() - srcbbox.lower() + regbbox.stride() / 2) %

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 368 [6.327]

B:BD[6.12853] → [6.12853:13012]

  int const srcoff[3] = {
      (2 * fblo[0] - 1 - 4*clo[0] + 1) / 2,
      (2 * fblo[1] - 1 - 4*clo[1] + 1) / 2,
      (2 * fblo[2] - 1 - 4*clo[2] + 1) / 2};

[6.12853]

[6.13012]

  int const srcoff[3] = {(2 * fblo[0] - 1 - 4 * clo[0] + 1) / 2,
                         (2 * fblo[1] - 1 - 4 * clo[1] + 1) / 2,
                         (2 * fblo[2] - 1 - 4 * clo[2] + 1) / 2};

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 373 [6.327]

B:BD[6.13107] → [6.13107:13185]

  //assert(all((regbbox.lower() - dstbbox.lower()) % regbbox.stride() == 0));

[6.13107]

[6.13185]

  // assert(all((regbbox.lower() - dstbbox.lower()) % regbbox.stride() == 0));

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 378 [6.327]
B:BD[6.13343] → [6.13343:13374]
```
  //ivect3 offsetlo, offsethi;
```
[6.13343]
[6.13374]
```
  // ivect3 offsetlo, offsethi;
```

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 402 [6.327]

B:BD[6.14139] → [6.14139:14214]

  //if (not regbbox.expand(offsetlo, offsethi).is_contained_in(srcbbox) or

[6.14139]

[6.14214]

  // if (not regbbox.expand(offsetlo, offsethi).is_contained_in(srcbbox) or

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 412 [6.327]

B:BD[6.14624] → [6.14624:14707]

  //            "Internal error: region extent is not contained in array extent");

[6.14624]

[6.14707]

  //            "Internal error: region extent is not contained in array
  //            extent");

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 416 [6.327]

B:BD[6.14714] → [6.14714:14909]

  size_t const srcipadext = chi[0] - clo[0] + 1; //srcpadext[0];
  size_t const srcjpadext = chi[1] - clo[1] + 1; //srcpadext[1];
  size_t const srckpadext = chi[2] - clo[2] + 1; //srcpadext[2];

[6.14714]

[6.14909]

  size_t const srcipadext = chi[0] - clo[0] + 1; // srcpadext[0];
  size_t const srcjpadext = chi[1] - clo[1] + 1; // srcpadext[1];
  size_t const srckpadext = chi[2] - clo[2] + 1; // srcpadext[2];

Deletion in AMReX/src/prolongate_3d_cc_rf2.cxx at line 673 [6.327]
B:BD[6.20091] → [6.20091:20092]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 677 [6.327]

B:BD[6.20137] → [6.20137:20214]

template <int ORDER>
Prolongate3D_CC_RF2<ORDER>::~Prolongate3D_CC_RF2 () { }

[6.20137]

[6.20214]

template <int ORDER> Prolongate3D_CC_RF2<ORDER>::~Prolongate3D_CC_RF2() {}

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 680 [6.327]

B:BD[6.20236] → [6.20236:20309]

Box
Prolongate3D_CC_RF2<ORDER>::CoarseBox (const Box& fine, int ratio)
{

[6.20236]

[6.20309]

Box Prolongate3D_CC_RF2<ORDER>::CoarseBox(const Box &fine, int ratio) {

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 684 [6.327]
B:BD[6.20375] → [6.20375:20396]
```
  b.grow(ORDER/2+1);
```
[6.20375]
[6.20396]
```
  b.grow(ORDER / 2 + 1);
```

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 690 [6.327]

B:BD[6.20433] → [6.20433:20517]

Box
Prolongate3D_CC_RF2<ORDER>::CoarseBox (const Box& fine, const IntVect& ratio)
{

[6.20433]

[6.20517]

Box Prolongate3D_CC_RF2<ORDER>::CoarseBox(const Box &fine,
                                          const IntVect &ratio) {

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 695 [6.327]
B:BD[6.20583] → [6.20583:20604]
```
  b.grow(ORDER/2+1);
```
[6.20583]
[6.20604]
```
  b.grow(ORDER / 2 + 1);
```

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 701 [6.327]

B:BD[6.20641] → [6.20641:21511]

void
Prolongate3D_CC_RF2<ORDER>::interp (const FArrayBox& crse,
                         int              crse_comp,
                         FArrayBox&       fine,
                         int              fine_comp,
                         int              ncomp,
                         const Box&       fine_region,
                         const IntVect&   ratio,
                         const Geometry&  crse_geom,
                         const Geometry&  fine_geom,
                         Vector<BCRec> const& bcr,
                         int              actual_comp,
                         int              actual_state,
                         RunOn            gpu_or_cpu)
{
    assert(bcr.size() >= ncomp);
    //
    // Make box which is intersection of fine_region and domain of fine.
    //
    Box target_fine_region = fine_region & fine.box();

[6.20641]

[6.21511]

void Prolongate3D_CC_RF2<ORDER>::interp(
    const FArrayBox &crse, int crse_comp, FArrayBox &fine, int fine_comp,
    int ncomp, const Box &fine_region, const IntVect &ratio,
    const Geometry &crse_geom, const Geometry &fine_geom,
    Vector<BCRec> const &bcr, int actual_comp, int actual_state,
    RunOn gpu_or_cpu) {
  assert(bcr.size() >= ncomp);
  //
  // Make box which is intersection of fine_region and domain of fine.
  //
  Box target_fine_region = fine_region & fine.box();

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 713 [6.327]

B:BD[6.21512] → [6.21512:22604]

    //Box crse_bx(amrex::coarsen(target_fine_region,ratio));
    
    //
    // Get coarse and fine edge-centered volume coordinates.
    //
    // TODO: do not use AMREX macro
    /*
    Vector<CCTK_REAL> fvc[AMREX_SPACEDIM];
    Vector<CCTK_REAL> cvc[AMREX_SPACEDIM];
    for (int dir = 0; dir < AMREX_SPACEDIM; dir++)
    {
        fine_geom.GetEdgeVolCoord(fvc[dir],target_fine_region,dir);
        crse_geom.GetEdgeVolCoord(cvc[dir],crse_bx,dir);
    }
    */
    for (int var = 0 ; var < ncomp ; ++var) {
      CCTK_REAL* fdat        = fine.dataPtr(fine_comp + var);
      const CCTK_REAL* cdat  = crse.dataPtr(crse_comp + var);
      const int* flo    = fine.loVect();
      const int* fhi    = fine.hiVect();
      const int* fblo   = target_fine_region.loVect();
      const int* fbhi   = target_fine_region.hiVect();
      const int* clo    = crse.loVect();
      const int* chi    = crse.hiVect();
      //const int* cblo   = crse_bx.loVect();
      //const int* cbhi   = crse_bx.hiVect();
      //Vector<int> bc     = GetBCArray(bcr);
      //const int* ratioV = ratio.getVect();

[6.21512]

[6.22604]

  // Box crse_bx(amrex::coarsen(target_fine_region,ratio));

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 715 [6.327]

B:BD[6.22605] → [6.22605:22675]

      CarpetLib::prolongate_3d_cc_rf2<CCTK_REAL, ORDER>(fdat,flo,fhi,

[6.22605]

[6.22675]

  //
  // Get coarse and fine edge-centered volume coordinates.
  //
  // TODO: do not use AMREX macro
  /*
  Vector<CCTK_REAL> fvc[AMREX_SPACEDIM];
  Vector<CCTK_REAL> cvc[AMREX_SPACEDIM];
  for (int dir = 0; dir < AMREX_SPACEDIM; dir++)
  {
      fine_geom.GetEdgeVolCoord(fvc[dir],target_fine_region,dir);
      crse_geom.GetEdgeVolCoord(cvc[dir],crse_bx,dir);
  }
  */
  for (int var = 0; var < ncomp; ++var) {
    CCTK_REAL *fdat = fine.dataPtr(fine_comp + var);
    const CCTK_REAL *cdat = crse.dataPtr(crse_comp + var);
    const int *flo = fine.loVect();
    const int *fhi = fine.hiVect();
    const int *fblo = target_fine_region.loVect();
    const int *fbhi = target_fine_region.hiVect();
    const int *clo = crse.loVect();
    const int *chi = crse.hiVect();
    // const int* cblo   = crse_bx.loVect();
    // const int* cbhi   = crse_bx.hiVect();
    // Vector<int> bc     = GetBCArray(bcr);
    // const int* ratioV = ratio.getVect();
    CarpetLib::prolongate_3d_cc_rf2<CCTK_REAL, ORDER>(fdat,flo,fhi,

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 752 [6.327]
B:BD[6.23108] → [6.23108:23114]
```
    }
```
[6.23108]
[6.23114]
```
  }
```
File move: prolongate_3d_rf2.cxx → prolongate_3d_vc_rf2.cxx
BF:BFD[4.15096] → [12.155:178]
[4.15096]
[12.179]
Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 1 [12.179]
B:BD[12.179] → [12.180:213]
```
#include "prolongate_3d_rf2.hxx"
```
[12.179]
[12.213]
```
#include "prolongate_3d_vc_rf2.hxx"
```

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 22 [12.179]

B:BD[12.485] → [12.485:790]

static inline size_t index3(size_t const i, size_t const j, size_t const k,
                            size_t const padexti, size_t const padextj,
                            size_t const padextk, size_t const exti,
                            size_t const extj, size_t const extk) {
#ifdef CARPET_DEBUG

[12.485]

[12.790]

namespace {
inline size_t index3(size_t const i, size_t const j, size_t const k,
                     size_t const padexti, size_t const padextj,
                     size_t const padextk, size_t const exti, size_t const extj,
                     size_t const extk) {
#ifdef CACTUS_DEBUG

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 38 [12.179]

B:BD[12.989] → [12.989:1119]

template <typename T> inline T ipow_helper(T x, unsigned int y) {                                         T z = y & 1 ? x : T(1);

[12.989]

[12.1119]

template <typename T> inline T ipow_helper(T x, unsigned int y) {
  T z = y & 1 ? x : T(1);

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 42 [12.179]

B:BD[12.1151] → [12.1151:1269]

    if (y & 1)                                                                                                z *= x;

[12.1151]

[12.1269]

    if (y & 1)
      z *= x;

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 46 [12.179]

B:BD[12.1285] → [12.1285:1390]

[12.1285]

[12.1390]

Insertion in AMReX/src/prolongate_3d_vc_rf2.cxx at line 53 [12.179]
[12.1532]
[12.1532]
```
} // namespace
```
Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 115 [12.179]
B:BD[12.3175] → [12.3175:3209]
```
  static const RT
      coeffs[];
```
[12.3175]
[12.3209]
```
  static const RT coeffs[];
```
Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 442 [12.179]
B:BD[12.15911] → [12.15911:15963]
```
  //if (any(srcbbox.stride() <= regbbox.stride() or
```
[12.15911]
[12.15963]
```
  // if (any(srcbbox.stride() <= regbbox.stride() or
```

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 446 [12.179]

B:BD[12.16069] → [12.16069:16131]

  //if (any(srcbbox.stride() != reffact2 * dstbbox.stride()))

[12.16069]

[12.16131]

  // if (any(srcbbox.stride() != reffact2 * dstbbox.stride()))

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 448 [12.179]

B:BD[12.16149] → [12.16149:16232]

  //      "Internal error: source strides are not twice the destination strides");

[12.16149]

[12.16232]

  //      "Internal error: source strides are not twice the destination
  //      strides");

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 451 [12.179]
B:BD[12.16233] → [12.16233:16287]
```
  //if (any(srcbbox.lower() % srcbbox.stride() != 0))
```
[12.16233]
[12.16287]
```
  // if (any(srcbbox.lower() % srcbbox.stride() != 0))
```

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 453 [12.179]

B:BD[12.16365] → [12.16365:16556]

  //if (any(dstbbox.lower() % dstbbox.stride() != 0))
  //  CCTK_ERROR("Internal error: destination bbox is not aligned with vertices");
  //if (any(regbbox.lower() % regbbox.stride() != 0))

[12.16365]

[12.16556]

  // if (any(dstbbox.lower() % dstbbox.stride() != 0))
  //  CCTK_ERROR("Internal error: destination bbox is not aligned with
  //  vertices");
  // if (any(regbbox.lower() % regbbox.stride() != 0))

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 461 [12.179]
B:BD[12.16741] → [12.16741:16766]
```
  //if (regbbox.empty())
```
[12.16741]
[12.16766]
```
  // if (regbbox.empty())
```

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 464 [12.179]

B:BD[12.16827] → [12.16827:17000]

B:BD[12.17000] → [2.0:86]

∅:D[2.86] → [12.17033:17111]

∅:D[13.158] → [12.17033:17111]

B:BD[12.17033] → [12.17033:17111]

  int const regext[3] = {fbhi[0] - fblo[0] + 1, fbhi[1] - fblo[1] + 1, fbhi[2] - fblo[2] + 1};
  //assert(all((regbbox.lower() - srcbbox.lower()) % regbbox.stride() == 0));
  int const srcoff[3] = {fblo[0] - 2*clo[0], fblo[1] - 2*clo[1], fblo[2] - 2*clo[2]};
  //assert(all((regbbox.lower() - dstbbox.lower()) % regbbox.stride() == 0));

[12.16827]

[13.159]

  int const regext[3] = {fbhi[0] - fblo[0] + 1, fbhi[1] - fblo[1] + 1,
                         fbhi[2] - fblo[2] + 1};
  // assert(all((regbbox.lower() - srcbbox.lower()) % regbbox.stride() == 0));
  int const srcoff[3] = {fblo[0] - 2 * clo[0], fblo[1] - 2 * clo[1],
                         fblo[2] - 2 * clo[2]};
  // assert(all((regbbox.lower() - dstbbox.lower()) % regbbox.stride() == 0));

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 472 [12.179]

B:BD[12.17145] → [12.17145:17346]

  //bvect3 const needoffsetlo = srcoff % reffact2 != 0;
  //bvect3 const needoffsethi = (srcoff + regext - 1) % reffact2 != 0;
  //int const offsetlo[3] = {0,0,0};
  //int const offsethi[3] = {0,0,0};

[12.17145]

[12.17346]

  // bvect3 const needoffsetlo = srcoff % reffact2 != 0;
  // bvect3 const needoffsethi = (srcoff + regext - 1) % reffact2 != 0;
  // int const offsetlo[3] = {0,0,0};
  // int const offsethi[3] = {0,0,0};

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 477 [12.179]

B:BD[12.17347] → [12.17347:17422]

  //if (not regbbox.expand(offsetlo, offsethi).is_contained_in(srcbbox) or

[12.17347]

[12.17422]

  // if (not regbbox.expand(offsetlo, offsethi).is_contained_in(srcbbox) or

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 490 [12.179]

B:BD[12.17915] → [12.17915:18110]

  size_t const srcipadext = chi[0] - clo[0] + 1; //srcpadext[0];
  size_t const srcjpadext = chi[1] - clo[1] + 1; //srcpadext[1];
  size_t const srckpadext = chi[2] - clo[2] + 1; //srcpadext[2];

[12.17915]

[12.18110]

  size_t const srcipadext = chi[0] - clo[0] + 1; // srcpadext[0];
  size_t const srcjpadext = chi[1] - clo[1] + 1; // srcpadext[1];
  size_t const srckpadext = chi[2] - clo[2] + 1; // srcpadext[2];

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 759 [12.179]

B:BD[12.23343] → [12.23343:23420]

template <int ORDER>
Prolongate3D_VC_RF2<ORDER>::~Prolongate3D_VC_RF2 () { }

[12.23343]

[12.23420]

template <int ORDER> Prolongate3D_VC_RF2<ORDER>::~Prolongate3D_VC_RF2() {}

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 762 [12.179]

B:BD[12.23442] → [12.23442:23515]

Box
Prolongate3D_VC_RF2<ORDER>::CoarseBox (const Box& fine, int ratio)
{

[12.23442]

[12.23515]

Box Prolongate3D_VC_RF2<ORDER>::CoarseBox(const Box &fine, int ratio) {

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 766 [12.179]
B:BD[12.23576] → [13.474:495]
```
  b.grow(ORDER/2+1);
```
[12.23576]
[12.23595]
```
  b.grow(ORDER / 2 + 1);
```

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 772 [12.179]

B:BD[12.23632] → [12.23632:23716]

Box
Prolongate3D_VC_RF2<ORDER>::CoarseBox (const Box& fine, const IntVect& ratio)
{

[12.23632]

[12.23716]

Box Prolongate3D_VC_RF2<ORDER>::CoarseBox(const Box &fine,
                                          const IntVect &ratio) {

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 777 [12.179]
B:BD[12.23777] → [13.496:517]
```
  b.grow(ORDER/2+1);
```
[12.23777]
[12.23796]
```
  b.grow(ORDER / 2 + 1);
```

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 783 [12.179]

B:BD[12.23833] → [12.23833:24703]

void
Prolongate3D_VC_RF2<ORDER>::interp (const FArrayBox& crse,
                         int              crse_comp,
                         FArrayBox&       fine,
                         int              fine_comp,
                         int              ncomp,
                         const Box&       fine_region,
                         const IntVect&   ratio,
                         const Geometry&  crse_geom,
                         const Geometry&  fine_geom,
                         Vector<BCRec> const& bcr,
                         int              actual_comp,
                         int              actual_state,
                         RunOn            gpu_or_cpu)
{
    assert(bcr.size() >= ncomp);
    //
    // Make box which is intersection of fine_region and domain of fine.
    //
    Box target_fine_region = fine_region & fine.box();

[12.23833]

[12.24703]

void Prolongate3D_VC_RF2<ORDER>::interp(
    const FArrayBox &crse, int crse_comp, FArrayBox &fine, int fine_comp,
    int ncomp, const Box &fine_region, const IntVect &ratio,
    const Geometry &crse_geom, const Geometry &fine_geom,
    Vector<BCRec> const &bcr, int actual_comp, int actual_state,
    RunOn gpu_or_cpu) {
  assert(bcr.size() >= ncomp);
  //
  // Make box which is intersection of fine_region and domain of fine.
  //
  Box target_fine_region = fine_region & fine.box();

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 795 [12.179]

B:BD[12.24704] → [12.24704:25169]

B:BD[12.25169] → [13.518:1145]

    //Box crse_bx(amrex::coarsen(target_fine_region,ratio));
    
    //
    // Get coarse and fine edge-centered volume coordinates.
    //
    // TODO: do not use AMREX macro
    /*
    Vector<CCTK_REAL> fvc[AMREX_SPACEDIM];
    Vector<CCTK_REAL> cvc[AMREX_SPACEDIM];
    for (int dir = 0; dir < AMREX_SPACEDIM; dir++)
    {
        fine_geom.GetEdgeVolCoord(fvc[dir],target_fine_region,dir);
        crse_geom.GetEdgeVolCoord(cvc[dir],crse_bx,dir);
    }
    */
    for (int var = 0 ; var < ncomp ; ++var) {
      CCTK_REAL* fdat        = fine.dataPtr(fine_comp + var);
      const CCTK_REAL* cdat  = crse.dataPtr(crse_comp + var);
      const int* flo    = fine.loVect();
      const int* fhi    = fine.hiVect();
      const int* fblo   = target_fine_region.loVect();
      const int* fbhi   = target_fine_region.hiVect();
      const int* clo    = crse.loVect();
      const int* chi    = crse.hiVect();
      //const int* cblo   = crse_bx.loVect();
      //const int* cbhi   = crse_bx.hiVect();
      //Vector<int> bc     = GetBCArray(bcr);
      //const int* ratioV = ratio.getVect();

[12.24704]

[12.25710]

  // Box crse_bx(amrex::coarsen(target_fine_region,ratio));

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 797 [12.179]

B:BD[12.25711] → [13.1146:1213]

      CarpetLib::prolongate_3d_rf2<CCTK_REAL, ORDER>(fdat,flo,fhi,

[12.25711]

[13.1213]

  //
  // Get coarse and fine edge-centered volume coordinates.
  //
  // TODO: do not use AMREX macro
  /*
  Vector<CCTK_REAL> fvc[AMREX_SPACEDIM];
  Vector<CCTK_REAL> cvc[AMREX_SPACEDIM];
  for (int dir = 0; dir < AMREX_SPACEDIM; dir++)
  {
      fine_geom.GetEdgeVolCoord(fvc[dir],target_fine_region,dir);
      crse_geom.GetEdgeVolCoord(cvc[dir],crse_bx,dir);
  }
  */
  for (int var = 0; var < ncomp; ++var) {
    CCTK_REAL *fdat = fine.dataPtr(fine_comp + var);
    const CCTK_REAL *cdat = crse.dataPtr(crse_comp + var);
    const int *flo = fine.loVect();
    const int *fhi = fine.hiVect();
    const int *fblo = target_fine_region.loVect();
    const int *fbhi = target_fine_region.hiVect();
    const int *clo = crse.loVect();
    const int *chi = crse.hiVect();
    // const int* cblo   = crse_bx.loVect();
    // const int* cbhi   = crse_bx.hiVect();
    // Vector<int> bc     = GetBCArray(bcr);
    // const int* ratioV = ratio.getVect();
    CarpetLib::prolongate_3d_rf2<CCTK_REAL, ORDER>(fdat,flo,fhi,

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 834 [12.179]
B:BD[13.1646] → [13.1646:1652]
```
    }
```
[13.1646]
[12.26187]
```
  }
```
Deletion in AMReX/src/prolongate_3d_vc_rf2.cxx at line 839 [12.179]
B:BD[12.26258] → [12.26258:26259]
File move: prolongate_3d_rf2.hxx → prolongate_3d_vc_rf2.hxx
BF:BFD[4.15096] → [12.26260:26283]
[4.15096]
[12.26284]
Deletion in AMReX/src/schedule.cxx at line 4 [16.531]
B:BD[14.5190] → [15.177:210]
B:BD[15.210] → [6.25284:25320]
```
#include "prolongate_3d_rf2.hxx"
#include "prolongate_3d_cc_rf2.hxx"
```

Insertion in AMReX/src/schedule.cxx at line 1148 [16.531]

[17.1081]


        Interpolater *const interpolator =
            get_interpolator(groupdata.indextype);

Replacement in AMReX/src/schedule.cxx at line 1175 [16.531]

B:BD[18.11642] → [19.143:224]

              cphysbc, 0, fphysbc, 0, reffact, &prolongate3d_cc_rf2_o4, bcs, 0);

[18.11642]

[10.11314]

              cphysbc, 0, fphysbc, 0, reffact, interpolator, bcs, 0);

Make interpolation order choice more generic

Dependencies

In channels

Change contents

Replacement in AMReX/param.ccl at line 157 [4.17918]

Replacement in AMReX/src/driver.cxx at line 4 [4.15972]

Deletion in AMReX/src/driver.cxx at line 15 [4.15972]

Replacement in AMReX/src/driver.cxx at line 176 [4.15972]

Replacement in AMReX/src/driver.cxx at line 178 [4.15972]

Insertion in AMReX/src/driver.cxx at line 188 [4.15972]

Deletion in AMReX/src/driver.cxx at line 235 [4.15972]

Insertion in AMReX/src/driver.cxx at line 242 [4.15972]

Deletion in AMReX/src/driver.cxx at line 309 [4.15972]

Insertion in AMReX/src/driver.cxx at line 337 [4.15972]

Insertion in AMReX/src/driver.hxx at line 15 [4.15275]

Insertion in AMReX/src/driver.hxx at line 18 [4.15275]

Insertion in AMReX/src/driver.hxx at line 113 [4.15275]

Replacement in AMReX/src/make.code.defn at line 4 [4.15114]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 22 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 38 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 42 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 46 [6.327]

Insertion in AMReX/src/prolongate_3d_cc_rf2.cxx at line 53 [6.327]

Deletion in AMReX/src/prolongate_3d_cc_rf2.cxx at line 137 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 328 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 332 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 341 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 346 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 349 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 353 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 359 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 363 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 368 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 373 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 378 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 402 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 412 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 416 [6.327]

Deletion in AMReX/src/prolongate_3d_cc_rf2.cxx at line 673 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 677 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 680 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 684 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 690 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 695 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 701 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 713 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 715 [6.327]

Replacement in AMReX/src/prolongate_3d_cc_rf2.cxx at line 752 [6.327]

File move: prolongate_3d_rf2.cxx → prolongate_3d_vc_rf2.cxx

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 1 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 22 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 38 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 42 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 46 [12.179]

Insertion in AMReX/src/prolongate_3d_vc_rf2.cxx at line 53 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 115 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 442 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 446 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 448 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 451 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 453 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 461 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 464 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 472 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 477 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 490 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 759 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 762 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 766 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 772 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 777 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 783 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 795 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 797 [12.179]

Replacement in AMReX/src/prolongate_3d_vc_rf2.cxx at line 834 [12.179]

Deletion in AMReX/src/prolongate_3d_vc_rf2.cxx at line 839 [12.179]

File move: prolongate_3d_rf2.hxx → prolongate_3d_vc_rf2.hxx

Deletion in AMReX/src/schedule.cxx at line 4 [16.531]

Insertion in AMReX/src/schedule.cxx at line 1148 [16.531]

Replacement in AMReX/src/schedule.cxx at line 1175 [16.531]