Commit 8460ae8a authored by Plaszczynski Stephane's avatar Plaszczynski Stephane
Browse files

gcc dev

parent e2013ec5
...@@ -79,3 +79,4 @@ echo "your CAMELROOT is $CAMELROOT" ...@@ -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 # put 1 at the end of next line if you want a closer look at compilaton
export VERBOSE= export VERBOSE=
echo "if you want more verbose compilation define VERBOSE environement variable to 1: export VERBOSE=1"
...@@ -3,12 +3,13 @@ package CAMEL ...@@ -3,12 +3,13 @@ package CAMEL
use class HEAD use class HEAD
#compiler options #compiler options
#macro cpp "icpc"
#macro cppflags " -O2 -ip -ansi_alias -align -Wbrief "
#default is gcc here are the C++ compiler options #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 cppflags " -O3 -pipe -ansi -Woverloaded-virtual -Wpedantic -Wunused -Wmaybe-uninitialized -Wno-deprecated -Wno-div-by-zero "
macro cflags " -O2 -fopenmp "
# 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 #CAMEL includes
......
...@@ -86,15 +86,10 @@ Chi2Combiner::chi2_eff(const std::vector<double>& par) const { ...@@ -86,15 +86,10 @@ Chi2Combiner::chi2_eff(const std::vector<double>& par) const {
copy(par.begin(),par.end(),ostream_iterator<double>(os,"\t")); copy(par.begin(),par.end(),ostream_iterator<double>(os,"\t"));
} }
//update Engine #pragma omp critical
//1 seul thread
#pragma omp critical
{ {
self->OK=engine->updateParValues(par); self->OK=engine->updateParValues(par);
} }
if (!OK) { if (!OK) {
//A TUNER!!!!!!!!!!!!!1 //A TUNER!!!!!!!!!!!!!1
chi2=chi2_prev*10.; chi2=chi2_prev*10.;
......
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