Fix rebase conflictsHEADmaster

3 files changed, 2 insertions, 11 deletions

diff --git a/src/olb2D.h b/src/olb2D.h
index 1f2caa1..cd959f7 100644
--- a/src/olb2D.h
+++ b/src/olb2D.h
@@ -7,3 +7,4 @@
 #include <io/io2D.h>
 #include <utilities/utilities2D.h>
 #include <particles/hlbm/hlbmDynamics2D.h>
+#include <contrib/refinement/refinement2D.h>
diff --git a/src/olb2D.hh b/src/olb2D.hh
index 481ab5b..376cbb2 100644
--- a/src/olb2D.hh
+++ b/src/olb2D.hh
@@ -7,3 +7,4 @@
 #include <io/io2D.hh>
 #include <utilities/utilities2D.hh>
 #include <particles/hlbm/hlbmDynamics2D.hh>
+#include <contrib/refinement/refinement2D.hh>
diff --git a/src/utilities/vectorHelpers.h b/src/utilities/vectorHelpers.h
index e4fc958..17453dd 100644
--- a/src/utilities/vectorHelpers.h
+++ b/src/utilities/vectorHelpers.h
@@ -188,17 +188,6 @@ Vector<T,Size> ceil(const Vector<T,Size>& a)
   return out;
 }
 
-/// applies ceil to each component of a vector
-template <typename T, unsigned Size>
-Vector<T,Size> ceil(const Vector<T,Size>& a)
-{
-  Vector<T,Size> out;
-  for (unsigned int iDim=0; iDim < Size; ++iDim) {
-    out[iDim] = std::ceil(a[iDim]);
-  }
-  return out;
-}
-
 /*
 /// algorithm by Möller–Trumbore (TODO add ref), implemented by Lucas Cruz and Mathias J. Krause
 /// returns true if there is an intersection of a triangle given by (point0, point1, point1) and a ray given by its origin and direction and computes the distance