Commit 66e764be authored by COULAUD Olivier's avatar COULAUD Olivier

Fix bug in Periodic Algorithm - Compilation error with constructeur (=delete)

parent a0807c57
...@@ -35,7 +35,7 @@ GetCpuInfos() ...@@ -35,7 +35,7 @@ GetCpuInfos()
# SCALFMM version number. An even minor number corresponds to releases. # SCALFMM version number. An even minor number corresponds to releases.
set(SCALFMM_MAJOR_VERSION 1) set(SCALFMM_MAJOR_VERSION 1)
set(SCALFMM_MINOR_VERSION 5) set(SCALFMM_MINOR_VERSION 5)
set(SCALFMM_PATCH_VERSION 1) set(SCALFMM_PATCH_VERSION 2)
set(SCALFMM_VERSION "${SCALFMM_MAJOR_VERSION}.${SCALFMM_MINOR_VERSION}.${SCALFMM_PATCH_VERSION}" ) set(SCALFMM_VERSION "${SCALFMM_MAJOR_VERSION}.${SCALFMM_MINOR_VERSION}.${SCALFMM_PATCH_VERSION}" )
set( MORSE_DISTRIB_DIR "" CACHE PATH "Directory of MORSE distribution") set( MORSE_DISTRIB_DIR "" CACHE PATH "Directory of MORSE distribution")
......
...@@ -6,8 +6,12 @@ Copyright (c) 2011-2018 Inria, All rights reserved. ...@@ -6,8 +6,12 @@ Copyright (c) 2011-2018 Inria, All rights reserved.
This file contains the main features as well as overviews of specific This file contains the main features as well as overviews of specific
bug fixes (and other actions) for each version of ScalFMM since bug fixes (and other actions) for each version of ScalFMM since
version 1.1 version 1.1
1.5.2
-----
- Many bug fixes in pseudo preriodic boundary condition un MPI version
1.5.1 1.5.1
-----
- Many bug fixes in MPI version (Loader, GroupTree, ...) - Many bug fixes in MPI version (Loader, GroupTree, ...)
- set cmake_policy CMP0004 to NEW - set cmake_policy CMP0004 to NEW
- fix some errors in Morse module with cmake 3.9.1 - fix some errors in Morse module with cmake 3.9.1
......
// See LICENCE file at project root // See LICENCE file at project root
#ifndef FBASICPARTICLECONTAINER_HPP #ifndef FBASIC_PARTICLE_CONTAINER_HPP_
#define FBASICPARTICLECONTAINER_HPP #define FBASIC_PARTICLE_CONTAINER_HPP_
#include "FAbstractParticleContainer.hpp" #include "FAbstractParticleContainer.hpp"
#include "FAbstractSerializable.hpp" #include "FAbstractSerializable.hpp"
...@@ -135,7 +135,7 @@ public: ...@@ -135,7 +135,7 @@ public:
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
FBasicParticleContainer(const FBasicParticleContainer&) = delete; FBasicParticleContainer(const FBasicParticleContainer&) = delete;
FBasicParticleContainer& operator=(const FBasicParticleContainer&) = delete; FBasicParticleContainer& operator=(const FBasicParticleContainer&) = delete;
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
...@@ -177,6 +177,13 @@ public: ...@@ -177,6 +177,13 @@ public:
} }
/** /**
* @brief getPositions
* @return get the position in write mode
*/
FReal* const* getPositions() {
return positions;
}
/**
* @brief getWPositions * @brief getWPositions
* @return get the position in write mode * @return get the position in write mode
*/ */
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#ifndef FFMMALGORITHMTHREADPROC_HPP #ifndef FFMMALGORITHMTHREADPROC_HPP
#define FFMMALGORITHMTHREADPROC_HPP #define FFMMALGORITHMTHREADPROC_HPP
#define SCALFMM_DISTRIBUTED_ALGORITHM
#include <omp.h> #include <omp.h>
// //
......
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