Changeset 457:e64631f610c4

Timestamp:

01/14/2013 10:25:55 PM (4 months ago)

Author:

Andreas Schaefer <gentryx@…>

Branch:

default

Message:

coding style

Location:

src

Files:

• parallelization/serialsimulator.h (modified) (1 diff)
• testbed/performancetests/cudatests.cu (modified) (3 diffs)

src/parallelization/serialsimulator.h

@@ -9 +9 @@
 
 /**
- * Implements the Simulator functionality by running all calculations
- * sequencially in a single process.
+ * SerialSimulator is the simplest implementation of the simulator
+ * concept.
  */
 template<typename CELL_TYPE>
 class SerialSimulator : public MonolithicSimulator<CELL_TYPE>
 {
+public:
     friend class SerialSimulatorTest;
-    friend class PPMWriterTest;
-public:
     typedef typename CELL_TYPE::Topology Topology;
     typedef Grid<CELL_TYPE, Topology> GridType;

src/testbed/performancetests/cudatests.cu

@@ -59 +59 @@
 
 #pragma unroll 10
-    for (z; z < (dimZ - 2); ++z) {
+    for (; z < (dimZ - 2); ++z) {
         double c4 = hoody(0, 0, 2);
 
@@ -122 +122 @@
     
 #pragma unroll 10
-    for (z; z < (dimZ - 2); z += 1) {
+    for (; z < (dimZ - 2); z += 1) {
 
 #define SQR(X) ((X)*(X))
@@ -469 +469 @@
     if (dim <= DIM) {                                                   \
         std::cout << dim << " "                                         \
-                  << benchmarkCUDA<LBMSoA, DIM + ADD, DIM, 256 + 64>(   \
+                  << benchmarkCUDA<RTMClassic, DIM + ADD, DIM, 256 + 64>( \
                       dim, dim, 256 + 32 - 4, 20) << "\n";              \
         return;                                                         \
     }
 
-                  // << benchmarkCUDA<KERNEL, DIM + ADD, DIM, 256 + 64>(   \
+                                    // << benchmarkCUDA<LBMSoA, DIM + ADD, DIM, 256 + 64>(   \
+// << benchmarkCUDA<KERNEL, DIM + ADD, DIM, 256 + 64>(   \