tFix scripts after changing np and nw to ints - sphere - GPU-based 3D discrete … | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 2e8285a631d12ac29262a16a7dd421e88b19160f | |
parent c9010365df6b8487979979d26574c26e8f858d3b | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 15 Aug 2019 16:05:49 +0200 | |
Fix scripts after changing np and nw to ints | |
Diffstat: | |
M python/channel-wet.py | 2 +- | |
M python/channel.py | 2 +- | |
M python/permeability-starter.py | 2 +- | |
M python/permeability.py | 2 +- | |
M python/permeability1.py | 2 +- | |
M python/permeability2.py | 2 +- | |
M python/permeability3.py | 2 +- | |
M python/shortening.py | 2 +- | |
M python/sigma-sideways-starter.py | 2 +- | |
M python/sigma-sim1-starter.py | 2 +- | |
10 files changed, 10 insertions(+), 10 deletions(-) | |
--- | |
diff --git a/python/channel-wet.py b/python/channel-wet.py | |
t@@ -90,7 +90,7 @@ if relaxation: | |
# sim.cleanup() | |
sim.writeVTK() | |
- print("Number of particles: " + str(sim.np[0])) | |
+ print("Number of particles: " + str(sim.np)) | |
# Set grain contact properties | |
#sim.setStiffnessNormal(1.16e7) | |
diff --git a/python/channel.py b/python/channel.py | |
t@@ -95,7 +95,7 @@ sim.k_t[0] = 2.0/3.0*sim.k_n[0] | |
# sim.cleanup() | |
sim.writeVTK() | |
-print("Number of particles: " + str(sim.np[0])) | |
+print("Number of particles: " + str(sim.np)) | |
# Relaxation | |
diff --git a/python/permeability-starter.py b/python/permeability-starter.py | |
t@@ -23,7 +23,7 @@ for dp_str in sys.argv[4:]: | |
sim.cleanup() | |
sim.g[2] = 0.0 | |
- sim.nw[0] = 0 | |
+ sim.nw = 0 | |
sim.initGrid() | |
sim.zeroKinematics() | |
sim.initFluid(mu = 17.87e-4, p = 1.0e5, hydrostatic=True) | |
diff --git a/python/permeability.py b/python/permeability.py | |
t@@ -12,7 +12,7 @@ for dp in [1.0e3, 2.0e3, 4.0e3, 10.0e3, 20.0e3, 40.0e3, 80.0… | |
sim.cleanup() | |
sim.g[2] = 0.0 | |
- sim.nw[0] = 0 | |
+ sim.nw = 0 | |
sim.initGrid() | |
sim.zeroKinematics() | |
sim.initFluid(mu = 17.87e-4, p = 1.0e5, hydrostatic=True) | |
diff --git a/python/permeability1.py b/python/permeability1.py | |
t@@ -12,7 +12,7 @@ for dp in [1.0e3, 2.0e3]: | |
sim.cleanup() | |
sim.g[2] = 0.0 | |
- sim.nw[0] = 0 | |
+ sim.nw = 0 | |
sim.initGrid() | |
sim.zeroKinematics() | |
sim.initFluid(mu = 17.87e-4, p = 1.0e5, hydrostatic=True) | |
diff --git a/python/permeability2.py b/python/permeability2.py | |
t@@ -12,7 +12,7 @@ for dp in [4.0e3, 10.0e3]: | |
sim.cleanup() | |
sim.g[2] = 0.0 | |
- sim.nw[0] = 0 | |
+ sim.nw = 0 | |
sim.initGrid() | |
sim.zeroKinematics() | |
sim.initFluid(mu = 17.87e-4, p = 1.0e5, hydrostatic=True) | |
diff --git a/python/permeability3.py b/python/permeability3.py | |
t@@ -12,7 +12,7 @@ for dp in [20.0e3, 40.0e3]: | |
sim.cleanup() | |
sim.g[2] = 0.0 | |
- sim.nw[0] = 0 | |
+ sim.nw = 0 | |
sim.initGrid() | |
sim.zeroKinematics() | |
sim.initFluid(mu = 17.87e-4, p = 1.0e5, hydrostatic=True) | |
diff --git a/python/shortening.py b/python/shortening.py | |
t@@ -76,7 +76,7 @@ sim.k_t[0] = 2.0/3.0*sim.k_n[0] | |
#sim.cleanup() | |
sim.writeVTK() | |
-print(sim.np[0]) | |
+print(sim.np) | |
## Relaxation | |
diff --git a/python/sigma-sideways-starter.py b/python/sigma-sideways-starter.py | |
t@@ -61,7 +61,7 @@ def shearVelocitySideways(sim, shear_strain_rate = 1.0, shea… | |
:type shear_stress: float or bool | |
''' | |
- sim.nw[0] = 1 | |
+ sim.nw = 1 | |
# Find lowest and heighest point | |
z_min = numpy.min(sim.x[:,2] - sim.radius) | |
diff --git a/python/sigma-sim1-starter.py b/python/sigma-sim1-starter.py | |
t@@ -60,7 +60,7 @@ def shearVelocityGradient(sim, shear_strain_rate = 1.0, shea… | |
:type shear_stress: float or bool | |
''' | |
- sim.nw[0] = 1 | |
+ sim.nw = 1 | |
# Find lowest and heighest point | |
z_min = numpy.min(sim.x[:,2] - sim.radius) |