tbugfixes - sphere - GPU-based 3D discrete element method algorithm with option… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 201649db54d80500de7412e998d76221472b3af9 | |
parent 7651aa467789fd8a7e2b916d002ca92555d332e5 | |
Author: Anders Damsgaard Christensen <[email protected]> | |
Date: Fri, 12 Aug 2016 11:35:04 -0700 | |
bugfixes | |
Diffstat: | |
M python/sphere.py | 5 +++++ | |
M src/file_io.cpp | 1 - | |
2 files changed, 5 insertions(+), 1 deletion(-) | |
--- | |
diff --git a/python/sphere.py b/python/sphere.py | |
t@@ -1176,6 +1176,11 @@ class sim: | |
numpy.fromfile(fh, dtype=numpy.int32, count=1) | |
self.bc_yp =\ | |
numpy.fromfile(fh, dtype=numpy.int32, count=1) | |
+ elif self.cfd_solver == 1: | |
+ self.bc_xn = numpy.zeros(1, dtype=numpy.int32) | |
+ self.bc_xp = numpy.zeros(1, dtype=numpy.int32) | |
+ self.bc_yn = numpy.zeros(1, dtype=numpy.int32) | |
+ self.bc_yp = numpy.zeros(1, dtype=numpy.int32) | |
self.bc_bot =\ | |
numpy.fromfile(fh, dtype=numpy.int32, count=1) | |
diff --git a/src/file_io.cpp b/src/file_io.cpp | |
t@@ -296,7 +296,6 @@ void DEM::readbin(const char *target) | |
ifs.read(as_bytes(ns.bc_top), sizeof(int)); | |
ifs.read(as_bytes(ns.bc_bot), sizeof(int)); | |
- ifs.read(as_bytes(ns.bc_top), sizeof(int)); | |
ifs.read(as_bytes(ns.free_slip_bot), sizeof(int)); | |
ifs.read(as_bytes(ns.free_slip_top), sizeof(int)); | |
ifs.read(as_bytes(ns.bc_bot_flux), sizeof(Float)); |