summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdrian Kummerlaender2019-06-24 15:49:04 +0200
committerAdrian Kummerlaender2019-06-24 15:55:59 +0200
commit1477bbe177da4d3ad07877d4b672aac4828d0a13 (patch)
treefa001f2be8cd2606ef469f177cb71860db72ef5e /src
parentd316b74c25ea98d0145a9adad4ff9953f07581e4 (diff)
downloadgrid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.gz
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.bz2
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.lz
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.xz
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.tar.zst
grid_refinement_openlb-1477bbe177da4d3ad07877d4b672aac4828d0a13.zip
Fix rebase conflictsHEADmaster
Diffstat (limited to 'src')
-rw-r--r--src/olb2D.h1
-rw-r--r--src/olb2D.hh1
-rw-r--r--src/utilities/vectorHelpers.h11
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