Changed linker and compiler to use Scalasca

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

SConstruct

@@ -116,7 +116,9 @@ vars.AddVariables(
 
   BoolVariable( 'loop_openmp', 'enable loop parallelization using OpenMP', False ),
 
-  BoolVariable( 'write_output', 'write output files at each checkpoint', True )
+  BoolVariable( 'write_output', 'write output files at each checkpoint', True ),
+
+  BoolVariable( 'scalasca_instrument', 'enable when code has been instrumented with scalasca, to use scalasca during compilation', False )
 )
 
 # external variables
@@ -170,6 +172,9 @@ if env['copyenv']:
 if env['parallelization'] in ['mpi', 'mpi_with_cuda']: 
   if env['compiler'] == 'cray':
     env['CXX'] = 'CC'
+  else:
+    if env['scalasca_instrument']:
+      env['CXX'] = env['LINKERFORPROGRAMS'] = env.Detect(['scalasca -instrument -comp=none -user -mode=MPI mpiCC', 'scalasca -instrument -comp=none -user -mode=MPI mpicxx'])
     else:
       env['CXX'] = env['LINKERFORPROGRAMS'] = env.Detect(['mpiCC', 'mpicxx'])
   if not env['CXX']:

build/options/SWE_intel_fwavevec_omp_vec.py

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