Non opengl implementations should work again

parent f24208e6
......@@ -78,9 +78,8 @@
* ***********
* </pre>
*/
SWE_WavePropagationBlock::SWE_WavePropagationBlock( float _offsetX,
float _offsetY ):
SWE_Block(_offsetX,_offsetY),
SWE_WavePropagationBlock::SWE_WavePropagationBlock():
SWE_Block(),
hNetUpdatesLeft (nx+1, ny),
hNetUpdatesRight (nx+1, ny),
huNetUpdatesLeft (nx+1, ny),
......
......@@ -114,7 +114,7 @@ class SWE_WavePropagationBlock: public SWE_Block {
public:
//constructor of a SWE_WavePropagationBlock.
SWE_WavePropagationBlock( float _offsetX = (float)0., float _offsetY = (float)0. );
SWE_WavePropagationBlock();
//executes a single timestep.
virtual void simulateTimestep(float dt);
......
......@@ -243,7 +243,7 @@ int main( int argc, char** argv ) {
// create a single wave propagation block
#ifndef CUDA
SWE_WavePropagationBlock l_wavePropgationBlock(l_originX, l_originY);
SWE_WavePropagationBlock l_wavePropgationBlock;
#else
//! number of CUDA devices per node TODO: hardcoded
int l_cudaDevicesPerNode = 7;
......@@ -251,11 +251,11 @@ int main( int argc, char** argv ) {
//! the id of the node local GPU
int l_cudaDeviceId = l_mpiRank % l_cudaDevicesPerNode;
SWE_WavePropagationBlockCuda l_wavePropgationBlock(l_originX, l_originY, l_cudaDeviceId);
SWE_WavePropagationBlockCuda l_wavePropgationBlock(l_cudaDeviceId);
#endif
// initialize the wave propgation block
l_wavePropgationBlock.initScenario( l_scenario, true );
l_wavePropgationBlock.initScenario(l_originX, l_originY, l_scenario, true);
//! time when the simulation ends.
float l_endSimulation = l_scenario.endSimulation();
......
......@@ -156,13 +156,13 @@ int main( int argc, char** argv ) {
// create a single wave propagation block
#ifndef CUDA
SWE_WavePropagationBlock l_wavePropgationBlock(l_originX, l_originY);
SWE_WavePropagationBlock l_wavePropgationBlock;
#else
SWE_WavePropagationBlockCuda l_wavePropgationBlock(l_originX, l_originY);
SWE_WavePropagationBlockCuda l_wavePropgationBlock;
#endif
// initialize the wave propgation block
l_wavePropgationBlock.initScenario(l_scenario);
l_wavePropgationBlock.initScenario(l_originX, l_originY, l_scenario);
//! time when the simulation ends.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment