Skip to content

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

Some Epic Crap 

Signed-off-by: 's avatarGaurav Kukreja <gaurav.kukreja@tum.de>
parent 20720e5c
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
src/blocks/SWE_WavePropagationBlock.cpp
View file @ c0b88cc6
...@@ -190,15 +190,15 @@ SWE_WavePropagationBlock::computeNumericalFluxes () ...@@ -190,15 +190,15 @@ SWE_WavePropagationBlock::computeNumericalFluxes ()
// Vectorize the inner loop // Vectorize the inner loop
#pragma simd #pragma simd
#endif // WAVE_PROPAGATION_SOLVER==4 and defined VECTORIZE #endif // WAVE_PROPAGATION_SOLVER==4 and defined VECTORIZE
for (; j < end_ny_1_1; ++j) { for (; j < end_ny_1_1; j+=VEC_LENGTH) {
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates_cilk (
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
); );
...@@ -252,15 +252,15 @@ SWE_WavePropagationBlock::computeNumericalFluxes () ...@@ -252,15 +252,15 @@ SWE_WavePropagationBlock::computeNumericalFluxes ()
// Vectorize the inner loop // Vectorize the inner loop
#pragma simd #pragma simd
#endif // WAVE_PROPAGATION_SOLVER==4 #endif // WAVE_PROPAGATION_SOLVER==4
for (; j < end_ny_1_2; j++) { for (; j < end_ny_1_2; j+=VEC_LENGTH) {
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates_cilk (
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
); );
...@@ -324,12 +324,12 @@ SWE_WavePropagationBlock::computeNumericalFluxes () ...@@ -324,12 +324,12 @@ SWE_WavePropagationBlock::computeNumericalFluxes ()
for (j = 1; j < end_ny_1_1; ++j) { for (j = 1; j < end_ny_1_1; ++j) {
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates_cilk (
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
); );
...@@ -761,7 +761,7 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders () ...@@ -761,7 +761,7 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders ()
); );
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
[i][end_ny_1_2 - 2], h[i][end_ny_1_2 - 1], h[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],
......
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