diff options
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/OutputSlice.cc | 2 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/gdata.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Carpet/CarpetIOHDF5/src/OutputSlice.cc b/Carpet/CarpetIOHDF5/src/OutputSlice.cc index 90e9539bc..76ef51e3a 100644 --- a/Carpet/CarpetIOHDF5/src/OutputSlice.cc +++ b/Carpet/CarpetIOHDF5/src/OutputSlice.cc @@ -563,7 +563,7 @@ namespace CarpetIOHDF5 { // re-compute the active (non-buffere) region ibset allactive; - GetAllActive (dd, hh, m, reflevel, allactive); + GetAllActive (dd, hh, m, rl, allactive); // Traverse all components on this multigrid level, refinement // level, and map diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc index 958153784..2feda1882 100644 --- a/Carpet/CarpetLib/src/gdata.cc +++ b/Carpet/CarpetLib/src/gdata.cc @@ -110,13 +110,13 @@ allocated_memory_shape (vect<int,D> shape) } } } -#if defined(VECTORISE_ALIGNED_ARRAYS) +#if VECTORISE_ALIGNED_ARRAYS // Enlarge shape in the x direction to ensure it is a multiple of // the vector size #warning "TODO: Support other datatypes as well, don't target only CCTK_REAL" if (sizeof(CCTK_REAL) * CCTK_REAL_VEC_SIZE == magic_size) { CCTK_VWarn (CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, - "The build-time option KRANC_ALIGNED_ARRAYS requires that the size of a grid variable in the x direction is a multiple of %d bytes, while the run-time parameter avoid_arraysize_bytes=%d requests the opposite. This is inconsistent -- aborting", + "The build-time option VECTORISE_ALIGNED_ARRAYS requires that the size of a grid variable in the x direction is a multiple of %d bytes, while the run-time parameter avoid_arraysize_bytes=%d requests the opposite. This is inconsistent -- aborting", int(avoid_arraysize_bytes), int(avoid_arraysize_bytes)); } |