tCorrected critical read bug - sphere - GPU-based 3D discrete element method al… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 6d5161287b1acd8c09dddf393ecc32e30cdfa2b3 | |
parent 68a49f80dc94fb880984eb0b4f2b393a8756d1d3 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 27 Nov 2012 13:44:38 +0100 | |
Corrected critical read bug | |
Diffstat: | |
M src/file_io.cpp | 5 +++-- | |
1 file changed, 3 insertions(+), 2 deletions(-) | |
--- | |
diff --git a/src/file_io.cpp b/src/file_io.cpp | |
t@@ -190,7 +190,8 @@ void DEM::readbin(const char *target) | |
walls.nx = new Float4[walls.nw]; | |
walls.mvfd = new Float4[walls.nw]; | |
- ifs.read(as_bytes(walls.wmode), sizeof(walls.wmode)); | |
+ for (i = 0; i<walls.nw; ++i) | |
+ ifs.read(as_bytes(walls.wmode[i]), sizeof(walls.wmode[i])); | |
for (i = 0; i<walls.nw; ++i) { | |
ifs.read(as_bytes(walls.nx[i].x), sizeof(Float)); | |
ifs.read(as_bytes(walls.nx[i].y), sizeof(Float)); | |
t@@ -322,7 +323,7 @@ void DEM::writebin(const char *target) | |
// Write wall parameters | |
ofs.write(as_bytes(walls.nw), sizeof(walls.nw)); | |
- ofs.write(as_bytes(walls.wmode), sizeof(walls.wmode)); | |
+ ofs.write(as_bytes(walls.wmode), sizeof(walls.wmode[0])*walls.nw); | |
for (i = 0; i<walls.nw; ++i) { | |
ofs.write(as_bytes(walls.nx[i].x), sizeof(Float)); | |
ofs.write(as_bytes(walls.nx[i].y), sizeof(Float)); |