summaryrefslogtreecommitdiff
path: root/examples/laminar
diff options
context:
space:
mode:
authorAdrian Kummerlaender2019-01-04 18:02:54 +0100
committerAdrian Kummerlaender2019-06-24 15:14:07 +0200
commitd0f1e440eaa92116781f69c953db47f758bde9b4 (patch)
tree54bbf6717e91125ec6787318bdb2b32e653599ca /examples/laminar
parent663d1dbbdc47e6d2863eb7b397146b3f41795073 (diff)
downloadgrid_refinement_openlb-d0f1e440eaa92116781f69c953db47f758bde9b4.tar
grid_refinement_openlb-d0f1e440eaa92116781f69c953db47f758bde9b4.tar.gz
grid_refinement_openlb-d0f1e440eaa92116781f69c953db47f758bde9b4.tar.bz2
grid_refinement_openlb-d0f1e440eaa92116781f69c953db47f758bde9b4.tar.lz
grid_refinement_openlb-d0f1e440eaa92116781f69c953db47f758bde9b4.tar.xz
grid_refinement_openlb-d0f1e440eaa92116781f69c953db47f758bde9b4.tar.zst
grid_refinement_openlb-d0f1e440eaa92116781f69c953db47f758bde9b4.zip
Change F2C restriction, some cleanup
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;