Fix opengl version

src/opengl/simulation.cu

@@ -243,11 +243,10 @@ void Simulation::calculateWaterSurface(float3* destBuffer) {
 	if (isFirstStep == 1) {
 		isFirstStep = 0;
 	} else {
-		//splash->simulateConstTimestep();
-		// curTime = splash->simulate(curTime, curTime + 5*splash->getMaxTimestep());
-		float dt = splash->getMaxTimestep();
 		splash->setGhostLayer();
-		splash->simulateTimestep(dt);
+		splash->computeNumericalFluxes();
+		float dt = splash->getMaxTimestep();
+		splash->updateUnknowns(dt);
 		curTime += dt;
 	}
 	// splash->updateVisBuffer(destBuffer, wAverage, wScale, wOffset);

src/scenarios/SWE_simple_scenarios.h

@@ -40,11 +40,33 @@ class SWE_RadialDamBreakScenario : public SWE_Scenario {
 
   public:
 
+    float getBathymetry(float x, float y) {
+       return -250.f;
+    };
+
     float getWaterHeight(float x, float y) { 
-       return ( sqrt( (x-0.5f)*(x-0.5f) + (y-0.5f)*(y-0.5f) ) < 0.1f ) ? 10.5f: 10.0f;
+       return ( sqrt( (x-500.f)*(x-500.f) + (y-500.f)*(y-500.f) ) < 100.f ) ? 261.f: 260.0f;
     };
 
+	virtual float endSimulation() { return (float) 15; };
+
     virtual BoundaryType getBoundaryType(BoundaryEdge edge) { return OUTFLOW; };
+
+    /** Get the boundary positions
+     *
+     * @param i_edge which edge
+     * @return value in the corresponding dimension
+     */
+    float getBoundaryPos(BoundaryEdge i_edge) {
+       if ( i_edge == BND_LEFT )
+         return (float)0;
+       else if ( i_edge == BND_RIGHT)
+         return (float)1000;
+       else if ( i_edge == BND_BOTTOM )
+         return (float)0;
+       else
+         return (float)1000;
+    };
 };
 
 /**
@@ -56,7 +78,7 @@ class SWE_BathymetryDamBreakScenario : public SWE_Scenario {
   public:
 
     float getBathymetry(float x, float y) { 
-       return ( std::sqrt( (x-500.f)*(x-500.f) + (y-500.f)*(y-500.f) ) < 50.f ) ? -250.f: -260.f;
+       return ( std::sqrt( (x-500.f)*(x-500.f) + (y-500.f)*(y-500.f) ) < 50.f ) ? -255.f: -260.f;
     };
     
 	virtual float endSimulation() { return (float) 15; };
@@ -119,8 +141,31 @@ class SWE_SplashingPoolScenario : public SWE_Scenario {
 
   public:
 
-    float getWaterHeight(float x, float y) { return 10.0f+(1.0f-(x+y));};
-    float endSimulation() { return 1.0f; };
+    float getBathymetry(float x, float y) {
+       return -250.f;
+    };
+
+    float getWaterHeight(float x, float y) {
+    	return 260.0f+(1.0f-(x+y)/1000);
+    };
+
+	virtual float endSimulation() { return (float) 15; };
+
+    /** Get the boundary positions
+     *
+     * @param i_edge which edge
+     * @return value in the corresponding dimension
+     */
+    float getBoundaryPos(BoundaryEdge i_edge) {
+       if ( i_edge == BND_LEFT )
+         return (float)0;
+       else if ( i_edge == BND_RIGHT)
+         return (float)1000;
+       else if ( i_edge == BND_BOTTOM )
+         return (float)0;
+       else
+         return (float)1000;
+    };
 
 };