Skip to content

S
SWE
Commit a45f0c7a authored by Gaurav Kukreja's avatar Gaurav Kukreja
Browse files
Options

Modified to work with cilk solver version 

Signed-off-by: 's avatarGaurav Kukreja <gmkukreja@gmail.com>
parent b995161d
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 73 deletions
src/blocks/SWE_WavePropagationBlock.cpp
View file @ a45f0c7a
...@@ -192,11 +192,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes () ...@@ -192,11 +192,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i - 1][j], h[i][j], &h[i - 1][j], &h[i][j],
hu[i - 1][j], hu[i][j], &hu[i - 1][j], &hu[i][j],
b[i - 1][j], b[i][j], &b[i - 1][j], &b[i][j],
hNetUpdatesLeft[i - 1][j - 1], hNetUpdatesRight[i - 1][j - 1], &hNetUpdatesLeft[i - 1][j - 1], &hNetUpdatesRight[i - 1][j - 1],
huNetUpdatesLeft[i - 1][j - 1], huNetUpdatesRight[i - 1][j - 1], &huNetUpdatesLeft[i - 1][j - 1], &huNetUpdatesRight[i - 1][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
...@@ -254,11 +254,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes () ...@@ -254,11 +254,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i][j - 1], h[i][j], &h[i][j - 1], &h[i][j],
hv[i][j - 1], hv[i][j], &hv[i][j - 1], &hv[i][j],
b[i][j - 1], b[i][j], &b[i][j - 1], &b[i][j],
hNetUpdatesBelow[i - 1][j - 1], hNetUpdatesAbove[i - 1][j - 1], &hNetUpdatesBelow[i - 1][j - 1], &hNetUpdatesAbove[i - 1][j - 1],
hvNetUpdatesBelow[i - 1][j - 1], hvNetUpdatesAbove[i - 1][j - 1], &hvNetUpdatesBelow[i - 1][j - 1], &hvNetUpdatesAbove[i - 1][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
...@@ -323,11 +323,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes () ...@@ -323,11 +323,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i - 1][j], h[i][j], &h[i - 1][j], &h[i][j],
hu[i - 1][j], hu[i][j], &hu[i - 1][j], &hu[i][j],
b[i - 1][j], b[i][j], &b[i - 1][j], &b[i][j],
hNetUpdatesLeft[i - 1][j - 1], hNetUpdatesRight[i - 1][j - 1], &hNetUpdatesLeft[i - 1][j - 1], &hNetUpdatesRight[i - 1][j - 1],
huNetUpdatesLeft[i - 1][j - 1], huNetUpdatesRight[i - 1][j - 1], &huNetUpdatesLeft[i - 1][j - 1], &huNetUpdatesRight[i - 1][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
...@@ -439,11 +439,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -439,11 +439,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i - 1][j], h[i][j], &h[i - 1][j], &h[i][j],
hu[i - 1][j], hu[i][j], &hu[i - 1][j], &hu[i][j],
b[i - 1][j], b[i][j], &b[i - 1][j], &b[i][j],
hNetUpdatesLeft[i - 1][j - 1], hNetUpdatesRight[i - 1][j - 1], &hNetUpdatesLeft[i - 1][j - 1], &hNetUpdatesRight[i - 1][j - 1],
huNetUpdatesLeft[i - 1][j - 1], huNetUpdatesRight[i - 1][j - 1], &huNetUpdatesLeft[i - 1][j - 1], &huNetUpdatesRight[i - 1][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
...@@ -471,11 +471,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -471,11 +471,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i][j - 1], h[i][j], &h[i][j - 1], &h[i][j],
hv[i][j - 1], hv[i][j], &hv[i][j - 1], &hv[i][j],
b[i][j - 1], b[i][j], &b[i][j - 1], &b[i][j],
hNetUpdatesBelow[i - 1][j - 1], hNetUpdatesAbove[i - 1][j - 1], &hNetUpdatesBelow[i - 1][j - 1], &hNetUpdatesAbove[i - 1][j - 1],
hvNetUpdatesBelow[i - 1][j - 1], hvNetUpdatesAbove[i - 1][j - 1], &hvNetUpdatesBelow[i - 1][j - 1], &hvNetUpdatesAbove[i - 1][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
...@@ -508,11 +508,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -508,11 +508,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i - 1][j], h[i][j], &h[i - 1][j], &h[i][j],
hu[i - 1][j], hu[i][j], &hu[i - 1][j], &hu[i][j],
b[i - 1][j], b[i][j], &b[i - 1][j], &b[i][j],
hNetUpdatesLeft[i - 1][j - 1], hNetUpdatesRight[i - 1][j - 1], &hNetUpdatesLeft[i - 1][j - 1], &hNetUpdatesRight[i - 1][j - 1],
huNetUpdatesLeft[i - 1][j - 1], huNetUpdatesRight[i - 1][j - 1], &huNetUpdatesLeft[i - 1][j - 1], &huNetUpdatesRight[i - 1][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
...@@ -620,20 +620,20 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders () ...@@ -620,20 +620,20 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[0][j], h[1][j], &h[0][j], &h[1][j],
hu[0][j], hu[1][j], &hu[0][j], &hu[1][j],
b[0][j], b[1][j], &b[0][j], &b[1][j],
hNetUpdatesLeft[0][j - 1], hNetUpdatesRight[0][j - 1], &hNetUpdatesLeft[0][j - 1], &hNetUpdatesRight[0][j - 1],
huNetUpdatesLeft[0][j - 1], huNetUpdatesRight[0][j - 1], &huNetUpdatesLeft[0][j - 1], &huNetUpdatesRight[0][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[nx][j], h[nx + 1][j], &h[nx][j], &h[nx + 1][j],
hu[nx][j], hu[nx + 1][j], &hu[nx][j], &hu[nx + 1][j],
b[nx][j], b[nx + 1][j], &b[nx][j], &b[nx + 1][j],
hNetUpdatesLeft[nx][j - 1], hNetUpdatesRight[nx][j - 1], &hNetUpdatesLeft[nx][j - 1], &hNetUpdatesRight[nx][j - 1],
huNetUpdatesLeft[nx][j - 1], huNetUpdatesRight[nx][j - 1], &huNetUpdatesLeft[nx][j - 1], &huNetUpdatesRight[nx][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
...@@ -663,21 +663,21 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders () ...@@ -663,21 +663,21 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i - 1][1], h[i][1], &h[i - 1][1], &h[i][1],
hu[i - 1][1], hu[i][1], &hu[i - 1][1], &hu[i][1],
b[i - 1][1], b[i][1], &b[i - 1][1], &b[i][1],
hNetUpdatesLeft[i - 1][0], hNetUpdatesRight[i - 1][0], &hNetUpdatesLeft[i - 1][0], &hNetUpdatesRight[i - 1][0],
huNetUpdatesLeft[i - 1][0], huNetUpdatesRight[i - 1][0], &huNetUpdatesLeft[i - 1][0], &huNetUpdatesRight[i - 1][0],
maxEdgeSpeed maxEdgeSpeed
); );
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i - 1][end_ny_1_1 - 1], h[i][end_ny_1_1 - 1], &h[i - 1][end_ny_1_1 - 1], &h[i][end_ny_1_1 - 1],
hu[i - 1][end_ny_1_1 - 1], hu[i][end_ny_1_1 - 1], &hu[i - 1][end_ny_1_1 - 1], &hu[i][end_ny_1_1 - 1],
b[i - 1][end_ny_1_1 - 1], b[i][end_ny_1_1 - 1], &b[i - 1][end_ny_1_1 - 1], &b[i][end_ny_1_1 - 1],
hNetUpdatesLeft[i - 1][end_ny_1_1 - 2], hNetUpdatesRight[i - 1][end_ny_1_1 - 2], &hNetUpdatesLeft[i - 1][end_ny_1_1 - 2], &hNetUpdatesRight[i - 1][end_ny_1_1 - 2],
huNetUpdatesLeft[i - 1][end_ny_1_1 - 2], huNetUpdatesRight[i - 1][end_ny_1_1 - 2], &huNetUpdatesLeft[i - 1][end_ny_1_1 - 2], &huNetUpdatesRight[i - 1][end_ny_1_1 - 2],
maxEdgeSpeed maxEdgeSpeed
); );
...@@ -709,20 +709,20 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders () ...@@ -709,20 +709,20 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[1][j - 1], h[1][j], &h[1][j - 1], &h[1][j],
hv[1][j - 1], hv[1][j], &hv[1][j - 1], &hv[1][j],
b[1][j - 1], b[1][j], &b[1][j - 1], &b[1][j],
hNetUpdatesBelow[0][j - 1], hNetUpdatesAbove[0][j - 1], &hNetUpdatesBelow[0][j - 1], &hNetUpdatesAbove[0][j - 1],
hvNetUpdatesBelow[0][j - 1], hvNetUpdatesAbove[0][j - 1], &hvNetUpdatesBelow[0][j - 1], &hvNetUpdatesAbove[0][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[nx][j - 1], h[nx][j], &h[nx][j - 1], &h[nx][j],
hv[nx][j - 1], hv[nx][j], &hv[nx][j - 1], &hv[nx][j],
b[nx][j - 1], b[nx][j], &b[nx][j - 1], &b[nx][j],
hNetUpdatesBelow[nx - 1][j - 1], hNetUpdatesAbove[nx - 1][j - 1], &hNetUpdatesBelow[nx - 1][j - 1], &hNetUpdatesAbove[nx - 1][j - 1],
hvNetUpdatesBelow[nx - 1][j - 1], hvNetUpdatesAbove[nx - 1][j - 1], &hvNetUpdatesBelow[nx - 1][j - 1], &hvNetUpdatesAbove[nx - 1][j - 1],
maxEdgeSpeed maxEdgeSpeed
); );
...@@ -750,20 +750,20 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders () ...@@ -750,20 +750,20 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders ()
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i][0], h[i][1], &h[i][0], &h[i][1],
hv[i][0], hv[i][1], &hv[i][0], &hv[i][1],
b[i][0], b[i][1], &b[i][0], &b[i][1],
hNetUpdatesBelow[i - 1][0], hNetUpdatesAbove[i - 1][0], &hNetUpdatesBelow[i - 1][0], &hNetUpdatesAbove[i - 1][0],
hvNetUpdatesBelow[i - 1][0], hvNetUpdatesAbove[i - 1][0], &hvNetUpdatesBelow[i - 1][0], &hvNetUpdatesAbove[i - 1][0],
maxEdgeSpeed maxEdgeSpeed
); );
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[i][end_ny_1_2 - 2], h[i][end_ny_1_2 - 1], &[i][end_ny_1_2 - 2], &h[i][end_ny_1_2 - 1],
hv[i][end_ny_1_2 - 2], hv[i][end_ny_1_2 - 1], &hv[i][end_ny_1_2 - 2], &hv[i][end_ny_1_2 - 1],
b[i][end_ny_1_2 - 2], b[i][end_ny_1_2 - 1], &b[i][end_ny_1_2 - 2], &b[i][end_ny_1_2 - 1],
hNetUpdatesBelow[i - 1][end_ny_1_2 - 2], hNetUpdatesAbove[i - 1][end_ny_1_2 - 2], &hNetUpdatesBelow[i - 1][end_ny_1_2 - 2], &hNetUpdatesAbove[i - 1][end_ny_1_2 - 2],
hvNetUpdatesBelow[i - 1][end_ny_1_2 - 2], hvNetUpdatesAbove[i - 1][end_ny_1_2 - 2], &hvNetUpdatesBelow[i - 1][end_ny_1_2 - 2], &hvNetUpdatesAbove[i - 1][end_ny_1_2 - 2],
maxEdgeSpeed maxEdgeSpeed
); );
......
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