Skip to content

GitLab

Commit 73c705c4 authored by Plaszczynski Stephane's avatar Plaszczynski Stephane
Browse files

put FASTPK optin as default

parent 96ae109f
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 271 deletions
cmt/requirements-dec
View file @ 73c705c4
......@@ -68,22 +68,15 @@ library Minuit -no_share $(CAMELROOT)/src/Minuit2-5.28.00/src/*.cxx
library Util -no_share -x=ddl.cc $(CAMELROOT)/src/cxxsupport/*.cc
library AbsRand -no_share $(CAMELROOT)/src/AbsRand/*.cc
library CLHEP -no_share $(CAMELROOT)/src/CLHEP/src/*.cc
library class_extra -no_share $(CAMELROOT)/src/class_extra/*.c
macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc Pk/*.cc"
library MinuitFit -no_share -s=$(CAMELROOT)/src/camel $(camelsrc)
library MCMC -no_share -s=$(CAMELROOT)/src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil -lclass_extra "
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
#CLASS optional FastPk access
macro_append cppflags " -DFASTPK "
#class extras
library class_extra -no_share $(CAMELROOT)/src/class_extra/*.c
macro_append CAMEL_linkopts " -lclass_extra "
#CAMEL applications
# pour relinker si changement: toutes les application du package
macro CAMEL_stamps " $(CAMELROOT)/$(CMTCONFIG)/MinuitFit.stamp $(CAMELROOT)/$(CMTCONFIG)/MCMC.stamp "
......
cmt/requirements-fastpk deleted 100644 → 0
View file @ 96ae109f
package CAMEL
use class *
#CLASS optional FastPk access
macro_append cppflags " -DFASTPK "
#compiler options
#default is gcc here are the C++ compiler options
macro cppflags " -O3 -pipe -ansi -fPIC -Wall "
#do we need optimzations here?
#macro_append cppflags "-ffast-math -m64 "
# 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
include_dirs " $(CAMELROOT)/src"
include_dirs " $(CAMELROOT)/src/camel"
include_dirs " $(CAMELROOT)/src/Minuit2-5.28.00/src"
include_dirs " $(CAMELROOT)/src/Minuit2-5.28.00/inc"
include_dirs "$(CAMELROOT)/src/cxxsupport"
include_dirs "$(CAMELROOT)/src/AbsRand"
include_dirs "$(CAMELROOT)/src/camel/JLA"
include_dirs "$(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src"
#cfitsio
include_dirs "/usr/include/cfitsio"
macro_append CAMEL_linkopts " -lcfitsio"
#JLA :requires cblas/lapack
#macro_append cppflags ' -DJLA '
#include_dirs "/usr/include/atlas"
#macro_append CAMEL_linkopts " -L/usr/lib64/atlas -ltatlas -llapack -ljla "
#application test_jla -group=test -s=$(CAMELROOT)/src/camel test/test_jla.cc
#library jla -no_share $(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src/ini.c $(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src/jla.cc
#PLANCK
#macro_append cppflags " -DCLIK $(CLIKCFLAGS)"
#macro_append cflags " -DCLIK $(CLIKCFLAGS)"
#macro_append CAMEL_linkopts " $(CLIKLIBS) "
#include_dirs "$(CLIKDIR)/include"
#include_dirs "$(CLIKDIR)/src"
#macro_append cppflags " -DCLIK "
#macro_append cflags " -DCLIK "
#macro_append CAMEL_linkopts "-L$(CLIKDIR)/lib -lclik "
#path_append LD_LIBRARY_PATH "$(CLIKDIR)/lib"
#application dump_clik -group=test -s=$(CAMELROOT)/src/camel test/test_clik.cc
#application dump_lensing -group=test -s=$(CAMELROOT)/src/camel test/test_lensing.cc
# PICO
#macro_append cppflags " -DPICO $(PICOINC) "
#macro_append CAMEL_linkopts " -L$(PICO_CODE) -lpico -lpython2.7 "
# the previous line should be sufficient otherwise try the PICOLIBS
# (set in camel_setup.sh)
#macro_append CAMEL_linkopts " $(PICOLIBS)"
#macro_append cppflags ' -DPICODATA=\"$(PICO_DATA)\" '
#application testPico -group=test -s=$(CAMELROOT)/src/camel/pico/exec testPico.cc
###FROM THERE YOU DONT NEED TO TOUCH
###########################################################################################
#CAMEL LIBRARIES
library Minuit -no_share $(CAMELROOT)/src/Minuit2-5.28.00/src/*.cxx
library Util -no_share -x=ddl.cc $(CAMELROOT)/src/cxxsupport/*.cc
library AbsRand -no_share $(CAMELROOT)/src/AbsRand/*.cc
library CLHEP -no_share $(CAMELROOT)/src/CLHEP/src/*.cc
macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc Pk/*.cc"
library MinuitFit -no_share -s=$(CAMELROOT)/src/camel $(camelsrc)
library MCMC -no_share -s=$(CAMELROOT)/src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
#class extras
library class_extra -no_share $(CAMELROOT)/src/class_extra/*.c
macro_append CAMEL_linkopts " -lclass_extra "
#CAMEL applications
# pour relinker si changement: toutes les application du package
macro CAMEL_stamps " $(CAMELROOT)/$(CMTCONFIG)/MinuitFit.stamp $(CAMELROOT)/$(CMTCONFIG)/MCMC.stamp "
macro application_suffix ""
#groupe exec
application writeChi2 -group=exec -s=$(CAMELROOT)/src/camel exec/writeChi2.cc
application writeSpectra -group=exec -s=$(CAMELROOT)/src/camel exec/writeSpectra.cc
application writePk -group=exec -s=$(CAMELROOT)/src/camel exec/writePk.cc
application Minimize -group=exec -s=$(CAMELROOT)/src/camel exec/Minimize.cc
application Profile -group=exec -s=$(CAMELROOT)/src/camel exec/Profile.cc
application ScanParam -group=exec -s=$(CAMELROOT)/src/camel exec/ScanParam.cc
application mcmc -group=exec -s=$(CAMELROOT)/src/camel/MCMC exec/mainMCMC.cc
#tests
application testKlass -group=test -s=$(CAMELROOT)/src/camel test/testKlass.cc
application testCLHEP -group=test -s=$(CAMELROOT)/src/camel/test testCLHEP.cc
application testBAO -group=test -s=$(CAMELROOT)/src/camel/test testBAO.cc
application testHiLLiPOP -group=test -s=$(CAMELROOT)/src/camel/test testHiLLiPOP.cc
#lIST OF ALL DEPENDENCIES
macro_append Minimize_dependencies " MinuitFit "
macro_append Profile_dependencies " MinuitFit "
macro_append ScanParam_dependencies " MinuitFit "
macro_append writeChi2_dependencies " MinuitFit "
macro_append writeSpectra_dependencies " MinuitFit "
macro_append writeSpectraPkependencies " MinuitFit "
macro_append mcmc_dependencies " MinuitFit "
macro_append mcmc_dependencies " MCMC "
macro_append testKlass_dependencies " MinuitFit"
macro_append clik_example_CC_dependencies " MinuitFit "
macro_append test_clik_dependencies " MinuitFit "
macro_append test_lensing_dependencies " MinuitFit "
macro_append testCLHEP_dependencies " CLHEP "
macro_append testBAO_dependencies " MinuitFit "
macro_append testHiLLiPOP_dependencies " MinuitFit "
macro_append test_jla_dependencies " MinuitFit "
cmt/requirements-gcc
View file @ 73c705c4
package CAMEL
use class HEAD
use class *
#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 "
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
......@@ -28,11 +28,11 @@ include_dirs "$(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src"
#macro_append CAMEL_linkopts " -L$(CLIKDIR) -lcfitsio"
macro_append CAMEL_linkopts " -lcfitsio"
#JLA :requires cblas/lapack
#macro_append cppflags ' -DJLA '
#include_dirs "/usr/include/atlas"
#macro_append CAMEL_linkopts " -L/usr/lib/atlas-base -lcblas -llapack_atlas -ljla "
#application test_jla -group=test -s=$(CAMELROOT)/src/camel test/test_jla.cc
#JLA :requires cblas/lapack (you may try atlas for these)
macro_append cppflags ' -DJLA '
include_dirs "/usr/include/atlas"
macro_append CAMEL_linkopts " -ljla -L/usr/lib/atlas-base/atlas -lblas -llapack "
application test_jla -group=test -s=$(CAMELROOT)/src/camel test/test_jla.cc
#PLANCK
......@@ -71,12 +71,13 @@ library Util -no_share -x=ddl.cc $(CAMELROOT)/src/cxxsupport/*.cc
library AbsRand -no_share $(CAMELROOT)/src/AbsRand/*.cc
library CLHEP -no_share $(CAMELROOT)/src/CLHEP/src/*.cc
library jla -no_share $(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src/ini.c $(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src/jla.cc
library class_extra -no_share $(CAMELROOT)/src/class_extra/*.c
macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc"
library MinuitFit -no_share -s=$(CAMELROOT)/src/camel $(camelsrc)
library MCMC -no_share -s=$(CAMELROOT)/src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil -lclass_extra "
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
......
cmt/requirements-gcc-ifort deleted 100644 → 0
View file @ 96ae109f
package CAMEL
use class v2.4.3
path_append CMTPATH "/sps/hep/cobesix/software/gcc/camel"
#compiler options
macro cppflags " -O2 -pipe -ansi -Woverloaded-virtual "
#CAMEL includes
include_dirs " ../src"
include_dirs "../src/camel"
include_dirs "../src/Minuit2-5.28.00/src"
include_dirs "../src/Minuit2-5.28.00/inc"
include_dirs "../src/cxxsupport"
include_dirs "../src/AbsRand"
include_dirs "../src/camel/JLA"
include_dirs "../src/camel/JLA/jla_likelihood_v3/src"
#JLA :needs cblas/lapack
macro_append cppflags ' -DJLA '
macro_append CAMEL_linkopts " -L/usr/local/intel/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_intel_thread -ljla "
#include_dirs "/usr/include/atlas"
#macro_append CAMEL_linkopts " -L/usr/lib64/atlas -lcblas -llapack -ljla "
#cfitsio use same than plc
#include_dirs "$(CLIKDIR)/include"
#macro_append CAMEL_linkopts " -L$(CLIKDIR)/lib -lcfitsio "
#PLANCK
macro_append cppflags " -DCLIK $(CLIKCFLAGS)"
macro_append cflags " -DCLIK $(CLIKCFLAGS)"
#include_dirs "$(CLIKDIR)/include"
#macro_append CAMEL_linkopts "-L$(CLIKDIR)/lib -lcfitsio -lclik "
macro_append CAMEL_linkopts " $(CLIKLIBS) "
# PICO
include_dirs "/usr/local/python/python-2.7/include/python2.7"
include_dirs "/usr/local/python/python-2.7/lib/python2.7/site-packages/numpy/core/include"
#pypico v3-2 from plaszczy
macro_append CAMEL_linkopts " -L/sps/hep/cobesix/software/gcc/camel/pico/pypico-3.2.0 -lpico -L/usr/local/python/python-2.7/lib -lpython2.7 "
macro_append cppflags ' -DPICODATA=\"/sps/hep/cobesix/software/gcc/camel/pico/pico_data/pico3_tailmonty_v33.dat\" '
#CAMEL LIBRARIES
library Minuit -no_share ../src/Minuit2-5.28.00/src/*.cxx
library Util -no_share -x=ddl.cc ../src/cxxsupport/*.cc
library AbsRand -no_share ../src/AbsRand/*.cc
library CLHEP -no_share ../src/CLHEP/src/*.cc
library jla -no_share ../src/camel/JLA/jla_likelihood_v3/src/ini.c ../src/camel/JLA/jla_likelihood_v3/src/jla.cc
macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc"
library MinuitFit -no_share -s=../src/camel $(camelsrc)
library MCMC -no_share -s=../src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro_append cppflags ' -DPARFILE=\"$(CAMELROOT)/par\" '
#CAMEL applications
# pour relinker si changement: toutes les application du package
macro CAMEL_stamps $(PACKAGE_ROOT)/$(CMTCONFIG)/MinuitFit.stamp
macro application_suffix ""
#groupe exec
application writeChi2 -group=exec -s=../src/camel exec/writeChi2.cc
application writeSpectra -group=exec -s=../src/camel exec/writeSpectra.cc
application Minimize -group=exec -s=../src/camel exec/Minimize.cc
application ScanParam -group=exec -s=../src/camel exec/ScanParam.cc
application mcmc -group=exec -s=../src/camel/MCMC exec/mainMCMC.cc
#tests
application testKlass -group=test -s=../src/camel test/testKlass.cc
application testCLHEP -group=test -s=../src/camel/test testCLHEP.cc
application testBAO -group=test -s=../src/camel/test testBAO.cc
application testHiLLiPOP -group=test -s=../src/camel/test testHiLLiPOP.cc
application test_clik -group=test -s=../src/camel test/test_clik.cc
application test_lensing -group=test -s=../src/camel test/test_lensing.cc
application test_jla -group=test -s=../src/camel test/test_jla.cc
application testPico -group=test -s=../src/camel/pico/exec testPico.cc
#lIST OF ALL DEPENDENCIES
macro_append Minimize_dependencies " MinuitFit "
macro_append ScanParam_dependencies " MinuitFit "
macro_append writeChi2_dependencies " MinuitFit "
macro_append writeSpectra_dependencies " MinuitFit "
macro_append mcmc_dependencies " MinuitFit MCMC"
macro_append testKlass_dependencies " MinuitFit"
macro_append clik_example_CC_dependencies " MinuitFit "
macro_append test_clik_dependencies " MinuitFit "
macro_append test_lensing_dependencies " MinuitFit "
macro_append testCLHEP_dependencies " CLHEP "
macro_append testBAO_dependencies " MinuitFit "
macro_append testHiLLiPOP_dependencies " MinuitFit "
macro_append test_jla_dependencies " MinuitFit "
macro_append testPico_dependencies " MinuitFit "
cmt/requirements-icc
View file @ 73c705c4
package CAMEL
use class v*
use class *
#compiler options
macro cpp "icpc"
......@@ -48,12 +48,13 @@ library Util -no_share -x=ddl.cc $(CAMELROOT)/src/cxxsupport/*.cc
library AbsRand -no_share $(CAMELROOT)/src/AbsRand/*.cc
library CLHEP -no_share $(CAMELROOT)/src/CLHEP/src/*.cc
library jla -no_share $(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src/ini.c $(CAMELROOT)/src/camel/JLA/jla_likelihood_v3/src/jla.cc
library class_extra -no_share $(CAMELROOT)/src/class_extra/*.c
macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc"
library MinuitFit -no_share -s=$(CAMELROOT)/src/camel $(camelsrc)
library MCMC -no_share -s=$(CAMELROOT)/src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil -lclass_extra "
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
......
cmt/requirements-lite
View file @ 73c705c4
......@@ -2,10 +2,6 @@ package CAMEL
use class *
#CLASS optional FastPk access
#macro_append cppflags " -DFASTPK "
#compiler options
#default is gcc here are the C++ compiler options
macro cppflags " -O3 -pipe -ansi -fPIC -Wall "
......@@ -73,12 +69,13 @@ library Minuit -no_share $(CAMELROOT)/src/Minuit2-5.28.00/src/*.cxx
library Util -no_share -x=ddl.cc $(CAMELROOT)/src/cxxsupport/*.cc
library AbsRand -no_share $(CAMELROOT)/src/AbsRand/*.cc
library CLHEP -no_share $(CAMELROOT)/src/CLHEP/src/*.cc
library class_extra -no_share $(CAMELROOT)/src/class_extra/*.c
macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc Pk/*.cc"
library MinuitFit -no_share -s=$(CAMELROOT)/src/camel $(camelsrc)
library MCMC -no_share -s=$(CAMELROOT)/src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil -lclass_extra "
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
......
cmt/requirements-lsst
View file @ 73c705c4
......@@ -58,12 +58,13 @@ library Util -no_share -x=ddl.cc ../src/cxxsupport/*.cc
library AbsRand -no_share ../src/AbsRand/*.cc
library CLHEP -no_share ../src/CLHEP/src/*.cc
library jla -no_share ../src/camel/JLA/jla_likelihood_v3/src/ini.c ../src/camel/JLA/jla_likelihood_v3/src/jla.cc
library class_extra -no_share $(CAMELROOT)/src/class_extra/*.c
macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc"
library MinuitFit -no_share -s=../src/camel $(camelsrc)
library MCMC -no_share -s=../src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro CAMEL_linkopts "-L$(CAMELROOT)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil -lclass_extra "
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
......
cmt/requirements.nersc
View file @ 73c705c4
......@@ -48,12 +48,13 @@ library Util -no_share -x=ddl.cc ../src/cxxsupport/*.cc
library AbsRand -no_share ../src/AbsRand/*.cc
library CLHEP -no_share ../src/CLHEP/src/*.cc
library jla -no_share ../src/camel/JLA/jla_likelihood_v3/src/ini.c ../src/camel/JLA/jla_likelihood_v3/src/jla.cc
library class_extra -no_share $(CAMELROOT)/src/class_extra/*.c
macro camelsrc "*.cc CMB/*.cc BAO/*.cc Lensing/*.cc pico/*.cc JLA/*.cc Class/*.cc Constraints/*.cc"
library MinuitFit -no_share -s=../src/camel $(camelsrc)
library MCMC -no_share -s=../src/camel/MCMC *.cc
macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil "
macro CAMEL_linkopts "-L$(CAMEL_root)/${CMTCONFIG} -lMinuitFit -lMinuit -lMCMC -lCLHEP -lAbsRand -lUtil -lclass_extra "
macro_append cppflags ' -DRELPATH=\"$(CAMELROOT)/lik\" '
......
src/camel/Class/ClassEngine.cc
View file @ 73c705c4
......@@ -11,7 +11,7 @@
// ------------------------
// Collaborating classes --
//-------------------------
// C++
#include "class_extra/spectra_extra.h"
//--------------------
#include<iostream>
#include <iomanip>
......@@ -719,12 +719,6 @@ double ClassEngine::get_DMod(double z){
}
#ifdef FASTPK
//fast access
#include "class_extra/spectra_extra.h"
bool
ClassEngine::get_Pkvec(const std::vector<double>& knodes, const std::vector<double>& zvec, std::vector<double>& pks)
{
......@@ -734,8 +728,6 @@ ClassEngine::get_Pkvec(const std::vector<double>& knodes, const std::vector<doub
}
#endif
bool
ClassEngine::get_PklinNodes(std::vector<double>& knodes,std::vector<double>& pknodes){
......
src/camel/Class/ClassEngine.hh
View file @ 73c705c4
......@@ -110,12 +110,6 @@ public:
//services
virtual bool has_Background() const {return true;}
// //virtual bool has_CMB_Cl() const {return (_output.find("tCl")!=std::string::npos);}
// virtual bool has_CMB_ClPol() const {return (_output.find("pCl")!=std::string::npos);}
// virtual bool has_CMB_Lensing() const {return (_output.find("lCl")!=std::string::npos);}
// virtual bool has_Pklin() const {return (_output.find("mPk")!=std::string::npos);}
// virtual bool has_PkNL() const {return _nonlin;}
//class based
inline bool has_CMB_Cl() const {return (pt.has_cl_cmb_temperature==_TRUE_);}
inline bool has_CMB_ClPol() const {return (pt.has_cl_cmb_polarization==_TRUE_);}
......@@ -173,16 +167,14 @@ public:
inline bool get_PkNodes(std::vector<double>& knodes,std::vector<double>& Pknodes)
{return (has_PkNL()? get_PkNLNodes(knodes,Pknodes) : get_PklinNodes(knodes,Pknodes));}
#ifdef FASTPK
//vectorized access (if macro defined): with switch according to has_NL
// outout vector pks must be properly sized (see Engine.hh)
//vectorized access: faster (uses class_extra from camel)
// outout vector pks must be already sized (see Engine.hh)
bool get_Pkvec(const std::vector<double>& kin, const std::vector<double>& z,std::vector<double>& pks);
inline bool get_Pkvec(const std::vector<double>& kvec,const double& z, std::vector<double>& pks){
std::vector<double> zvec(1,z);
return this->get_Pkvec(kvec,zvec,pks);
}
#endif
//combile distance
......
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