Modified SConstruct to fix bug with scalasca compilation

Signed-off-by: Gaurav Kukreja <gaurav.kukreja@tum.de>

SConstruct

@@ -244,6 +244,9 @@ if env['loop_openmp']:
 if env['write_output']:
   env.Append(CCFLAGS=['-DWRITE_OUTPUT'])
 
+if env['scalasca_instrument']:
+  env.Append(CCFLAGS=['-DSCALASCA_INSTRUMENT'])
+
 # Vectorization?
 if env['compileMode'] == 'release' and env['vectorize']:
   env.Append(CPPDEFINES=['VECTORIZE'])

build/options/SWE_intel_fwavevec_omp_vec.py

@@ -35,7 +35,7 @@ solver='fwavevec'
 #solver='augrie'
 #writeNetCDF='yes'
 write_output='no'
-scalasca_instrument='yes'
+scalasca_instrument='no'
 
 # Library paths (only required of not installed in default path)
 #netCDFDir=''

src/examples/swe_mpi.cpp

@@ -35,7 +35,9 @@
 #include <string>
 #include <vector>
 
+#ifdef SCALASCA_INSTRUMENT
 #include "epik_user.h"
+#endif
 
 #ifndef CUDA
 #include "blocks/SWE_WavePropagationBlock.hh"
@@ -444,7 +446,9 @@ int main( int argc, char** argv ) {
 
   unsigned int l_iterations = 0;
 
+#ifdef SCALASCA_INSTRUMENT
   EPIK_FUNC_START();
+#endif
 
   // loop over checkpoints
   for(int c=1; c<=l_numberOfCheckPoints; c++) {
@@ -513,7 +517,9 @@ int main( int argc, char** argv ) {
       progressBar.update(l_t);
     }
 
+#ifdef SCALASCA_INSTRUMENT
   EPIK_FUNC_END();
+#endif // SCALASCA_INSTRUMENT
 
 #ifdef WRITE_OUPUT
     // print current simulation time