Skip to content

GitLab

Docker-in-Docker (DinD) capabilities of public runners deactivated. More info

Commit 2f1e1948 authored by Jean-Eric Campagne's avatar Jean-Eric Campagne
Browse files

(JEC) 24/3/16 transfert code from test_suite to laguerre2bessel. Cleanup code.... 

(JEC) 24/3/16 transfert code from test_suite to laguerre2bessel. Cleanup code. remove using namespace in global space
parent fb5907a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 861 additions and 1309 deletions
Makefile
View file @ 2f1e1948
......@@ -140,6 +140,7 @@ CXXHDR = $(SRC)lagsht_exceptions.h \
$(SRC)walltimer.h \
$(SRC)lagsht_bessel.h \
$(SRC)laguerre2bessel.h \
$(SRC)lagsht_func.h \
$(SRC)quadinteg.h
CPPFLAGS += $(BLASYES) $(SHARPINC) $(BLASINC) $(BOOSTINC) $(FFTWINC)
......
src/lagSphericTransform.cc
View file @ 2f1e1948
......@@ -15,9 +15,9 @@
namespace LagSHT {
void LaguerreSphericalTransform::Synthesis(const vector< complex<r_8> >& flmn,
vector<r_8>& fijk,
vector< complex<r_8> >& flmk) {
void LaguerreSphericalTransform::Synthesis(const std::vector< std::complex<r_8> >& flmn,
std::vector<r_8>& fijk,
std::vector< std::complex<r_8> >& flmk) {
int Ntot3DPix = Npix_*N_;
int NtotCoeff = Nalm_*N_;
if(flmn.size() != (size_t)NtotCoeff) throw LagSHTError("SphLagTransform::Synthesis size error");
......@@ -25,7 +25,6 @@ void LaguerreSphericalTransform::Synthesis(const vector< complex<r_8> >& flmn,
fijk.resize(Ntot3DPix);
//Perform the Inverse Laguerre Transform first
// vector< complex<r_8> > flmk(NtotCoeff);
flmk.resize(NtotCoeff);
......@@ -52,7 +51,7 @@ void LaguerreSphericalTransform::Synthesis(const vector< complex<r_8> >& flmn,
off7k = n*Npix_;
#if DEBUG >= 2
cout << "Synthesis... at shell num: " << n << endl;
std::cout << "Synthesis... at shell num: " << n << std::endl;
#endif
sphere_->alm2map(reinterpret_cast<const r_8*>(&(flmk.data()[off7n])),&fijk.data()[off7k],false); //the false is to forbidd accumulation
......@@ -61,15 +60,15 @@ void LaguerreSphericalTransform::Synthesis(const vector< complex<r_8> >& flmn,
tstack_pop("SHT Synthesis");
#if DEBUG >= 1
cout << "SphLagTransform::Synthesis.... Done" << endl;
std::cout << "SphLagTransform::Synthesis.... Done" << std::endl;
#endif
}//Synthesis
void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk,
vector< complex<r_8> >& flmn,
vector< complex<r_8> >& almk
void LaguerreSphericalTransform::Analysis(const std::vector<r_8>& fijk,
std::vector< std::complex<r_8> >& flmn,
std::vector< std::complex<r_8> >& almk
) {
int Ntot3DPix = Npix_*N_;
int NtotCoeff = Nalm_*N_;
......@@ -79,7 +78,7 @@ void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk,
//done in Laguerre routine flmn.resize(NtotCoeff);
#if DEBUG >= 1
cout << "SphLagTransform::Analysis.... Go..." << endl;
std::cout << "SphLagTransform::Analysis.... Go..." << std::endl;
#endif
//Perform the Spherical Hamonic analysis first
......@@ -93,7 +92,7 @@ void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk,
off7k = n*Npix_;
#if DEBUG >= 1
cout << "Start Harmonic Spheric... at n = "<< n << endl;
std::cout << "Start Harmonic Spheric... at n = "<< n << std::endl;
#endif
sphere_->map2alm(&(fijk.data()[off7k]),reinterpret_cast<r_8*>(&(almk.data()[off7n])),false); //the false is to forbidd accumulation
......@@ -101,8 +100,8 @@ void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk,
}//loop on shell
#if DEBUG >= 1
cout << "End Harmonic Spheric..." << endl;
cout << "Start Laguerre..." << endl;
std::cout << "End Harmonic Spheric..." << std::endl;
std::cout << "Start Laguerre..." << std::endl;
#endif
tstack_pop("SHT Analysis");
......@@ -112,7 +111,7 @@ void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk,
lagTrans_->MultiAnalysis(almk, flmn, Nalm_);
#if DEBUG >= 1
cout << "End Laguerre..." << endl;
std::cout << "End Laguerre..." << std::endl;
#endif
tstack_pop("Laguerre MultiAnalysis");
......@@ -120,20 +119,22 @@ void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk,
#if DEBUG >= 2
for (int i=0;i<NtotCoeff; i++) {
cout << "flmn("<<i<<"): " <<flmn[i] << endl;
std::cout << "flmn("<<i<<"): " <<flmn[i] << std::endl;
}
#endif
#if DEBUG >= 1
cout << "SphLagTransform::Analysis.... Done" << endl;
std::cout << "SphLagTransform::Analysis.... Done" << std::endl;
#endif
}//Analysis
void LaguerreSphericalTransform::Synthesis(const vector< complex<r_8> >& Elmn, const vector<complex<r_8> >& Blmn,
int spin,
vector<r_8>& fijk_re, vector<r_8>& fijk_im,
vector< complex<r_8> >& Elmk, vector<complex<r_8> >& Blmk
void LaguerreSphericalTransform::Synthesis(const std::vector< std::complex<r_8> >& Elmn,
const std::vector< std::complex<r_8> >& Blmn,
int spin,
std::vector<r_8>& fijk_re, std::vector<r_8>& fijk_im,
std::vector< std::complex<r_8> >& Elmk,
std::vector< std::complex<r_8> >& Blmk
) {
int Ntot3DPix = Npix_*N_;
int NtotCoeff = Nalm_*N_;
......@@ -148,8 +149,8 @@ void LaguerreSphericalTransform::Synthesis(const vector< complex<r_8> >& Elmn, c
Blmk.resize(NtotCoeff);
#if DEBUG >= 1
cout << "SphLagTransform::Synthesis type <r_8> I/O .... Go..." << endl;
cout << "Start Inverse Laguerre...." << endl;
std::cout << "SphLagTransform::Synthesis type <r_8> I/O .... Go..." << std::endl;
std::cout << "Start Inverse Laguerre...." << std::endl;
#endif
tstack_push("Laguerre MultiSynthesis");
......@@ -157,17 +158,9 @@ void LaguerreSphericalTransform::Synthesis(const vector< complex<r_8> >& Elmn, c
lagTrans_->MultiSynthesis(Blmn, Blmk, Nalm_);
tstack_pop("Laguerre MultiSynthesis");
// cout << "Elmk, Blmk" <<endl;
// for(int i=0; i<100; i++){
// cout << "Elmk["<<i<<"]: " << Elmk[i] << "; "
// << "Blmk["<<i<<"]: " << Blmk[i] << endl;
// }
#if DEBUG >= 1
cout << "End Inverse Laguerre...." << endl;
cout << "Start Inverse H.Spherical Transform " << endl;
std::cout << "End Inverse Laguerre...." << std::endl;
std::cout << "Start Inverse H.Spherical Transform " << std::endl;
#endif
tstack_push("SHT Synthesis");
......@@ -178,7 +171,7 @@ void LaguerreSphericalTransform::Synthesis(const vector< complex<r_8> >& Elmn, c
off7k = n*Npix_;
#if DEBUG >= 2
cout << "Synthesis... at shell num: " << n << endl;
std::cout << "Synthesis... at shell num: " << n << std::endl;
#endif
sphere_->alm2map_spin(reinterpret_cast<const r_8*>(&(Elmk.data()[off7n])),
reinterpret_cast<const r_8*>(&(Blmk.data()[off7n])),
......@@ -192,16 +185,19 @@ void LaguerreSphericalTransform::Synthesis(const vector< complex<r_8> >& Elmn, c
tstack_pop("SHT Synthesis");
#if DEBUG >= 1
cout << "SphLagTransform::Synthesis.... Done" << endl;
std::cout << "SphLagTransform::Synthesis.... Done" << std::endl;
#endif
}//Synthesis
void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk_re, const vector<r_8>& fijk_im,
int spin,
vector< complex<r_8> >& Elmn, vector<complex<r_8> >& Blmn,
vector< complex<r_8> >& Elmk, vector<complex<r_8> >& Blmk
) {
void LaguerreSphericalTransform::Analysis(const std::vector<r_8>& fijk_re,
const std::vector<r_8>& fijk_im,
int spin,
std::vector< std::complex<r_8> >& Elmn,
std::vector< std::complex<r_8> >& Blmn,
std::vector< std::complex<r_8> >& Elmk,
std::vector< std::complex<r_8> >& Blmk
) {
int Ntot3DPix = Npix_*N_;
int NtotCoeff = Nalm_*N_;
if(fijk_re.size() != (size_t)Ntot3DPix || fijk_im.size() != (size_t)Ntot3DPix) throw LagSHTError("SphLagTransform::Analysis size error");
......@@ -215,7 +211,7 @@ void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk_re, const vect
#if DEBUG >= 1
cout << "SphLagTransform::Analysis.... Go..." << endl;
std::cout << "SphLagTransform::Analysis.... Go..." << std::endl;
#endif
//Perform the Spherical Hamonic analysis first
......@@ -229,7 +225,7 @@ void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk_re, const vect
off7k = n*Npix_;
#if DEBUG >= 1
cout << "Start Harmonic Spheric... at n = "<< n << endl;
std::cout << "Start Harmonic Spheric... at n = "<< n << std::endl;
#endif
sphere_->map2alm_spin(&(fijk_re.data()[off7k]),
......@@ -243,8 +239,8 @@ void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk_re, const vect
}//loop on shell
#if DEBUG >= 1
cout << "End Harmonic Spheric..." << endl;
cout << "Start Laguerre..." << endl;
std::cout << "End Harmonic Spheric..." << std::endl;
std::cout << "Start Laguerre..." << std::endl;
#endif
tstack_pop("SHT Analysis");
......@@ -255,18 +251,18 @@ void LaguerreSphericalTransform::Analysis(const vector<r_8>& fijk_re, const vect
lagTrans_->MultiAnalysis(Blmk, Blmn, Nalm_);
#if DEBUG >= 1
cout << "End Laguerre..." << endl;
std::cout << "End Laguerre..." << std::endl;
#endif
tstack_pop("Laguerre MultiAnalysis");
#if DEBUG >= 2
for (int i=0;i<NtotCoeff; i++) {
cout << "flmn("<<i<<"): " << Elmn[i] << ", " << Blmn[i] << endl;
std::cout << "flmn("<<i<<"): " << Elmn[i] << ", " << Blmn[i] << std::endl;
}
#endif
#if DEBUG >= 1
cout << "SphLagTransform::Analysis.... Done" << endl;
std::cout << "SphLagTransform::Analysis.... Done" << std::endl;
#endif
}//Analysis
......
src/lagSphericTransform.h
View file @ 2f1e1948
......@@ -54,7 +54,7 @@ class LaguerreSphericalTransform {
// LaguerreSphericalTransform(string spheregeom, int Lmax, int Mmax, int Nmax,
// r_8 R, int Nrings = -1, int Nphi = -1, int alpha=2, bool R2tau=true):
LaguerreSphericalTransform(string spheregeom, int Lmax, int Mmax, int Nmax,
LaguerreSphericalTransform(std::string spheregeom, int Lmax, int Mmax, int Nmax,
r_8 R, int Nrings = -1, int Nphi = -1, r_8 alpha=2, bool R2tau=true):
Lmax_(Lmax), Mmax_(Mmax), R_(R) {
......@@ -66,7 +66,7 @@ class LaguerreSphericalTransform {
} else if (spheregeom == "Healpix") {
sphere_ = new HealpixGeometry(Lmax, Mmax, Nrings); //here Nsides = Nrings
} else {
cout << "FAILURE: LaguerreSphericalTransform::Ctor wrong geometry type" << endl;
std::cout << "FAILURE: LaguerreSphericalTransform::Ctor wrong geometry type" << std::endl;
sphere_ = 0;
throw LagSHTError("LaguerreSphericalTransform::Ctor wrong geometry type");
}
......@@ -119,12 +119,12 @@ class LaguerreSphericalTransform {
//! Get the f(l,m,n) coefficient in the vector collection
//make a Flmn Class
inline complex<r_8> GetFlmn(const vector< complex<r_8> >& flmn, int l , int m, int n) const {
inline std::complex<r_8> GetFlmn(const std::vector< std::complex<r_8> >& flmn, int l , int m, int n) const {
int id= n*Nalm_ + l +m*Lmax_ -m*(m+1)/2;
return flmn[id];
}
//! Set the f(l,m,n) coefficient in the vector collection
inline void SetFlmn(vector< complex<r_8> >& flmn, int l , int m, int n, complex<r_8> value) const {
inline void SetFlmn(std::vector< std::complex<r_8> >& flmn, int l , int m, int n, std::complex<r_8> value) const {
int id= n*Nalm_ + l +m*Lmax_ -m*(m+1)/2;
flmn[id] = value;
}
......@@ -137,18 +137,18 @@ class LaguerreSphericalTransform {
\output fijk: 3D real function values
\output almk: 2D alm complex spherical coefficients for each subshell k
*/
void Synthesis(const vector< complex<r_8> >& flmn,
vector<r_8>& fijk,
vector< complex<r_8> >& almk);
void Synthesis(const std::vector< std::complex<r_8> >& flmn,
std::vector<r_8>& fijk,
std::vector< std::complex<r_8> >& almk);
//!Synthesis (spin = 0)
/*! \brief Coeffs -> Pixels with Input/Output using T floating representation
\input flmn: 3D complex spherical-laguerre coefficients
\output fijk: 3D real function values
*/
void Synthesis(const vector< complex<r_8> >& flmn, vector<r_8>& fijk) {
void Synthesis(const std::vector< std::complex<r_8> >& flmn, std::vector<r_8>& fijk) {
int NtotCoeff = Nalm_*N_;
vector< complex<r_8> > almk(NtotCoeff);
std::vector< std::complex<r_8> > almk(NtotCoeff);
Synthesis(flmn,fijk,almk);
}
......@@ -158,9 +158,9 @@ class LaguerreSphericalTransform {
\input fijk: 3D real function values
\output flmn: 3D complex spherical-laguerre coefficients
*/
void Analysis(const vector<r_8>& fijk,
vector< complex<r_8> >& flmn,
vector< complex<r_8> >& almk
void Analysis(const std::vector<r_8>& fijk,
std::vector< std::complex<r_8> >& flmn,
std::vector< std::complex<r_8> >& almk
);
//! Analysis (spin = 0)
......@@ -168,9 +168,9 @@ class LaguerreSphericalTransform {
\input fijk: 3D real function values
\output flmn: 3D complex spherical-laguerre coefficients
*/
void Analysis(const vector<r_8>& fijk, vector< complex<r_8> >& flmn){
void Analysis(const std::vector<r_8>& fijk, std::vector< std::complex<r_8> >& flmn){
int NtotCoeff = Nalm_*N_;
vector< complex<r_8> > almk(NtotCoeff);
std::vector< std::complex<r_8> > almk(NtotCoeff);
Analysis(fijk,flmn,almk);
}
......@@ -185,20 +185,22 @@ class LaguerreSphericalTransform {
\output Elmk: 2D alm complex spherical coefficients for each subshell k of the gradient E
\output Blmk: 2D alm complex spherical coefficients for each subshell k of the curl B
*/
void Synthesis(const vector< complex<r_8> >& Elmn, const vector<complex<r_8> >& Blmn,
void Synthesis(const std::vector< std::complex<r_8> >& Elmn,
const std::vector< std::complex<r_8> >& Blmn,
int spin,
vector<r_8>& fijk_re, vector<r_8>& fijk_im,
vector< complex<r_8> >& Elmk, vector<complex<r_8> >& Blmk
std::vector<r_8>& fijk_re, std::vector<r_8>& fijk_im,
std::vector< std::complex<r_8> >& Elmk, std::vector< std::complex<r_8> >& Blmk
);
void Synthesis(const vector< complex<r_8> >& Elmn, const vector<complex<r_8> >& Blmn,
void Synthesis(const std::vector< std::complex<r_8> >& Elmn,
const std::vector< std::complex<r_8> >& Blmn,
int spin,
vector<r_8>& fijk_re, vector<r_8>& fijk_im
std::vector<r_8>& fijk_re, std::vector<r_8>& fijk_im
){
int NtotCoeff = Nalm_*N_;
vector< complex<r_8> > Elmk(NtotCoeff);
vector< complex<r_8> > Blmk(NtotCoeff);
std::vector< std::complex<r_8> > Elmk(NtotCoeff);
std::vector< std::complex<r_8> > Blmk(NtotCoeff);
Synthesis(Elmn,Blmn,spin,fijk_re,fijk_im,Elmk,Blmk);
}
......@@ -211,19 +213,19 @@ class LaguerreSphericalTransform {
\output Elmk: 2D alm complex spherical coefficients for each subshell k of the gradient E
\output Blmk: 2D alm complex spherical coefficients for each subshell k of the curl B
*/
void Analysis(const vector<r_8>& fijk_re, const vector<r_8>& fijk_im,
void Analysis(const std::vector<r_8>& fijk_re, const std::vector<r_8>& fijk_im,
int spin,
vector< complex<r_8> >& Elmn, vector<complex<r_8> >& Blmn,
vector< complex<r_8> >& Elmk, vector<complex<r_8> >& Blmk
std::vector< std::complex<r_8> >& Elmn, std::vector< std::complex<r_8> >& Blmn,
std::vector< std::complex<r_8> >& Elmk, std::vector< std::complex<r_8> >& Blmk
);
void Analysis(const vector<r_8>& fijk_re, const vector<r_8>& fijk_im,
void Analysis(const std::vector<r_8>& fijk_re, const std::vector<r_8>& fijk_im,
int spin,
vector< complex<r_8> >& Elmn, vector<complex<r_8> >& Blmn
std::vector< std::complex<r_8> >& Elmn, std::vector< std::complex<r_8> >& Blmn
){
int NtotCoeff = Nalm_*N_;
vector< complex<r_8> > Elmk(NtotCoeff);
vector< complex<r_8> > Blmk(NtotCoeff);
std::vector< std::complex<r_8> > Elmk(NtotCoeff);
std::vector< std::complex<r_8> > Blmk(NtotCoeff);
Analysis(fijk_re, fijk_im, spin, Elmn, Blmn, Elmk, Blmk);
}
......
src/lagsht_bessel.cc
View file @ 2f1e1948
......@@ -5,7 +5,7 @@
namespace LagSHT {
void Bessel::BesselRoots() {
// using namespace std;
using namespace std;
string msg;
......
src/lagsht_bessel.h
View file @ 2f1e1948
......@@ -33,7 +33,7 @@
#include "boost/math/special_functions/bessel.hpp"
#include "lagsht_numbers.h"
using namespace std;
namespace LagSHT {
......@@ -79,9 +79,10 @@ class Bessel {
/* if(l>lmax_ || n > nmax_) cout <<" ERROR Besel::Op(l,n) called with ("<<l<<","<<n<<") while " */
/* << " lmax = " << lmax_ << " nmax = " << nmax_ <<endl; */
return qln_[l*nmax_+n];} //qln(l,n)
void GetVecRoots(std::vector<r_8>& roots, int l) const {
roots.resize(nmax_);
copy(qln_.begin()+l*nmax_,qln_.begin()+(l+1)*nmax_,roots.begin());
std::copy(qln_.begin()+l*nmax_,qln_.begin()+(l+1)*nmax_,roots.begin());
}
//Find Bessel root (qln) values such that j_l(qln) = 0 for l=O,...,Lmax and n=1,..,Nmax
......@@ -93,7 +94,7 @@ class Bessel {
int lmax_; //!< l=0,...,lmax-1 order of Spherical Bessel indice
int nmax_; //!< n=0,...,nmax-1 index of the roots of Spherical Bessel func
vector<r_8> qln_; //!< roots: Care qln(l,n) l=0,...,lmax-1; n=0,...,nmax-1 but stands for n=1,..,nmax
std::vector<r_8> qln_; //!< roots: Care qln(l,n) l=0,...,lmax-1; n=0,...,nmax-1 but stands for n=1,..,nmax
private:
......
src/lagsht_spheregeom.cc
View file @ 2f1e1948
......@@ -27,6 +27,8 @@ void BaseGeometry::SetCommonMapFeatures() {
}//SetThetaPhiMap
void BaseGeometry::SetPixelPositions() {
using namespace std;
const sharp_geom_info *ginfo;
ginfo = sharpjob_.get_geom_info();
for (int i=0; i<ginfo->npairs; ++i) {
......@@ -87,7 +89,8 @@ void ECPGeometry::PixThetaPhi(int k, r_8& theta, r_8& phi) const {
}//PixThetaPhi
void ECPGeometry::SetMap(int nrings, int nphi) {
using namespace std;
geomType_ = "ECP";
if(geomDone_){
......@@ -146,6 +149,8 @@ void GaussGeometry::PixThetaPhi(int k, r_8& theta, r_8& phi) const {
void GaussGeometry::SetMap(int nrings, int nphi) {
using namespace std;
geomType_ = "Gauss";
if(geomDone_){
......@@ -193,7 +198,8 @@ void HealpixGeometry::PixThetaPhi(int k, r_8& theta, r_8& phi) const {
}//PixThetaPhi
void HealpixGeometry::SetMap(int nsides, int DUMMY) { //second argument not used
using namespace std;
geomType_ = "Healpix";
if(geomDone_){
......
src/lagsht_spheregeom.h
View file @ 2f1e1948
......@@ -29,7 +29,7 @@
#include <iostream>
#include <algorithm>
#include <utility> // std::pair, std::make_pair
using namespace std;
//using namespace std;
#include "lagsht_geom.h"
//Sharp
......@@ -79,7 +79,7 @@ class BaseGeometry {
//! Mmax
int Mmax() const { return M_; }
//! Type of geomery
string Geometry() const { return geomType_; }
std::string Geometry() const { return geomType_; }
//! Sorted List of pixel center (theta, phi) positions
geom_t GetPixelPositions() const { return vecPix_; }
......@@ -162,8 +162,8 @@ protected:
int Nalm_; //!< Total number of Alm coefficients
geom_t vecPix_; //!< sorted vector of pixel positions
vector<r_8> thetaPix_; //!< sorted vector of theta rings
string geomType_; //!<< Type of pixelization
std::vector<r_8> thetaPix_; //!< sorted vector of theta rings
std::string geomType_; //!<< Type of pixelization
bool geomDone_; //!< Set to true once the geometry is properly set (See SetThetaPhiMap(string) )
sharp_cxxjob<r_8> sharpjob_; //!< libsharp job // voir si r_8 -> r_16 extend the validity of the computation
......
src/lagsht_testsuite.cc
View file @ 2f1e1948
This diff is collapsed.
src/laguerre2bessel.cc
View file @ 2f1e1948
This diff is collapsed.
src/laguerre2bessel.h
View file @ 2f1e1948
......@@ -26,47 +26,32 @@
#include <iostream>
#include <vector>
#include <string>
#include <complex>
#include <algorithm>
#include <utility> //move
//23/3/16
#include <omp.h> //OpenMP for function sampling
#include <fftw3.h> //Discrete Cosine Function
#include "lagsht_numbers.h"
#include "laguerreTransform.h"
#include "lagsht_spheregeom.h"
#include "lagsht_bessel.h"
#include "lagsht_exceptions.h"
#include "lagsht_func.h"
#include "quadinteg.h" //JEC 12/11/15
using namespace std;
//using namespace std;
namespace LagSHT {
////////////////////////////////////////////////////////////////////////////////
//// --------- Class to transform Spherical Laguerre into Spherical Bessel -- //
////////////////////////////////////////////////////////////////////////////////
/* //implementation of the Kahan summation algorithm */
/* template <class InIt> */
/* typename std::iterator_traits<InIt>::value_type accumulate(InIt begin, InIt end) { */
/* typedef typename std::iterator_traits<InIt>::value_type real; */
/* real sum = real(); */
/* real running_error = real(); */
/* real temp; */
/* real difference; */
/* for (; begin != end; ++begin) { */
/* difference = *begin; */
/* difference -= running_error; */
/* temp = sum; */
/* temp += difference; */
/* running_error = temp; */
/* running_error -= sum; */
/* running_error -= difference; */
/* sum = std::move(temp); */
/* } */
/* return sum; */
/* } */
class Laguerre2Bessel {
public:
......@@ -74,8 +59,8 @@ public:
Laguerre2Bessel(BaseGeometry* sphere,
LaguerreTransform* lagTrans,
int Nmax, int Pmax, r_8 Rmax,
string clenshawDir,
string jlnpDir,
std::string clenshawDir,
std::string jlnpDir,
bool recomputeJlnp=false
);
......@@ -92,7 +77,7 @@ public:
\input FLlmn: 3D complex spherical-laguerre coefficients (see LaguerreSphericalTransform)
\output FBlmp: 3D complex spherical-bessel coefficients
*/
void Lag2BessCoeff(const vector< complex<r_8> >& FLlmn, vector< complex<r_8> >& FBlmp);
void Lag2BessCoeff(const std::vector< std::complex<r_8> >& FLlmn, std::vector< std::complex<r_8> >& FBlmp);
//! Synthesis
......@@ -101,12 +86,12 @@ public:
\output FBalmk: 2D alm(r_k) Harm. Spherical reconstruction of each r_k given by Laguerre radius
\output fijk: 3D real values of each pixel
*/
void Synthesis(const vector< complex<r_8> >& FBlmp,
vector< complex<r_8> >& FBalmk,
vector<r_8>& fijk);
void Synthesis(const std::vector< std::complex<r_8> >& FBlmp,
std::vector< std::complex<r_8> >& FBalmk,
std::vector<r_8>& fijk);
//!Debug
void Print(ostream& os, int what = -1);
void Print(std::ostream& os, int what = -1);
private:
......@@ -116,26 +101,228 @@ private:
\input clenshawDir directory to find the Clenshaw-Curtis quadrature weight & nodes
\input jlnpDir Directory where to save the result
*/
void ComputeJInteg(string clenshawDir, string jlnpDir);
void ComputeJInteg(std::string clenshawDir, std::string jlnpDir);
/*!
Class for Spherical Bessel sampling
*/
class JBess : public ClassFunc1D {
public:
JBess(int l, r_8 kt):l_(l),kt_(kt) {norm_ = sqrt(2./M_PI);}
virtual double operator()(double x) const {
return norm_*Bessel::jn(l_,x*kt_);
}
virtual ~JBess() {}
private:
int l_;
r_8 kt_;
r_8 norm_;
};
/*!
Class for Laguerre fucntion sampling
*/
class KLag : public ClassFunc1D {
public:
KLag(LaguerreFuncQuad* Ln, r_8 norm):Ln_(Ln),norm_(norm){}
virtual double operator()(double x) const {
return norm_*x*x*Ln_->Value(x);
}