Merge branch '2.6' into devel

* 2.6: version number changed to 2.6.3 modified the recent fix in setup.py to keep compatibility with python 3 added sigma8 in explanatory.ini
hongwanliu · Oct 24, 2017 · 1c29dc0 · 1c29dc0
2 parents 5b99e07 + fb19e3e
commit 1c29dc0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/explanatory.ini b/explanatory.ini
@@ -501,10 +501,11 @@ P_k_ini type = analytic_Pk
 
 k_pivot = 0.05
 
-2.a.2) scalar adiabatic perturbations: curvature power spectrum value at pivot scale ('A_s' or 'ln10^{10}A_s'), tilt at the same scale 'n_s', and tilt running 'alpha_s' (default: set 'A_s' to 2.215e-9, 'n_s' to 0.9619, 'alpha_s' to 0)
+2.a.2) scalar adiabatic perturbations: curvature power spectrum value at pivot scale ('A_s' or 'ln10^{10}A_s') OR 'sigma8' (found by iterations using a shooting method), tilt at the same scale 'n_s', and tilt running 'alpha_s' (default: set 'A_s' to 2.215e-9, 'n_s' to 0.9619, 'alpha_s' to 0)
 
 A_s = 2.215e-9
 #ln10^{10}A_s = 3.0980
+# sigma8 = 0.848365
 n_s = 0.9619
 alpha_s = 0.
 

diff --git a/include/common.h b/include/common.h
@@ -15,7 +15,7 @@
 #ifndef __COMMON__
 #define __COMMON__
 
-#define _VERSION_ "v2.6.2"
+#define _VERSION_ "v2.6.3"
 /* @cond INCLUDE_WITH_DOXYGEN */
 
 #define _TRUE_ 1 /**< integer associated to true statement */

diff --git a/python/setup.py b/python/setup.py
@@ -17,7 +17,7 @@
 MVEC_STRING = sbp.Popen(
     ['gcc', '-lmvec'],
     stderr=sbp.PIPE).communicate()[1]
-if "library not found" not in MVEC_STRING:
+if b"mvec" not in MVEC_STRING:
     liblist += ["mvec","m"]
 
 # Recover the CLASS version

diff --git a/source/nonlinear.c b/source/nonlinear.c
@@ -372,7 +372,7 @@ int nonlinear_halofit(
   double k_integrand;
   double lnpk_integrand;
 
-  double x2,R;
+  double R;
 
   double * w_and_Omega;
 

diff --git a/source/spectra.c b/source/spectra.c
@@ -2614,7 +2614,7 @@ int spectra_pk(
   int index_ic1,index_ic2,index_ic1_ic1,index_ic2_ic2,index_ic1_ic2;
   int index_k;
   int index_tau;
-  int delta_index_nl;
+  int delta_index_nl=0;
   double * primordial_pk; /* array with argument primordial_pk[index_ic_ic] */
   double source_ic1;
   double source_ic2;