Commit 98cc61e5 authored by COULAUD Olivier's avatar COULAUD Olivier

Remove dead code, fix compilation error with OptiDis

parent 790b6440
......@@ -10,26 +10,32 @@
* @brief The FFmmOperations enum
* To chose which operation has to be performed.
*/
///
/// \brief The FFmmOperations enum
/// To chose which operation has to be performed in the methode execute of the Fmm algorithm.
///
enum FFmmOperations {
FFmmP2P = (1 << 0),
FFmmP2M = (1 << 1),
FFmmM2M = (1 << 2),
FFmmM2L = (1 << 3),
FFmmL2L = (1 << 4),
FFmmL2P = (1 << 5),
FFmmP2L = (1 << 6),
FFmmM2P = (1 << 7),
FFmmP2P = (1 << 0), ///< Particles to Particles operator (Near field)
FFmmP2M = (1 << 1), ///< Particles to Multipole operator (Far field)
FFmmM2M = (1 << 2), ///< Multipole to Multipole operator (Far field)
FFmmM2L = (1 << 3), ///< Multipole to Local operator (Far field)
FFmmL2L = (1 << 4), ///< Local to Local operator (Far field)
FFmmL2P = (1 << 5), ///< Local to Particles operator (Far field)
FFmmP2L = (1 << 6), ///< Particles to Local operator (Far field in Adaptive algorithm)
FFmmM2P = (1 << 7), ///< Multipole to Particles operator (Far field in Adaptive algorithm)
//
FFmmNearField = FFmmP2P,
FFmmFarField = (FFmmP2M|FFmmM2M|FFmmM2L|FFmmL2L|FFmmL2P|FFmmM2P|FFmmP2L),
FFmmNearField = FFmmP2P, ///< Near field operator
FFmmFarField = (FFmmP2M|FFmmM2M|FFmmM2L|FFmmL2L|FFmmL2P|FFmmM2P|FFmmP2L), ///< Only Far Field operators
//
FFmmNearAndFarFields = (FFmmNearField|FFmmFarField)
FFmmNearAndFarFields = (FFmmNearField|FFmmFarField) ///< Near and far field operators
};
std::string FFmmOperations_string(/*enum FFmmOperations*/ const unsigned int & value){
///
/// \brief FFmmOperations_string converts the FFmmOperations (enum) in string
/// \param value the FFmmOperations
/// \return the string corresponding to the FFmmOperations
///
inline std::string FFmmOperations_string(/*enum FFmmOperations*/ const unsigned int & value){
//if (value & FFmmNearAndFarFields) return std::string("FFmmNearAndFarFields") ;
//if (value & FFmmFarField) return std::string("FFmmFarField") ;
//if (value & FFmmNearField) return std::string("FFmmNearField" );
std::string op("");
if (value & FFmmP2P)
op += " FFmmP2P |";
......
......@@ -63,7 +63,7 @@ public:
using multipole_t = exp_impl<class multipole_tag, NRHS>;
using local_expansion_t = exp_impl<class local_expansion_tag, NLHS>;
multipole_t m_data {};
multipole_t m_data {};
local_expansion_t l_data {};
bool hasMultipoleData() const noexcept {
......
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