gcc dev

cmt/camel_setup.sh

@@ -79,3 +79,4 @@ echo "your CAMELROOT is $CAMELROOT"
 
 # put 1 at the end of next line if you want a closer look at compilaton
 export VERBOSE=
+echo "if you want more verbose compilation define VERBOSE environement variable to 1: export VERBOSE=1"

cmt/requirements-gcc

@@ -3,12 +3,13 @@ package CAMEL
 use class HEAD
 
 #compiler options
-#macro cpp "icpc"
-#macro cppflags " -O2  -ip -ansi_alias -align -Wbrief "
-
 #default is gcc here are the C++ compiler options
-macro cppflags " -O2 -pipe -ansi -Woverloaded-virtual -Wpedantic -Wunused -Wmaybe-uninitialized -Wno-deprecated -Wno-div-by-zero -Wno-variadic-macros"
-macro cflags  " -O2  -fopenmp "
+macro cppflags " -O3  -pipe -ansi -Woverloaded-virtual -Wpedantic -Wunused -Wmaybe-uninitialized -Wno-deprecated -Wno-div-by-zero "
+
+# although it may be strange we do not compile CAMEL with OMP because CLASS is not thread safe
+# no worries: CLASS is compiled with OMP
+#macro_append cppflags "-fopenmp "
+#macro_append cpplinkflags  " -fopenmp "
 
 
 #CAMEL includes

src/camel/Chi2Combiner.cc

@@ -86,15 +86,10 @@ Chi2Combiner::chi2_eff(const std::vector<double>& par) const {
       copy(par.begin(),par.end(),ostream_iterator<double>(os,"\t"));
     }
 
-    //update Engine
-
-    //1 seul thread
-    
-#pragma omp critical 
+#pragma omp critical
     {
       self->OK=engine->updateParValues(par);
     }
-
     if (!OK) {
       //A TUNER!!!!!!!!!!!!!1
       chi2=chi2_prev*10.;