tReformatted output - 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 93d318f535ddd9d4db2a5cfb4a074d786518c051
(DIR) parent e956c0c522a59ce13be1db5c1fdfd3ff27279355
(HTM) Author: Anders Damsgaard <adc@geo.au.dk>
Date: Thu, 8 Nov 2012 12:24:18 +0100
Reformatted output
Diffstat:
M src/device.cu | 35 ++++++++++++++++++-------------
1 file changed, 20 insertions(+), 15 deletions(-)
---
(DIR) diff --git a/src/device.cu b/src/device.cu
t@@ -184,7 +184,8 @@ __host__ void DEM::checkConstantMemory()
<< "seem to be correct (" << *equal << ").\n";
exit(1);
} else {
- std::cout << " Constant values ok (" << *equal << ").\n";
+ if (verbose == 1)
+ std::cout << " Constant values ok (" << *equal << ").\n";
}
}
t@@ -505,9 +506,9 @@ __host__ void DEM::startTime()
fclose(fp);
// Write first output data file: output0.bin, thus testing writing of bin files
- outfile = "output/" + sid + ".output0.bin";
+ //outfile = "output/" + sid + ".output0.bin";
//sprintf(file,"output/%s.output0.bin", sid);
- writebin(outfile.c_str());
+ //writebin(outfile.c_str());
if (verbose == 1) {
cout << "\n Entering the main calculation time loop...\n\n"
t@@ -541,7 +542,8 @@ __host__ void DEM::startTime()
cudaEventCreate(&kernel_toc);
}
- cout << " Current simulation time: " << time.current << " s.";
+ if (verbose == 1)
+ cout << " Current simulation time: " << time.current << " s.";
// MAIN CALCULATION TIME LOOP
t@@ -750,7 +752,7 @@ __host__ void DEM::startTime()
// Write binary output file
time.step_count += 1;
- sprintf(file,"output/%s.output%d.bin", sid.c_str(), time.step_count);
+ sprintf(file,"output/%s.output%05d.bin", sid.c_str(), time.step_count);
writebin(file);
t@@ -805,15 +807,18 @@ __host__ void DEM::startTime()
time_spent = (toc - tic)/(CLOCKS_PER_SEC);
cudaEventElapsedTime(&dev_time_spent, dev_tic, dev_toc);
- cout << "\nSimulation ended. Statistics:\n"
- << " - Last output file number: "
- << time.step_count << "\n"
- << " - GPU time spent: "
- << dev_time_spent/1000.0f << " s\n"
- << " - CPU time spent: "
- << time_spent << " s\n"
- << " - Mean duration of iteration:\n"
- << " " << dev_time_spent/((double)iter*1000.0f) << " s\n";
+ if (verbose == 1) {
+ cout << "\nSimulation ended. Statistics:\n"
+ << " - Last output file number: "
+ << time.step_count << "\n"
+ << " - GPU time spent: "
+ << dev_time_spent/1000.0f << " s\n"
+ << " - CPU time spent: "
+ << time_spent << " s\n"
+ << " - Mean duration of iteration:\n"
+ << " " << dev_time_spent/((double)iter*1000.0f) << " s"
+ << std::endl;
+ }
cudaEventDestroy(dev_tic);
cudaEventDestroy(dev_toc);
t@@ -822,7 +827,7 @@ __host__ void DEM::startTime()
cudaEventDestroy(kernel_toc);
// Report time spent on each kernel
- if (PROFILING == 1) {
+ if (PROFILING == 1 && verbose == 1) {
double t_sum = t_calcParticleCellID + t_thrustsort + t_reorderArrays
+ t_topology + t_interact + t_summation + t_integrateWalls;
cout << "\nKernel profiling statistics:\n"