From d0f1e440eaa92116781f69c953db47f758bde9b4 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Fri, 4 Jan 2019 18:02:54 +0100
Subject: Change F2C restriction, some cleanup

---
 examples/laminar/cylinder2d/cylinder2d.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'examples/laminar/cylinder2d')

diff --git a/examples/laminar/cylinder2d/cylinder2d.cpp b/examples/laminar/cylinder2d/cylinder2d.cpp
index b7879cb..bc30461 100644
--- a/examples/laminar/cylinder2d/cylinder2d.cpp
+++ b/examples/laminar/cylinder2d/cylinder2d.cpp
@@ -58,8 +58,13 @@ 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;
-- 
cgit v1.2.3