tChanged input algorithm for raytracer to handle ev - 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 973da25351836520b63188d5b3dfdd13b843fb68
(DIR) parent 9f513367e78001788203a6e76e56f94894e2a3af
(HTM) Author: Anders Damsgaard <adc@geo.au.dk>
Date: Tue, 9 Oct 2012 09:33:19 +0200
Changed input algorithm for raytracer to handle ev
Diffstat:
M raytracer/main.cpp | 8 ++++++++
1 file changed, 8 insertions(+), 0 deletions(-)
---
(DIR) diff --git a/raytracer/main.cpp b/raytracer/main.cpp
t@@ -81,7 +81,9 @@ int main(const int argc, const char* argv[])
float4* p = new float4[np];
float* fixvel = new float[np];
float* es_dot = new float[np];
+ float* ev_dot = new float[np];
float* es = new float[np];
+ float* ev = new float[np];
float* pres = new float[np];
float* vel = new float[np];
t@@ -162,8 +164,12 @@ int main(const int argc, const char* argv[])
(void)fread(&d, sizeof(d), 1, fin);
es_dot[i] = (float)d;
(void)fread(&d, sizeof(d), 1, fin);
+ ev_dot[i] = (float)d;
+ (void)fread(&d, sizeof(d), 1, fin);
es[i] = (float)d;
(void)fread(&d, sizeof(d), 1, fin);
+ ev[i] = (float)d;
+ (void)fread(&d, sizeof(d), 1, fin);
pres[i] = (float)d;
}
t@@ -236,7 +242,9 @@ int main(const int argc, const char* argv[])
delete [] fixvel;
delete [] pres;
delete [] es;
+ delete [] ev;
delete [] es_dot;
+ delete [] ev_dot;
delete [] vel;
}