summaryrefslogtreecommitdiff
path: root/examples/laminar/cylinder2d
diff options
context:
space:
mode:
authorAdrian Kummerlaender2019-06-24 15:49:04 +0200
committerAdrian Kummerlaender2019-06-24 15:55:59 +0200
commit1477bbe177da4d3ad07877d4b672aac4828d0a13 (patch)
treefa001f2be8cd2606ef469f177cb71860db72ef5e /examples/laminar/cylinder2d
parentd316b74c25ea98d0145a9adad4ff9953f07581e4 (diff)
downloadgrid_refinement_openlb-master.tar
grid_refinement_openlb-master.tar.gz
grid_refinement_openlb-master.tar.bz2
grid_refinement_openlb-master.tar.lz
grid_refinement_openlb-master.tar.xz
grid_refinement_openlb-master.tar.zst
grid_refinement_openlb-master.zip
Fix rebase conflictsHEADmaster
Diffstat (limited to 'examples/laminar/cylinder2d')
-rw-r--r--examples/laminar/cylinder2d/cylinder2d.cpp5
1 files changed, 0 insertions, 5 deletions
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;