Commit b995161d authored by Gaurav Kukreja's avatar Gaurav Kukreja

Removed Debug Prints

Signed-off-by: 's avatarGaurav Kukreja <gmkukreja@gmail.com>
parent 4bcb6a60
...@@ -430,8 +430,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -430,8 +430,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
for (i = 2; i < nx; i++) { for (i = 2; i < nx; i++) {
j; j;
//std::cout << __FILE__ << ": " << __LINE__ << endl;
#if WAVE_PROPAGATION_SOLVER==4 and defined VECTORIZE #if WAVE_PROPAGATION_SOLVER==4 and defined VECTORIZE
// Vectorization is currently only possible for the FWaveVec solver // Vectorization is currently only possible for the FWaveVec solver
// Vectorize the inner loop // Vectorize the inner loop
...@@ -492,8 +490,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -492,8 +490,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
//assert (j = ny + 2); //assert (j = ny + 2);
} }
std::cout << __FILE__ << ": " << __LINE__ << endl;
// vvvvv GKUKREJA : Fusing the loops for horizontal and vertical edges, adding this one extra iteration to avoid if looping. // vvvvv GKUKREJA : Fusing the loops for horizontal and vertical edges, adding this one extra iteration to avoid if looping.
{ {
...@@ -509,27 +505,23 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -509,27 +505,23 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
#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) {
float maxEdgeSpeed; float maxEdgeSpeed;
std::cout << __FILE__ << ": " << __LINE__ << endl; wavePropagationSolver.computeNetUpdates (
h[i - 1][j], h[i][j],
wavePropagationSolver.computeNetUpdates ( hu[i - 1][j], hu[i][j],
h[i - 1][j], h[i][j], b[i - 1][j], b[i][j],
hu[i - 1][j], hu[i][j], hNetUpdatesLeft[i - 1][j - 1], hNetUpdatesRight[i - 1][j - 1],
b[i - 1][j], b[i][j], huNetUpdatesLeft[i - 1][j - 1], huNetUpdatesRight[i - 1][j - 1],
hNetUpdatesLeft[i - 1][j - 1], hNetUpdatesRight[i - 1][j - 1], maxEdgeSpeed
huNetUpdatesLeft[i - 1][j - 1], huNetUpdatesRight[i - 1][j - 1], );
maxEdgeSpeed
);
std::cout << __FILE__ << ": " << __LINE__ << endl;
#ifdef LOOP_OPENMP #ifdef LOOP_OPENMP
//update the thread-local maximum wave speed //update the thread-local maximum wave speed
l_maxWaveSpeed = std::max (l_maxWaveSpeed, maxEdgeSpeed); l_maxWaveSpeed = std::max (l_maxWaveSpeed, maxEdgeSpeed);
#else // LOOP_OPENMP #else // LOOP_OPENMP
//update the maximum wave speed //update the maximum wave speed
maxWaveSpeed = std::max (maxWaveSpeed, maxEdgeSpeed); maxWaveSpeed = std::max (maxWaveSpeed, maxEdgeSpeed);
#endif // LOOP_OPENMP #endif // LOOP_OPENMP
} }
} }
...@@ -570,8 +562,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock () ...@@ -570,8 +562,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_innerBlock ()
time_needed += clock() - time_begin; time_needed += clock() - time_begin;
#endif #endif
#endif #endif
std::cout << __FILE__ << ": " << __LINE__ << endl;
} }
/** /**
...@@ -597,8 +587,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders () ...@@ -597,8 +587,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders ()
// compute the loop limits // compute the loop limits
const int end_ny_1_1 = ny + 1; const int end_ny_1_1 = ny + 1;
const int end_ny_1_2 = ny + 2; const int end_ny_1_2 = ny + 2;
std::cout << __FILE__ << ": " << __LINE__ << endl;
#ifdef LOOP_OPENMP #ifdef LOOP_OPENMP
#pragma omp parallel #pragma omp parallel
...@@ -770,8 +758,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders () ...@@ -770,8 +758,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders ()
maxEdgeSpeed maxEdgeSpeed
); );
std::cout << __FILE__ << ": " << __LINE__ << endl;
wavePropagationSolver.computeNetUpdates ( wavePropagationSolver.computeNetUpdates (
h[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],
...@@ -781,8 +767,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders () ...@@ -781,8 +767,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders ()
maxEdgeSpeed maxEdgeSpeed
); );
std::cout << __FILE__ << ": " << __LINE__ << endl;
#ifdef LOOP_OPENMP #ifdef LOOP_OPENMP
//update the thread-local maximum wave speed //update the thread-local maximum wave speed
l_maxWaveSpeed = std::max (l_maxWaveSpeed, maxEdgeSpeed); l_maxWaveSpeed = std::max (l_maxWaveSpeed, maxEdgeSpeed);
...@@ -827,8 +811,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders () ...@@ -827,8 +811,6 @@ SWE_WavePropagationBlock::computeNumericalFluxes_borders ()
time_needed += clock() - time_begin; time_needed += clock() - time_begin;
#endif #endif
#endif #endif
std::cout << __FILE__ << ": " << __LINE__ << endl;
} }
/** /**
......
...@@ -394,8 +394,6 @@ int main( int argc, char** argv ) { ...@@ -394,8 +394,6 @@ int main( int argc, char** argv ) {
l_topNeighborRank, l_topInflow, l_topOutflow, l_topNeighborRank, l_topInflow, l_topOutflow,
l_mpiRow ); l_mpiRow );
std::cout << "Exchanged Ghost Layers Initially\n";
// Init fancy progressbar // Init fancy progressbar
tools::ProgressBar progressBar(l_endSimulation, l_mpiRank); tools::ProgressBar progressBar(l_endSimulation, l_mpiRank);
...@@ -473,18 +471,12 @@ int main( int argc, char** argv ) { ...@@ -473,18 +471,12 @@ int main( int argc, char** argv ) {
// compute numerical flux for inner edge // compute numerical flux for inner edge
l_wavePropgationBlock.computeNumericalFluxes_innerBlock(); // Only Inner Block l_wavePropgationBlock.computeNumericalFluxes_innerBlock(); // Only Inner Block
std::cout << __FILE__ << ": " << __LINE__ << endl;
// checking if the borders have been exchanged // checking if the borders have been exchanged
MPI_Wait(l_request, &status); MPI_Wait(l_request, &status);
std::cout << __FILE__ << ": " << __LINE__ << endl;
// compute numerical flux for the blocks // compute numerical flux for the blocks
l_wavePropgationBlock.computeNumericalFluxes_borders(); // Only Borders l_wavePropgationBlock.computeNumericalFluxes_borders(); // Only Borders
std::cout << __FILE__ << ": " << __LINE__ << endl;
//! maximum allowed time step width within a block. //! maximum allowed time step width within a block.
float l_maxTimeStepWidth = l_wavePropgationBlock.getMaxTimestep(); float l_maxTimeStepWidth = l_wavePropgationBlock.getMaxTimestep();
......
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