Attention une mise à jour du service Gitlab va être effectuée le mardi 30 novembre entre 17h30 et 18h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes. Cette mise à jour intermédiaire en version 14.0.12 nous permettra de rapidement pouvoir mettre à votre disposition une version plus récente.

Commit f0a38873 authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files
parents 56c3e7bb 1ba15fd9
...@@ -664,7 +664,11 @@ public: ...@@ -664,7 +664,11 @@ public:
printf("\tDownPass finished\n"); printf("\tDownPass finished\n");
} }
else{ else{
(FScalFMMEngine<FReal>::abstrct)->execute(); if(octree->getHeight() == 2){
(FScalFMMEngine<FReal>::abstrct)->execute(FFmmP2P);
}else{
(FScalFMMEngine<FReal>::abstrct)->execute();
}
} }
} }
} }
......
...@@ -40,7 +40,7 @@ if(SCALFMM_ADDON_HMAT) ...@@ -40,7 +40,7 @@ if(SCALFMM_ADDON_HMAT)
# Install header # Install header
SET(my_include_dirs "Src") SET(my_include_dirs "Src")
file( GLOB hpp_in_dir Src/*.hpp Src/*.h) file( GLOB hpp_in_dir Src/*.hpp Src/*.hpp)
INSTALL( FILES ${hpp_in_dir} DESTINATION include/ScalFmm/HMat ) INSTALL( FILES ${hpp_in_dir} DESTINATION include/ScalFmm/HMat )
file( GLOB_RECURSE source_tests_files Tests/*.cpp ) file( GLOB_RECURSE source_tests_files Tests/*.cpp )
......
// ===================================================================================
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Berenger Bramas, Matthias Messner
// olivier.coulaud@inria.fr, berenger.bramas@inria.fr
// 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.
//
// 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.gnu.org/licenses".
// ===================================================================================
//
// @SCALFMM_PRIVATE
//
#ifndef FDENSEMATRIX_HPP
#define FDENSEMATRIX_HPP
#include "Utils/FBlas.hpp"
template <class FReal>
class FDenseMatrix
{
protected:
// members
FReal* block;
const int height;
const int width;
const int leading_dimension;
const int level;
public:
// ctor
explicit FDenseMatrix(const FReal* in_block, const int in_height, const int in_width, const int in_leading_dimension /*h<N*/, const int in_level)
: height(in_height), width(in_width), leading_dimension(in_leading_dimension), level(in_level)
{
// Allocate memory
block = new FReal[height*width];
// Copy
FBlas::copy(height*width,in_block,block);
};
// dtor
~FDenseMatrix(){
// Free memory
delete[] block;
};
void MV(FReal res[], const FReal vec[], const FReal scale = FReal(1.)) {
FBlas::gemv(height, width, scale, block, vec, res);
}
};
#endif // FDENSEMATRIX_HPP
// [--END--]
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