eschnett/cactusamrex - Change NKZ62JLSJQ7WH6ERIPBWSU63CAP4H3GHYCUL6JKQELBY7V33HGOAC

Implement "ddf" prolongation type, a mixture of interpolating and conservative interpolation

Created by Erik Schnetter on October 19, 2019

NKZ62JLSJQ7WH6ERIPBWSU63CAP4H3GHYCUL6JKQELBY7V33HGOAC

Dependencies

In channels

main

master

Change contents

Insertion in AMReX/param.ccl at line 155 [10.17918]

[9.7]

KEYWORD prolongation_type "Prolongation type"
{
  "interpolate" :: "interpolate between data points"
  "conservative" :: "interpolate cell averages, ensuring conservation"
  "ddf" :: "interpolate in vertex centred and conserve in cell centred directions"
} "interpolate"

Deletion in AMReX/param.ccl at line 167 [10.17918]
B:BD[3.1] → [3.1:70]
```
BOOLEAN conservative_prolongation "Conservative prolongation"
{
} no
```
Deletion in AMReX/param.ccl at line 169 [10.17918]
B:BD[3.72] → [3.72:73]

Replacement in AMReX/src/driver.cxx at line 350 [10.15972]

B:BD[11.118] → [3.74:110]

  if (!conservative_prolongation) {

[11.118]

[12.111]

  enum class interp_t { unset, interpolate, conservative, ddf };
  static interp_t interp = interp_t::unset;
  if (interp == interp_t::unset) {
    if (CCTK_EQUALS(prolongation_type, "interpolate")) {
      interp = interp_t::interpolate;
    } else if (CCTK_EQUALS(prolongation_type, "conservative")) {
      interp = interp_t::conservative;
    } else if (CCTK_EQUALS(prolongation_type, "ddf")) {
      interp = interp_t::ddf;
    } else {
      assert(0);
    }
  }
  assert(interp != interp_t::unset);
  switch (interp) {
  case interp_t::interpolate:

Insertion in AMReX/src/driver.cxx at line 442 [10.15972]
[12.834]
[12.845]
```
    break;
```
Replacement in AMReX/src/driver.cxx at line 444 [10.15972]
B:BD[12.846] → [3.1239:1282]
```
  } else { // if conservative_prolongation
```
[12.846]
[3.1282]
```
  case interp_t::conservative:
```

Replacement in AMReX/src/driver.cxx at line 504 [10.15972]

B:BD[12.953] → [3.2451:2487]

  } // if conservative_prolongation

[12.953]

[11.617]

    break;
  case interp_t::ddf:
    switch ((indextype[0] << 2) | (indextype[1] << 1) | (indextype[2] << 0)) {
    case 0b000:
      return &prolongate_ddf_3d_rf2_c000_o1;
    case 0b001:
      return &prolongate_ddf_3d_rf2_c001_o1;
    case 0b010:
      return &prolongate_ddf_3d_rf2_c010_o1;
    case 0b011:
      return &prolongate_ddf_3d_rf2_c011_o1;
    case 0b100:
      return &prolongate_ddf_3d_rf2_c100_o1;
    case 0b101:
      return &prolongate_ddf_3d_rf2_c101_o1;
    case 0b110:
      return &prolongate_ddf_3d_rf2_c110_o1;
    case 0b111:
      return &prolongate_ddf_3d_rf2_c111_o1;
    }
    break;

Replacement in AMReX/src/driver.cxx at line 528 [10.15972]

B:BD[11.618] → [5.0:143]

  CCTK_VERROR("Unsupported index type 0b%d%d%d and for order %d", indextype[0],
              indextype[1], indextype[2], prolongation_order);

[11.618]

[9.453]

  case interp_t::unset:
    // do nothing; errors are handled below
    break;
  } // switch prolongation_type
  CCTK_VERROR("Unsupported combination of prolongation_type \"%s\", "
              "prolongation order %d, and index type [%d,%d,%d]",
              prolongation_type, prolongation_order, indextype[0], indextype[1],
              indextype[2]);

Insertion in AMReX/src/prolongate_3d_rf2.cxx at line 636 [12.1186]

[2.6662]

[12.16526]

prolongate_3d_rf2<0, 0, 0, false, false, false, 1, 1, 1>
    prolongate_ddf_3d_rf2_c000_o1;
prolongate_3d_rf2<0, 0, 1, false, false, true, 1, 1, 0>
    prolongate_ddf_3d_rf2_c001_o1;
prolongate_3d_rf2<0, 1, 0, false, true, false, 1, 0, 1>
    prolongate_ddf_3d_rf2_c010_o1;
prolongate_3d_rf2<0, 1, 1, false, true, true, 1, 0, 0>
    prolongate_ddf_3d_rf2_c011_o1;
prolongate_3d_rf2<1, 0, 0, true, false, false, 0, 1, 1>
    prolongate_ddf_3d_rf2_c100_o1;
prolongate_3d_rf2<1, 0, 1, true, false, true, 0, 1, 0>
    prolongate_ddf_3d_rf2_c101_o1;
prolongate_3d_rf2<1, 1, 0, true, true, false, 0, 0, 1>
    prolongate_ddf_3d_rf2_c110_o1;
prolongate_3d_rf2<1, 1, 1, true, true, true, 0, 0, 0>
    prolongate_ddf_3d_rf2_c111_o1;

Insertion in AMReX/src/prolongate_3d_rf2.hxx at line 115 [12.16572]

[2.8217]


// Prolongation operators for discrete differential forms:
// interpolating (non-conservative) for vertex centred directions,
// conservative for cell centred directions. We use linear
// interpolation for vertex centred and constant interpolation for
// cell centred directions.
extern prolongate_3d_rf2<0, 0, 0, false, false, false, 1, 1, 1>
    prolongate_ddf_3d_rf2_c000_o1;
extern prolongate_3d_rf2<0, 0, 1, false, false, true, 1, 1, 0>
    prolongate_ddf_3d_rf2_c001_o1;
extern prolongate_3d_rf2<0, 1, 0, false, true, false, 1, 0, 1>
    prolongate_ddf_3d_rf2_c010_o1;
extern prolongate_3d_rf2<0, 1, 1, false, true, true, 1, 0, 0>
    prolongate_ddf_3d_rf2_c011_o1;
extern prolongate_3d_rf2<1, 0, 0, true, false, false, 0, 1, 1>
    prolongate_ddf_3d_rf2_c100_o1;
extern prolongate_3d_rf2<1, 0, 1, true, false, true, 0, 1, 0>
    prolongate_ddf_3d_rf2_c101_o1;
extern prolongate_3d_rf2<1, 1, 0, true, true, false, 0, 0, 1>
    prolongate_ddf_3d_rf2_c110_o1;
extern prolongate_3d_rf2<1, 1, 1, true, true, true, 0, 0, 0>
    prolongate_ddf_3d_rf2_c111_o1;

Replacement in HydroToyAMReX/par/hydro-shocktube.par at line 9 [13.22]
B:BD[13.130] → [13.130:132]
```
 
```
[13.130]
[13.132]
Insertion in HydroToyAMReX/par/hydro-shocktube.par at line 38 [13.22]
[13.622]
[13.622]
```
AMReX::prolongation_type = "conservative"
AMReX::do_reflux = yes
```
Replacement in HydroToyAMReX/par/hydro-sphericalshock-bench.par at line 40 [6.33]
B:BD[6.676] → [6.676:715]
```
AMReX::conservative_prolongation = yes
```
[6.676]
[6.715]
```
AMReX::prolongation_type = "conservative"
```
Replacement in HydroToyAMReX/par/hydro-sphericalshock.par at line 38 [13.1031]
B:BD[13.1630] → [4.0:39]
```
AMReX::conservative_prolongation = yes
```
[13.1630]
[4.39]
```
AMReX::prolongation_type = "conservative"
```
Insertion in HydroToyAMReX/par/hydro-sphericalshock.par at line 44 [13.1031]
[13.1692]
[13.1692]
```
HydroToyAMReX::output_every = 1
```

Replacement in TestProlongate/src/test.cc at line 28 [14.5531]

B:BD[7.1] → [7.1:310]

  int conservative_type;
  const void *conservative_p =
    CCTK_ParameterGet("conservative_prolongation", "AMReX", &conservative_type);
  assert(conservative_p);
  assert(conservative_type == PARAMETER_BOOLEAN);
  const CCTK_INT conservative_prolongation =
    *static_cast<const CCTK_INT*>(conservative_p);

[7.1]

[15.406]

  int prolongation_type_type;
  const void *prolongation_type_p =
    CCTK_ParameterGet("prolongation_type", "AMReX", &prolongation_type_type);
  assert(prolongation_type_p);
  assert(prolongation_type_type == PARAMETER_KEYWORD);
  const char* prolongation_type =
    *static_cast<const char* const*>(prolongation_type_p);
  const bool conservative_prolongation =
    CCTK_EQUALS(prolongation_type, "conservative");

Replacement in TestProlongate/src/test.cc at line 102 [14.5531]

B:BD[16.976] → [7.984:1293]

  int conservative_type;
  const void *conservative_p =
    CCTK_ParameterGet("conservative_prolongation", "AMReX", &conservative_type);
  assert(conservative_p);
  assert(conservative_type == PARAMETER_BOOLEAN);
  const CCTK_INT conservative_prolongation =
    *static_cast<const CCTK_INT*>(conservative_p);

[16.976]

[7.1293]

  int prolongation_type_type;
  const void *prolongation_type_p =
    CCTK_ParameterGet("prolongation_type", "AMReX", &prolongation_type_type);
  assert(prolongation_type_p);
  assert(prolongation_type_type == PARAMETER_KEYWORD);
  const char* prolongation_type =
    *static_cast<const char* const*>(prolongation_type_p);
  const bool conservative_prolongation =
    CCTK_EQUALS(prolongation_type, "conservative");

Insertion in TestProlongate/test/test_cc_co_o1.par at line 17 [8.103]
[8.307]
[8.307]
```
AMReX::prolongation_type = "conservative"
```
Deletion in TestProlongate/test/test_cc_co_o1.par at line 19 [8.103]
B:BD[8.337] → [8.337:376]
```
AMReX::conservative_prolongation = yes
```

Implement "ddf" prolongation type, a mixture of interpolating and conservative interpolation

Dependencies

In channels

Change contents

Insertion in AMReX/param.ccl at line 155 [10.17918]

Deletion in AMReX/param.ccl at line 167 [10.17918]

Deletion in AMReX/param.ccl at line 169 [10.17918]

Replacement in AMReX/src/driver.cxx at line 350 [10.15972]

Insertion in AMReX/src/driver.cxx at line 442 [10.15972]

Replacement in AMReX/src/driver.cxx at line 444 [10.15972]

Replacement in AMReX/src/driver.cxx at line 504 [10.15972]

Replacement in AMReX/src/driver.cxx at line 528 [10.15972]

Insertion in AMReX/src/prolongate_3d_rf2.cxx at line 636 [12.1186]

Insertion in AMReX/src/prolongate_3d_rf2.hxx at line 115 [12.16572]

Replacement in HydroToyAMReX/par/hydro-shocktube.par at line 9 [13.22]

Insertion in HydroToyAMReX/par/hydro-shocktube.par at line 38 [13.22]

Replacement in HydroToyAMReX/par/hydro-sphericalshock-bench.par at line 40 [6.33]

Replacement in HydroToyAMReX/par/hydro-sphericalshock.par at line 38 [13.1031]

Insertion in HydroToyAMReX/par/hydro-sphericalshock.par at line 44 [13.1031]

Replacement in TestProlongate/src/test.cc at line 28 [14.5531]

Replacement in TestProlongate/src/test.cc at line 102 [14.5531]

Insertion in TestProlongate/test/test_cc_co_o1.par at line 17 [8.103]

Deletion in TestProlongate/test/test_cc_co_o1.par at line 19 [8.103]