Changeset 133:da36bb3f5bff
- Timestamp:
- 03/05/2012 05:43:02 PM (16 months ago)
- Author:
- Andreas Schaefer <gentryx@…>
- Branch:
- default
- Message:
-
fixed OpenCLStepper creation
- Location:
- src/parallelization/hiparsimulator
- Files:
-
Legend:
- Unmodified
- Added
- Removed
-
|
r120
|
r133
|
|
| 33 | 33 | const std::string& cellSourceFile, |
| 34 | 34 | boost::shared_ptr<MyPartitionManager> _partitionManager, |
| 35 | | boost::shared_ptr<Initializer<CELL_TYPE> > _initializer, |
| | 35 | Initializer<CELL_TYPE> *_initializer, |
| 36 | 36 | const int& platformID=0, |
| 37 | 37 | const int& deviceID=0) : |
-
|
r129
|
r133
|
|
| 42 | 42 | inline Stepper( |
| 43 | 43 | const boost::shared_ptr<MyPartitionManager>& _partitionManager, |
| 44 | | Initializer<CELL_TYPE> *_initializer) : |
| | 44 | Initializer<CELL_TYPE> *_initializer) : |
| 45 | 45 | partitionManager(_partitionManager), |
| 46 | 46 | initializer(_initializer) |
-
|
r119
|
r133
|
|
| 45 | 45 | void setUp() |
| 46 | 46 | { |
| 47 | | init.reset(new CellInitializer(Coord<3>(128, 128, 128))); |
| | 47 | init = new CellInitializer(Coord<3>(128, 128, 128)); |
| 48 | 48 | CoordBox<3> rect = init->gridBox(); |
| 49 | 49 | |
| … |
… |
|
| 51 | 51 | stepper.reset( |
| 52 | 52 | new MyStepper(cellSourceFile, partitionManager, init)); |
| | 53 | } |
| | 54 | |
| | 55 | void testDown() |
| | 56 | { |
| | 57 | delete init; |
| 53 | 58 | } |
| 54 | 59 | #endif |
| … |
… |
|
| 63 | 68 | #ifdef LIBGEODECOMP_FEATURE_OPENCL |
| 64 | 69 | private: |
| 65 | | boost::shared_ptr<CellInitializer> init; |
| | 70 | CellInitializer *init; |
| 66 | 71 | boost::shared_ptr<PartitionManager<3> > partitionManager; |
| 67 | 72 | boost::shared_ptr<MyStepper> stepper; |
