Commit 3828e28f by Jean-Eric Campagne

(JEC) 23/11/15 computation of the Jlnp integral via a combined method: DFBT +...

`(JEC) 23/11/15 computation of the Jlnp integral via a combined method: DFBT + Clenshaw-Curtis quadrature`
parent 7abb5300
 ... @@ -121,8 +121,8 @@ CXXHDR = \$(SRC)lagsht_exceptions.h \ ... @@ -121,8 +121,8 @@ CXXHDR = \$(SRC)lagsht_exceptions.h \ \$(SRC)lagSphericTransform.h \ \$(SRC)lagSphericTransform.h \ \$(SRC)walltimer.h \ \$(SRC)walltimer.h \ \$(SRC)lagsht_bessel.h \ \$(SRC)lagsht_bessel.h \ \$(SRC)laguerre2bessel.h \$(SRC)laguerre2bessel.h \ # \$(SRC)quadinteg.h \$(SRC)quadinteg.h CPPFLAGS += \$(BLASYES) \$(SHARPINC) \$(BLASINC) CPPFLAGS += \$(BLASYES) \$(SHARPINC) \$(BLASINC) LDFLAGS += \$(SHARPLIBN) \$(BLASLIBN) -lm LDFLAGS += \$(SHARPLIBN) \$(BLASLIBN) -lm ... ...
 ... @@ -52,7 +52,7 @@ class LaguerreSphericalTransform { ... @@ -52,7 +52,7 @@ class LaguerreSphericalTransform { LaguerreSphericalTransform(string spheregeom, int Lmax, int Mmax, int Nmax, LaguerreSphericalTransform(string spheregeom, int Lmax, int Mmax, int Nmax, r_8 R, int Nrings = -1, int Nphi = -1, int alpha=2): r_8 R, int Nrings = -1, int Nphi = -1, int alpha=2, bool R2tau=true): Lmax_(Lmax), Mmax_(Mmax), R_(R) { Lmax_(Lmax), Mmax_(Mmax), R_(R) { //Factory //Factory ... @@ -68,7 +68,7 @@ class LaguerreSphericalTransform { ... @@ -68,7 +68,7 @@ class LaguerreSphericalTransform { throw LagSHTError("LaguerreSphericalTransform::Ctor wrong geometry type"); throw LagSHTError("LaguerreSphericalTransform::Ctor wrong geometry type"); } } lagTrans_ = new LaguerreTransform(Nmax, R, alpha); lagTrans_ = new LaguerreTransform(Nmax, R, alpha, R2tau); //JEC 16/11/15 add R2tau //do the map pixelization //do the map pixelization ... ...
 ... @@ -76,8 +76,8 @@ class Bessel { ... @@ -76,8 +76,8 @@ class Bessel { //Helper //Helper r_8 operator()(int l, int n) const { r_8 operator()(int l, int n) const { if(l>lmax_ || n > nmax_) cout <<" ERROR Besel::Op(l,n) called with ("<lmax_ || n > nmax_) cout <<" ERROR Besel::Op(l,n) called with ("<
 ... @@ -18,7 +18,7 @@ using namespace std; ... @@ -18,7 +18,7 @@ using namespace std; using namespace LagSHT; using namespace LagSHT; #define DEBUG 1 #define DEBUG 2 //-------- Parameters set in the main and used in the different test functions //-------- Parameters set in the main and used in the different test functions struct PARAM { struct PARAM { ... @@ -233,11 +233,11 @@ void MultiSphericalLaguerreTransform() { ... @@ -233,11 +233,11 @@ void MultiSphericalLaguerreTransform() { #endif #endif vector fijk(NpTot); vector fijk(NpTot); sphlagtrans.Synthesis(flmnOrig,fijk); sphlagtrans.Synthesis(flmnOrig,fijk); #if DEBUG >= 2 //#if DEBUG >= 2 for (int i=0; i(rv,iv); flmnOrig[id] = complex(rv,iv); ... @@ -341,7 +347,23 @@ void TestLaguerre2Bessel() { ... @@ -341,7 +347,23 @@ void TestLaguerre2Bessel() { }//end loop on shell }//end loop on shell #if DEBUG >=2 #if DEBUG >=2 std::copy(flmnOrig.begin(), flmnOrig.end(), std::ostream_iterator< complex >(std::cout, " ")); cout << "F-Lag coeff orig ......... START " << endl; // std::copy(flmnOrig.begin(), flmnOrig.end(), std::ostream_iterator< complex >(std::cout, "\n")); for(int l=0; l > FBlmp(Nalm*Pmax); vector< complex > FBlmp(Nalm*Pmax); lag2bess.Lag2BessCoeff(flmnOrig,FBlmp); lag2bess.Lag2BessCoeff(flmnOrig,FBlmp); #if DEBUG >=2 cout << "F-Bessel coeff ......... START " << endl; std::copy(FBlmp.begin(), FBlmp.end(), std::ostream_iterator< complex >(std::cout, "\n")); cout << "F-Bessel coeff ......... END " << endl; #endif cout << "tstack 2b End" < > FLalmk; vector< complex > FLalmk; vector fFLijk; vector fFLijk; sphlagtrans.Synthesis(flmnOrig,fFLijk,FLalmk); sphlagtrans.Synthesis(flmnOrig,fFLijk,FLalmk); #if DEBUG >=2 cout << "F-Lag fijk coeff ......... START " << endl; std::copy(fFLijk.begin(), fFLijk.end(), std::ostream_iterator< complex >(std::cout, "\n")); cout << "F-Lag fijk coeff ......... END " << endl; #endif cout << "tstack 2d End" <