summaryrefslogtreecommitdiff
path: root/examples/laminar
diff options
context:
space:
mode:
Diffstat (limited to 'examples/laminar')
-rw-r--r--examples/laminar/cylinder2d/cylinder2d.cpp5
1 files changed, 5 insertions, 0 deletions
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;