treturn and store values - sphere - GPU-based 3D discrete element method algori… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit ce939231ee80ea8b4ac5b23cf76f2c534d2a6dcd | |
parent cb3b82201801026c1b6917e82d3169167d07683f | |
Author: Anders Damsgaard <[email protected]> | |
Date: Mon, 2 Feb 2015 14:57:50 +0100 | |
return and store values | |
Diffstat: | |
M python/sphere.py | 7 ++++--- | |
1 file changed, 4 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/python/sphere.py b/python/sphere.py | |
t@@ -2879,7 +2879,8 @@ class sim: | |
for the Darcy solver (`self.cfd_solver == 1`) | |
''' | |
if self.cfd_solver[0] == 1: | |
- self.K_c = self.k_c*self.rho_f*g/self.mu | |
+ self.K_c = self.k_c*self.rho_f*numpy.abs(self.g[2])/self.mu | |
+ return self.K_c | |
else: | |
raise Exception('This function only works for the Darcy solver') | |
t@@ -2907,7 +2908,7 @@ class sim: | |
if self.cfd_solver[0] == 1: | |
self.hydraulicConductivity() | |
phi_bar = numpy.mean(self.phi) | |
- alpha = self.K_c/(self.rho_f*g*(self.k_n[0] + phi_bar*K)) | |
+ self.D = self.K_c/(self.rho_f*g*(self.k_n[0] + phi_bar*K)) | |
else: | |
raise Exception('This function only works for the Darcy solver') | |
t@@ -4216,7 +4217,7 @@ class sim: | |
See also: :func:`shearStrain()` and :func:`shearVel()` | |
''' | |
- return self.shearStrain()/self.time_current[0] | |
+ return self.shearStrain()/self.time_current[1] | |
def inertiaParameterPlanarShear(self): | |
''' |