Commit 512bdc0a authored by BRAMAS Berenger's avatar BRAMAS Berenger

rename function for zero 2Pi

parent 7d4801a6
......@@ -319,7 +319,7 @@ class FRotationKernel : public FAbstractKernels<CellClass,ContainerClass> {
{
int index_lm = index_P0;
for(int m = 0 ; m <= P ; ++m, ++index_lm ){
const FReal mphi = (sph.getPhiInO2PI() + FMath::FPiDiv2) * FReal(m);
const FReal mphi = (sph.getPhiZero2Pi() + FMath::FPiDiv2) * FReal(m);
// O_{l,m}( \alpha, \beta + \phi ) = e^{-i \phi m} O_{l,m}( \alpha, \beta )
rotationExpMinusImPhi[idxChild][index_lm].setRealImag(FMath::Cos(-mphi), FMath::Sin(-mphi));
// M_{l,m}( \alpha, \beta + \phi ) = e^{i \phi m} M_{l,m}( \alpha, \beta )
......@@ -418,7 +418,7 @@ class FRotationKernel : public FAbstractKernels<CellClass,ContainerClass> {
{
int index_lm = index_P0;
for(int m = 0 ; m <= P ; ++m, ++index_lm ){
const FReal mphi = (sph.getPhiInO2PI() + FMath::FPiDiv2) * FReal(m);
const FReal mphi = (sph.getPhiZero2Pi() + FMath::FPiDiv2) * FReal(m);
// O_{l,m}( \alpha, \beta + \phi ) = e^{-i \phi m} O_{l,m}( \alpha, \beta )
rotationM2LExpMinusImPhi[position][index_lm].setRealImag(FMath::Cos(-mphi), FMath::Sin(-mphi));
// M_{l,m}( \alpha, \beta + \phi ) = e^{i \phi m} M_{l,m}( \alpha, \beta )
......
......@@ -508,7 +508,7 @@ public:
// rotate it forward
const FSpherical sph = getSphericalChild(inLevel, idxChild);
rotateMultipole(source_w, sph.getPhiInO2PI(), sph.getInclination());
rotateMultipole(source_w, sph.getPhiZero2Pi(), sph.getInclination());
const FReal b = -sph.getR();
// Translate it
......@@ -528,7 +528,7 @@ public:
}
// Rotate it back
deRotateMultipole(target_w, sph.getPhiInO2PI(), sph.getInclination());
deRotateMultipole(target_w, sph.getPhiZero2Pi(), sph.getInclination());
// Sum the result
FMemUtils::addall( inPole->getMultipole(), target_w, SizeArray);
......@@ -559,7 +559,7 @@ public:
// Rotate
const FSpherical sph = getSphericalInteraction(inLevel, idxNeigh);
rotateMultipole(source_w, sph.getPhiInO2PI(), sph.getInclination());
rotateMultipole(source_w, sph.getPhiZero2Pi(), sph.getInclination());
const FReal b = sph.getR();
// Transfer to u
......@@ -580,7 +580,7 @@ public:
}
// Rotate it back
deRotateTaylor(target_u, sph.getPhiInO2PI(), sph.getInclination());
deRotateTaylor(target_u, sph.getPhiZero2Pi(), sph.getInclination());
// Sum
FMemUtils::addall(inLocal->getLocal(), target_u, SizeArray);
......@@ -611,7 +611,7 @@ public:
// Rotate
const FSpherical sph = getSphericalChild(inLevel, idxChild);
rotateTaylor(source_u, sph.getPhiInO2PI(), sph.getInclination());
rotateTaylor(source_u, sph.getPhiZero2Pi(), sph.getInclination());
const FReal b = sph.getR();
// Translate
......@@ -631,7 +631,7 @@ public:
}
// Rotate
deRotateTaylor(target_u, sph.getPhiInO2PI(), sph.getInclination());
deRotateTaylor(target_u, sph.getPhiZero2Pi(), sph.getInclination());
// Sum in child
FMemUtils::addall(inChildren[idxChild]->getLocal(), target_u, SizeArray);
......
......@@ -545,7 +545,7 @@ private:
/////////////////////////////////////////////////////////////////////
//
//spherical_position_Set_ph
FReal ph = spherical.getPhiInO2PI();
FReal ph = spherical.getPhiZero2Pi();
// FReal ph = FMath::Fmod(spherical.getPhi(), FReal(2)*FMath::FPi);
// if (ph > M_PI) ph -= FReal(2) * FMath::FPi;
// if (ph < -M_PI + FMath::Epsilon) ph += FReal(2) * FMath::FPi;
......
......@@ -95,7 +95,7 @@ public:
return theta;
}
/** Get the azimuth angle [0,2pi]. You should use this method in order to obtain (x,y,z)*/
FReal getPhiInO2PI() const{
FReal getPhiZero2Pi() const{
return (phi < 0 ? FMath::FTwoPi + phi : phi);
}
......
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