treport fluid solver choice - sphere - GPU-based 3D discrete element method alg… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 4a22f224841e6814f1e9acec67b6fc17d58bd8d8 | |
parent ee64f1bd2468ca535b33b83acdc78b83eacf615b | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 6 Nov 2014 10:48:56 +0100 | |
report fluid solver choice | |
Diffstat: | |
M python/halfshear-darcy-starter.py | 3 ++- | |
M src/sphere.cpp | 12 ++++++++++++ | |
2 files changed, 14 insertions(+), 1 deletion(-) | |
--- | |
diff --git a/python/halfshear-darcy-starter.py b/python/halfshear-darcy-starter… | |
t@@ -58,7 +58,8 @@ sim.mu_s[0] = 0.5 | |
sim.mu_d[0] = 0.5 | |
sim.setDampingNormal(0.0) | |
sim.setDampingTangential(0.0) | |
-sim.deleteAllParticles() | |
+#sim.deleteAllParticles() | |
+sim.fixvel[:] = -1.0 | |
sim.initTemporal(total = 20.0, file_dt = 0.01, epsilon=0.07) | |
diff --git a/src/sphere.cpp b/src/sphere.cpp | |
t@@ -433,6 +433,18 @@ void DEM::reportValues() | |
cout << " m\n"; | |
cout << " - No. of particle bonds: " << params.nb0 << endl; | |
+ | |
+ if (fluid == 1) { | |
+ cout << " - Fluid solver: "; | |
+ if (cfd_solver == 0) { | |
+ cout << "Navier-Stokes"; | |
+ } else if (cfd_solver == 0) { | |
+ cout << "Darcy"; | |
+ } else { | |
+ cout << "Unknown"; | |
+ } | |
+ cout << endl; | |
+ } | |
} | |
// Returns the volume of a spherical cap |