aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetLib
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2013-01-18 17:30:26 -0500
committerErik Schnetter <schnetter@gmail.com>2013-01-18 17:30:26 -0500
commit321818fb9dcefcb8775906e8af1b50aa52736277 (patch)
treeef1eaec4a01296f10ec08edc0baa33f388394b9b /Carpet/CarpetLib
parent3b1469f445fb5bf9e6f94f12cc0981f591e4aab0 (diff)
CarpetLib: Explicitly convert values to signed
Diffstat (limited to 'Carpet/CarpetLib')
-rw-r--r--Carpet/CarpetLib/src/prolongate_3d_rf2.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/Carpet/CarpetLib/src/prolongate_3d_rf2.cc b/Carpet/CarpetLib/src/prolongate_3d_rf2.cc
index cdf24a985..8cb9c6f6d 100644
--- a/Carpet/CarpetLib/src/prolongate_3d_rf2.cc
+++ b/Carpet/CarpetLib/src/prolongate_3d_rf2.cc
@@ -256,7 +256,7 @@ namespace CarpetLib {
typedef typename VP::vector_t VT;
ptrdiff_t i = coeffs::imin;
T res = typ::fromreal (0);
- if (coeffs::ncoeffs >= VP::size()) {
+ if (coeffs::ncoeffs >= ptrdiff_t(VP::size())) {
VT vres =
VP::mul(VP::load(typ::fromreal(coeffs::get(i))),
VP::loadu(interp0<T,ORDER> (p + i)));
@@ -324,17 +324,18 @@ namespace CarpetLib {
i += VP::size();
}
#else
- for (; i + VP::size() <= coeffs::imax; i += VP::size()) {
+ for (; i + VP::size() <= ptrdiff_t(coeffs::imax); i += VP::size()) {
vres = VP::add(vres,
VP::mul(VP::load(typ::fromreal(coeffs::get(i))),
VP::loadu(interp0<T,ORDER> (p + i))));
}
#endif
- for (int d=0; d<VP::size(); ++d) {
+ for (int d=0; d<ptrdiff_t(VP::size()); ++d) {
res += VP::elt(vres,d);
}
}
- assert (i == coeffs::imax - coeffs::ncoeffs % VP::size());
+ assert (i == (ptrdiff_t(coeffs::imax) -
+ ptrdiff_t(coeffs::ncoeffs % VP::size())));
for (i = coeffs::imax - coeffs::ncoeffs % VP::size();
i < coeffs::imax;
++ i)