tfix calls to generateRadii - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
(HTM) git clone git://src.adamsgaard.dk/sphere
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit 50d5be318df999c94c24af66b8ccf23b57d3d8e5
(DIR) parent a3e0aad25aee8c9d0dccce8f156164648f17d5c6
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Wed, 5 Nov 2014 15:37:22 +0100
fix calls to generateRadii
Diffstat:
M tests/io_tests_fluid.py | 4 ++--
M tests/porosity_tests.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
(DIR) diff --git a/tests/io_tests_fluid.py b/tests/io_tests_fluid.py
t@@ -8,7 +8,7 @@ print("### Fluid input/output tests - Navier Stokes CFD solver ###")
# Generate data in python
orig = sphere.sim(np=100, sid="test-initgrid-fluid", fluid=True)
orig.cleanup()
-orig.generateRadii(histogram=False, radius_mean=1.0)
+orig.generateRadii(histogram=False, mean=1.0)
orig.defaultParams()
orig.initRandomGridPos()
orig.initFluid()
t@@ -55,7 +55,7 @@ print("### Fluid input/output tests - Darcy CFD solver ###")
# Generate data in python
orig = sphere.sim(np=100, sid="test-initgrid-fluid", fluid=True)
orig.cleanup()
-orig.generateRadii(histogram=False, radius_mean=1.0)
+orig.generateRadii(histogram=False, mean=1.0)
orig.defaultParams()
orig.initRandomGridPos()
(DIR) diff --git a/tests/porosity_tests.py b/tests/porosity_tests.py
t@@ -44,7 +44,7 @@ testPorosities(orig)
sidelen = 10
cubic = sphere.sim(np = sidelen**3, sid='cubic')
radius = 1.0
-cubic.generateRadii(psd='uni', radius_mean=radius, radius_variance=0.0, histogram=False)
+cubic.generateRadii(psd='uni', mean=radius, variance=0.0, histogram=False)
for ix in range(sidelen):
for iy in range(sidelen):
for iz in range(sidelen):