From 1477bbe177da4d3ad07877d4b672aac4828d0a13 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Mon, 24 Jun 2019 15:49:04 +0200
Subject: Fix rebase conflicts

---
 config.mk                                  |  4 +--
 examples/laminar/cylinder2d/cylinder2d.cpp |  5 ----
 global.mk                                  |  2 +-
 shell.nix                                  | 45 ++++++++++++++++++++++++++++++
 src/olb2D.h                                |  1 +
 src/olb2D.hh                               |  1 +
 src/utilities/vectorHelpers.h              | 11 --------
 7 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 shell.nix

diff --git a/config.mk b/config.mk
index 651ab47..7283f41 100644
--- a/config.mk
+++ b/config.mk
@@ -58,7 +58,7 @@ PARALLEL_MODE   := OFF
 MPIFLAGS        :=
 OMPFLAGS        := -fopenmp
 
-BUILDTYPE       := precompiled
-#BUILDTYPE       := generic
+#BUILDTYPE       := precompiled
+BUILDTYPE       := generic
 
 FEATURES        :=
diff --git a/examples/laminar/cylinder2d/cylinder2d.cpp b/examples/laminar/cylinder2d/cylinder2d.cpp
index bc30461..b7879cb 100644
--- a/examples/laminar/cylinder2d/cylinder2d.cpp
+++ b/examples/laminar/cylinder2d/cylinder2d.cpp
@@ -58,13 +58,8 @@ typedef double T;
 
 
 // Parameters for the simulation setup
-<<<<<<< HEAD:examples/laminar/cylinder2d/cylinder2d.cpp
 const int N = 10;       // resolution of the model
 const T Re = 20.;       // Reynolds number
-=======
-const int N = 20;       // resolution of the model
-const T Re = 100.;       // Reynolds number
->>>>>>> Change F2C restriction, some cleanup:examples/cylinder2d/cylinder2d.cpp
 const T maxPhysT = 16.; // max. simulation time in s, SI unit
 const T L = 0.1/N;      // latticeL
 const T lengthX = 2.2;
diff --git a/global.mk b/global.mk
index 79cedc9..c301a88 100644
--- a/global.mk
+++ b/global.mk
@@ -72,7 +72,7 @@ SUBDIRS         := src/boundary \
                    src/communication \
                    src/dynamics \
                    src/contrib \
-                   src/contrib/functors \
+                   src/contrib/refinement \
                    src/core \
                    src/geometry \
                    src/external/tinyxml \
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..e5e5b52
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,45 @@
+{ pkgs ? import <nixpkgs> { }, ... }:
+
+pkgs.stdenvNoCC.mkDerivation rec {
+  name = "openlb-env";
+
+  env = pkgs.buildEnv {
+    name = name;
+    paths = buildInputs;
+  };
+
+  buildInputs = with pkgs; let
+    texlive-custom = texlive.combine {
+      inherit (texlive) scheme-small collection-langgerman latexmk xpatch xstring siunitx biblatex logreq palatino courier mathpazo helvetic multirow;
+    };
+  in [
+  # make dependencies
+    gnumake
+    gcc9
+    openmpi
+
+  # introspection
+    universal-ctags
+
+  # debugging
+    gdb
+    cgdb
+    valgrind
+
+  # autoformat
+    astyle
+
+  # result presentation
+    gnuplot
+
+  # documentation
+    doxygen
+    graphviz
+    texlive-custom
+    biber
+  ];
+
+  shellHook = ''
+    export NIX_SHELL_NAME="${name}"
+  '';
+}
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
-- 
cgit v1.2.3