Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit 972319a8 authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files

Use the factorize out of block struct

parent 8ffb3be7
......@@ -11,22 +11,14 @@
#include "../Utils/FLog.hpp"
#include "../Utils/FTic.hpp"
#include "FOutOfBlockInteraction.hpp"
#include <vector>
#include <vector>
template <class OctreeClass, class CellContainerClass, class CellClass, class KernelClass, class ParticleGroupClass, class ParticleContainerClass>
class FGroupSeqAlgorithm {
protected:
struct OutOfBlockInteraction{
MortonIndex outIndex;
MortonIndex insideIndex;
int outPosition;
// To sort
bool operator <=(const OutOfBlockInteraction& other) const{
return outIndex <= other.outIndex;
}
};
const int MaxThreads; //< The number of threads
OctreeClass*const tree; //< The Tree
KernelClass*const kernels; //< The kernels
......
......@@ -11,6 +11,8 @@
#include "../Utils/FLog.hpp"
#include "../Utils/FTic.hpp"
#include "FOutOfBlockInteraction.hpp"
#include <vector>
#include <vector>
......@@ -19,16 +21,6 @@
template <class OctreeClass, class CellContainerClass, class CellClass, class KernelClass, class ParticleGroupClass, class ParticleContainerClass>
class FGroupTaskAlgorithm {
protected:
struct OutOfBlockInteraction{
MortonIndex outIndex;
MortonIndex insideIndex;
int outPosition;
// To sort
bool operator <=(const OutOfBlockInteraction& other) const{
return outIndex <= other.outIndex;
}
};
template <class OtherBlockClass>
struct BlockInteractions{
OtherBlockClass* otherBlock;
......
......@@ -12,6 +12,8 @@
#include "../Utils/FLog.hpp"
#include "../Utils/FTic.hpp"
#include "FOutOfBlockInteraction.hpp"
#include <vector>
#include <vector>
......@@ -20,16 +22,6 @@
template <class OctreeClass, class CellContainerClass, class CellClass, class KernelClass, class ParticleGroupClass, class ParticleContainerClass>
class FGroupTaskDepAlgorithm {
protected:
struct OutOfBlockInteraction{
MortonIndex outIndex;
MortonIndex insideIndex;
int outPosition;
// To sort
bool operator <=(const OutOfBlockInteraction& other) const{
return outIndex <= other.outIndex;
}
};
template <class OtherBlockClass>
struct BlockInteractions{
OtherBlockClass* otherBlock;
......
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