Some small fixes for vectorization

SConstruct

@@ -197,9 +197,9 @@ env.Append(CCFLAGS=['-fstrict-aliasing', '-fargument-noalias'])
 if env['compileMode'] == 'release' and env['vectorize']:
   env.Append(CPPDEFINES=['VECTORIZE'])
   if env['compiler'] == 'intel':
-    env.Append(CCFLAGS=['-xHost'])
+    env.Append(CCFLAGS=['-xavx'])
 if env['compiler'] == 'intel' and env['showVectorization']:
-  env.Append(CCFLAGS=['-vec-report2'])
+  env.Append(CCFLAGS=['-vec-report3'])
   
 # Platform
 if env['compiler'] == 'intel' and env['platform'] == 'mic':

src/blocks/SWE_WavePropagationBlock.cpp

@@ -26,6 +26,8 @@
  * SWE_Block, which uses solvers in the wave propagation formulation.
  */
 
+#include "tools/Logger.hh"
+
 #include "SWE_WavePropagationBlock.hh"
 
 #include <cassert>
@@ -36,8 +38,6 @@
 #include <omp.h>
 #endif
 
-#include "tools/Logger.hh"
-
 /**
  * Constructor of a SWE_WavePropagationBlock.
  *
@@ -114,7 +114,7 @@ void SWE_WavePropagationBlock::computeNumericalFluxes() {
 	tools::Logger::logger.resetCpuClockToCurrentTime();
 
 	//maximum (linearized) wave speed within one iteration
-	float maxWaveSpeed = (float) 0.;
+	float maxWaveSpeed = (float) .0;
 
 	// compute the net-updates for the vertical edges
 
@@ -138,7 +138,6 @@ void SWE_WavePropagationBlock::computeNumericalFluxes() {
 #endif // VECTORIZE
 #endif // WAVE_PROPAGATION_SOLVER==4
 		for(int j = 1; j < ny+1; j++) {
-
 			float maxEdgeSpeed;
 
 			#if WAVE_PROPAGATION_SOLVER!=3

swe_solvers @ 9f7fe2f2

-Subproject commit 2569cc274f93ca7af014e972bc1fed7b0b1df7ef
+Subproject commit 9f7fe2f2ebc31a9c9e68583232748fb5de7dba18