Commit b6999e3d authored by Quentin Khan's avatar Quentin Khan

Spherical kernel: fix warnings

parent b6666ed4
......@@ -4,13 +4,13 @@
// This software is a computer program whose purpose is to compute the FMM.
//
// This software is governed by the CeCILL-C and LGPL licenses and
// abiding by the rules of distribution of free software.
//
// abiding by the rules of distribution of free software.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public and CeCILL-C Licenses for more details.
// "http://www.cecill.info".
// "http://www.cecill.info".
// "http://www.gnu.org/licenses".
// ===================================================================================
#ifndef FABSTRACTSPHERICALKERNEL_HPP
......@@ -175,7 +175,8 @@ public:
/** M2L with a cell and all the existing neighbors */
virtual void M2L(CellClass* const FRestrict inLocal, const CellClass* inInteractions[],
const int neighborPositions[], const int inSize, const int inLevel) = 0;
const int neighborPositions[], const int inSize, const int inLevel) override
= 0;
/** L2L with a cell and all its child */
void L2L(const CellClass* const FRestrict pole, CellClass* FRestrict *const FRestrict child, const int inLevel) override {
......@@ -627,7 +628,7 @@ private:
harmonic.result(index_j_k) *= local_exp[index_j_k];
result += harmonic.result(index_j_k).getReal();
++index_j_k;
++index_j_k;
// k>0
for (int k = 1 ; k <= j ; ++k, ++index_j_k){
......@@ -683,5 +684,3 @@ public:
#endif //FABSTRACTSPHERICALKERNEL_HPP
......@@ -4,13 +4,13 @@
// This software is a computer program whose purpose is to compute the FMM.
//
// This software is governed by the CeCILL-C and LGPL licenses and
// abiding by the rules of distribution of free software.
//
// abiding by the rules of distribution of free software.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public and CeCILL-C Licenses for more details.
// "http://www.cecill.info".
// "http://www.cecill.info".
// "http://www.gnu.org/licenses".
// ===================================================================================
#ifndef FSPHERICALBLOCKBLASKERNEL_HPP
......@@ -192,7 +192,7 @@ public:
return true ;
}
/** Do we have some computation to do in the buffers */
void finishedLevelM2L(const int inLevel){
void finishedLevelM2L(const int inLevel) override {
for(int idxNeigh = 0 ; idxNeigh < 343 ; ++idxNeigh){
if( interactions[idxNeigh].getSize() ){
multipoleToLocal( idxNeigh, inLevel);
......
......@@ -96,7 +96,9 @@ public:
/** M2L with a cell and all the existing neighbors */
void M2L(CellClass* const FRestrict inLocal, const CellClass* distantNeighbors[],
const int neighborPositions[], const int inSize, const int inLevel) override {
const int neighborPositions[], const int inSize, const int inLevel)
override
{
// For all neighbors compute M2L
for(int idxExistingNeigh = 0 ; idxExistingNeigh < inSize ; ++idxExistingNeigh){
const int idxNeigh = neighborPositions[idxExistingNeigh];
......
......@@ -4,13 +4,13 @@
// This software is a computer program whose purpose is to compute the FMM.
//
// This software is governed by the CeCILL-C and LGPL licenses and
// abiding by the rules of distribution of free software.
//
// abiding by the rules of distribution of free software.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public and CeCILL-C Licenses for more details.
// "http://www.cecill.info".
// "http://www.cecill.info".
// "http://www.gnu.org/licenses".
// ===================================================================================
#ifndef FSPHERICALROTATIONKERNEL_HPP
......@@ -191,7 +191,7 @@ protected:
/** Pre-Compute */
void rotation_coefficient_container_Fill(const FReal omega,
const FReal cos_gamma, const FReal sin_gamma,
const FReal chi, const RotationInfo& rotation_Info){
const FReal chi, const RotationInfo& roation_info){
FComplex<FReal>** rcc_tmp_transposed = new FComplex<FReal>*[devP + 1];
for( int idxP = 0 ; idxP <= devP ; ++idxP){
......@@ -252,21 +252,21 @@ protected:
for(int nu = -m; nu <= m ; ++nu){
const FReal H_nu_minus_1 = ( nu-1 <= -n ?
FReal(0.0) :
(cos_gamma +1) * rotation_Info.rotation_b[getRotationB(n, -nu)]
(cos_gamma +1) * roation_info.rotation_b[getRotationB(n, -nu)]
* rcc_tmp_transposed[n-1][getTranspRotationCoefP(n-1, nu-1, m-1)].getReal());
const FReal H_nu_plus_1 = ( nu+1 >= n ?
FReal(0.0) :
(cos_gamma -1) * rotation_Info.rotation_b[getRotationB(n, nu)]
(cos_gamma -1) * roation_info.rotation_b[getRotationB(n, nu)]
* rcc_tmp_transposed[n-1][getTranspRotationCoefP(n-1, nu+1, m-1)].getReal());
const FReal H_nu = ( FMath::Abs(nu) >= n ?
FReal(0.0) :
sin_gamma * rotation_Info.rotation_a[getRotationA(n-1, nu)]
sin_gamma * roation_info.rotation_a[getRotationA(n-1, nu)]
* rcc_tmp_transposed[n-1][getTranspRotationCoefP(n-1, nu, m-1)].getReal() );
rcc_tmp_transposed[n][getTranspRotationCoefP(n, nu, m)].setReal( (FReal(0.5) * (-H_nu_minus_1 - H_nu_plus_1) - H_nu)
/ rotation_Info.rotation_b[getRotationB(n, -m)]);
/ roation_info.rotation_b[getRotationB(n, -m)]);
} // for nu
} // for m
......@@ -322,11 +322,11 @@ protected:
}
/** Pre-compute */
void transfer_M2L_rotation_Fill(const FSpherical<FReal>& inSphere, const RotationInfo& rotation_Info){
void transfer_M2L_rotation_Fill(const FSpherical<FReal>& inSphere, const RotationInfo& rotation_info){
// Computes rotation coefficients:
rotation_coefficient_container_Fill(FMath::FPi<FReal>(), inSphere.getCosTheta(),
inSphere.getSinTheta(), inSphere.getPhi(), rotation_Info);
inSphere.getSinTheta(), inSphere.getPhi(), rotation_info);
// Computes Outer terms:
spherical_harmonic_Outer_null_order_z_axis(inSphere.getR());
......
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