aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetLib
diff options
context:
space:
mode:
Diffstat (limited to 'Carpet/CarpetLib')
-rw-r--r--Carpet/CarpetLib/src/data.cc6
-rw-r--r--Carpet/CarpetLib/src/operator_prototypes_4d.hh2
2 files changed, 5 insertions, 3 deletions
diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc
index 8500997cc..2aed5d914 100644
--- a/Carpet/CarpetLib/src/data.cc
+++ b/Carpet/CarpetLib/src/data.cc
@@ -146,7 +146,7 @@ call_operator (void
srcregbbox, dstregbbox, extraargs);
#else
# if ! defined (NDEBUG) && ! defined (CARPET_OPTIMISE)
- ibset alldstregbboxes;
+ ibset4 alldstregbboxes;
# endif
#pragma omp parallel
{
@@ -184,11 +184,11 @@ call_operator (void
}
}
# if ! defined (NDEBUG) && ! defined (CARPET_OPTIMISE)
- if (not (alldstregbboxes == ibset (dstregbbox))) {
+ if (not (alldstregbboxes == ibset4 (dstregbbox))) {
cout << "alldstregbboxes=" << alldstregbboxes << endl
<< "dstregbbox=" << dstregbbox << endl;
}
- assert (alldstregbboxes == ibset (dstregbbox));
+ assert (alldstregbboxes == ibset4 (dstregbbox));
# endif
#endif
}
diff --git a/Carpet/CarpetLib/src/operator_prototypes_4d.hh b/Carpet/CarpetLib/src/operator_prototypes_4d.hh
index 71d1e3bcd..e9d015e43 100644
--- a/Carpet/CarpetLib/src/operator_prototypes_4d.hh
+++ b/Carpet/CarpetLib/src/operator_prototypes_4d.hh
@@ -7,6 +7,7 @@
#include "defs.hh"
#include "bbox.hh"
+#include "bboxset.hh"
#include "vect.hh"
#include "operator_prototypes.hh"
@@ -42,6 +43,7 @@ namespace CarpetLib {
typedef vect <bool, dim4> bvect4;
typedef vect <int, dim4> ivect4;
typedef bbox <int, dim4> ibbox4;
+ typedef bboxset <int, dim4> ibset4;