From 537eaff51ecdd43a53e4fe8f2bed31b7da240e1d Mon Sep 17 00:00:00 2001
From: Stephane Plaszczynski <plaszczy@lal.in2p3.fr>
Date: Tue, 25 Jun 2019 17:26:08 +0200
Subject: [PATCH] remove many warnings

---
 cmt/requirements-lite.generic          |  2 +-
 src/AbsRand/OofNoise.cc                |  3 ++-
 src/camel/CMB/Lollipop.cc              |  2 +-
 src/camel/Class/ClassAdapters.hh       |  1 +
 src/camel/Class/ClassEngine.cc         | 20 ++++++--------------
 src/camel/Lensing/LensingLikelihood.hh |  2 +-
 src/camel/MCMC/exec/mainMCMC.cc        |  2 +-
 7 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/cmt/requirements-lite.generic b/cmt/requirements-lite.generic
index 1e16a18..776ec2c 100644
--- a/cmt/requirements-lite.generic
+++ b/cmt/requirements-lite.generic
@@ -4,7 +4,7 @@ use class *
 
 #compiler options
 #default is gcc here are the C++ compiler options
-macro cppflags " -O2 -pipe -fPIC -Wall "
+macro cppflags " -O2 -pipe -fPIC -Wall -Wno-reorder -Wno-sign-compare -Wno-unknown-pragmas"
 
 #do we need optimzations here?
 #macro_append cppflags "-ffast-math -m64 "
diff --git a/src/AbsRand/OofNoise.cc b/src/AbsRand/OofNoise.cc
index ada73c9..746ae8e 100644
--- a/src/AbsRand/OofNoise.cc
+++ b/src/AbsRand/OofNoise.cc
@@ -75,7 +75,8 @@ OofNoise::OofNoise(AbsGauss* r,double slope,double fmin,double fknee,double fsam
 
 OofNoise::~OofNoise(){
   for (unsigned i=0;i<ff.size();i++) delete ff[i];
-  if (_r) delete _r; _r=NULL;
+  if (_r) delete _r; 
+  _r=NULL;
 }
 
 double
diff --git a/src/camel/CMB/Lollipop.cc b/src/camel/CMB/Lollipop.cc
index 39157cb..4d167d3 100644
--- a/src/camel/CMB/Lollipop.cc
+++ b/src/camel/CMB/Lollipop.cc
@@ -86,7 +86,7 @@ void Lollipop::CreateDataSet( string DataFile)
   fp.close();
   
   if( (long)dataset.size() != Lmax-Lmin+1) {
-    printf( "Wrong number of l in datafile (%d)\n", (long)dataset.size());
+    printf( "Wrong number of l in datafile (%ld)\n", (long)dataset.size());
     exit(-1);
   }
 
diff --git a/src/camel/Class/ClassAdapters.hh b/src/camel/Class/ClassAdapters.hh
index 9b7d434..f509b45 100644
--- a/src/camel/Class/ClassAdapters.hh
+++ b/src/camel/Class/ClassAdapters.hh
@@ -27,6 +27,7 @@ class ClassAdapter
 {
 public:
   virtual std::string className() {return name;};
+  virtual ~ClassAdapter(){};
   virtual std::string toClass(const std::vector<double>& par) const=0;
 
 protected:
diff --git a/src/camel/Class/ClassEngine.cc b/src/camel/Class/ClassEngine.cc
index 9abb92f..dc35388 100644
--- a/src/camel/Class/ClassEngine.cc
+++ b/src/camel/Class/ClassEngine.cc
@@ -94,7 +94,7 @@ ClassEngine::ClassEngine(const ClassParams& pars): cl(0),dofree(true),pvecback(0
   //prepare fp structure
   size_t n=pars.size();
   //
-  parser_init(&fc,n,"pipo",_errmsg);
+  parser_init(&fc,n,const_cast<char*>("pipo"),_errmsg);
   
   //config
   for (size_t i=0;i<pars.size();i++){
@@ -151,7 +151,7 @@ ClassEngine::ClassEngine(const ClassParams& pars,const string & precision_file):
   fc_input.filename=new char[1];
  //prepare fc par structure
   size_t n=pars.size();
-  parser_init(&fc_input,n,"pipo",_errmsg);
+  parser_init(&fc_input,n,const_cast<char*>("pipo"),_errmsg);
   //config
   for (size_t i=0;i<pars.size();i++){
     strcpy(fc_input.name[i],pars.key(i).c_str());
@@ -568,9 +568,9 @@ double ClassEngine::get_Pklin(double k, double z){
 #ifdef CLASSV_ABOVE_2_7
   double pk_cb=0.;
   double pk_cb_ic=0.;
-  int ret=spectra_pk_at_k_and_z(&ba,&pm,&sp,k,z,&mypk,pk_ic,&pk_cb,&pk_cb_ic);
+  assert(spectra_pk_at_k_and_z(&ba,&pm,&sp,k,z,&mypk,pk_ic,&pk_cb,&pk_cb_ic)==_SUCCESS_);
 #else
-  int ret=spectra_pk_at_k_and_z(&ba,&pm,&sp,k,z,&mypk,pk_ic);
+  assert(spectra_pk_at_k_and_z(&ba,&pm,&sp,k,z,&mypk,pk_ic)==_SUCCESS_);
 #endif
 
   return mypk;
@@ -587,9 +587,9 @@ double ClassEngine::get_PkNL(double k, double z){
 
 #ifdef CLASSV_ABOVE_2_7
   double pk_cb_tot=0;
-  int ret = spectra_pk_nl_at_k_and_z(&ba,&pm,&sp,k,z,&mypk,&pk_cb_tot);
+  assert(spectra_pk_nl_at_k_and_z(&ba,&pm,&sp,k,z,&mypk,&pk_cb_tot)==_SUCCESS_);
 #else
-  int ret = spectra_pk_nl_at_k_and_z(&ba,&pm,&sp,k,z,&mypk);
+  assert(spectra_pk_nl_at_k_and_z(&ba,&pm,&sp,k,z,&mypk)==_SUCCESS_);
 #endif
   return mypk;
 }
@@ -727,17 +727,9 @@ double ClassEngine::get_Da(double z)
   int index;
   //transform redshift in conformal time
   background_tau_of_z(&ba,z,&tau);
-
   //call to fill pvecback
   background_at_tau(&ba,tau,ba.long_info,ba.inter_normal, &index, pvecback);
-
-
-  double H_z=pvecback[ba.index_bg_H];
   double D_ang=pvecback[ba.index_bg_ang_distance];
-#ifdef DBUG
-  cout << "H_z= "<< H_z <<endl;
-  cout << "D_ang= "<< D_ang <<endl;
-#endif
   return D_ang;
 }
 
diff --git a/src/camel/Lensing/LensingLikelihood.hh b/src/camel/Lensing/LensingLikelihood.hh
index 0895740..c3ac358 100644
--- a/src/camel/Lensing/LensingLikelihood.hh
+++ b/src/camel/Lensing/LensingLikelihood.hh
@@ -22,7 +22,7 @@ class LensingLikelihood
 {
 
 public:
-
+  virtual ~LensingLikelihood(){};
   virtual int lmax() const =0;
  //convention: return -log(L)
   virtual double computePPLikelihood(const std::vector<unsigned int>& l,
diff --git a/src/camel/MCMC/exec/mainMCMC.cc b/src/camel/MCMC/exec/mainMCMC.cc
index edc8068..14cc906 100644
--- a/src/camel/MCMC/exec/mainMCMC.cc
+++ b/src/camel/MCMC/exec/mainMCMC.cc
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
   //SP 25/06/19: compute scale if undefined depending on dim
   if (scale<0) {
       scale=2.38*2.38/dim;
-      cout << "refining scale to " << scale << endl;
+      cout << "defining scale factor as " << scale << endl;
   }
   //--------defining seeds-----------------------------------------------
   unsigned int seed(0);
-- 
GitLab