Skip to content

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

Some more crap 

Signed-off-by: 's avatarGaurav Kukreja <gmkukreja@gmail.com>
parent 3a7cc03c
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
src/blocks/SWE_WavePropagationBlock.cpp
View file @ 20720e5c
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#include <omp.h> #include <omp.h>
#endif #endif
#define VEC_LENGTH 4
/** /**
* Constructor of a SWE_WavePropagationBlock. * Constructor of a SWE_WavePropagationBlock.
* *
...@@ -192,11 +194,11 @@ SWE_WavePropagationBlock::computeNumericalFluxes () ...@@ -192,11 +194,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
); );
...@@ -435,7 +437,7 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -435,7 +437,7 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
// 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 = 2; j < end_ny_1_1; ++j) { for (j = 2; j < end_ny_1_1; j+=VEC_LENGTH) {
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates_cilk ( wavePropagationSolver.computeNetUpdates_cilk (
...@@ -467,7 +469,7 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -467,7 +469,7 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
// Vectorize the inner loop // Vectorize the inner loop
#pragma simd #pragma simd
#endif // WAVE_PROPAGATION_SOLVER==4 #endif // WAVE_PROPAGATION_SOLVER==4
for (j = 2; j < end_ny_1_2; j++) { for (j = 2; j < end_ny_1_2; j+=VEC_LENGTH) {
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates_cilk ( wavePropagationSolver.computeNetUpdates_cilk (
...@@ -504,7 +506,7 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -504,7 +506,7 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
#ifdef LOOP_OPENMP #ifdef LOOP_OPENMP
#pragma omp for schedule(static) nowait #pragma omp for schedule(static) nowait
#endif #endif
for (j = 2; j < end_ny_1_1; ++j) { for (j = 2; j < end_ny_1_1; j+=VEC_LENGTH) {
float maxEdgeSpeed; float maxEdgeSpeed;
wavePropagationSolver.computeNetUpdates_cilk ( wavePropagationSolver.computeNetUpdates_cilk (
......
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