Commit 8ff30c57 authored by COULAUD Olivier's avatar COULAUD Olivier

Use uppercase for scalfmm.

Add FReal as template in FTypedInterpCell
parent a7feed21
......@@ -12,7 +12,8 @@ SET(SCALFMM_VERSION_MINOR "@SCALFMM_MINOR_VERSION@")
SET(SCALFMM_VERSION_BUILD "@SCALFMM_BUILD_VERSION@")
#
SET(SCALFMM_PREFIX "@CMAKE_INSTALL_PREFIX@")
SET(SCALFMM_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include")
SET(SCALFMM_INCLUDES_DIR "@CMAKE_INSTALL_PREFIX@/include")
SET(SCALFMM_INCLUDES_ADD "@SCALFMM_INCLUDES@")
SET(SCALFMM_LIBRARIES_DIR "@CMAKE_INSTALL_PREFIX@/lib")
SET(SCALFMM_LIBRARIES_ADD "@SCALFMM_LIBRARIES@")
SET(SCALFMM_LIBRARY_NAME "@scalfmm_lib@")
......@@ -48,16 +49,6 @@ ELSE()
SET(SCALFMM_LIBRARIES "-L${SCALFMM_LIBRARIES_DIR} -l${SCALFMM_LIBRARY_NAME}" )
ENDIF()
SET(SCALFMM_INCLUDE_DIRS ${SCALFMM_INCLUDE_DIR}
${SCALFMM_INCLUDE_DIR}/Utils
${SCALFMM_INCLUDE_DIR}/Components
${SCALFMM_INCLUDE_DIR}/Arranger
${SCALFMM_INCLUDE_DIR}/Containers
${SCALFMM_INCLUDE_DIR}/Core
${SCALFMM_INCLUDE_DIR}/Extensions
${SCALFMM_INCLUDE_DIR}/Files
${SCALFMM_INCLUDE_DIR}/Kernels
${SCALFMM_INCLUDE_DIR}/Chebyshev)
#SCALFMM_BUILD_TESTS => OFF
#SCALFMM_BUILD_UTESTS => OFF
// ===================================================================================
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Bérenger Bramas, Matthias Messner
// 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.
//
......@@ -189,21 +189,21 @@ public:
};
template <int ORDER, int NRHS = 1, int NLHS = 1, int NVALS = 1>
class FTypedInterpCell : public FInterpCell<ORDER,NRHS,NLHS,NVALS>, public FExtendCellType {
template <class FReal,int ORDER, int NRHS = 1, int NLHS = 1, int NVALS = 1>
class FTypedInterpCell : public FInterpCell<FReal,ORDER,NRHS,NLHS,NVALS>, public FExtendCellType {
public:
template <class BufferWriterClass>
void save(BufferWriterClass& buffer) const{
FInterpCell<ORDER,NRHS,NLHS,NVALS>::save(buffer);
FInterpCell<FReal,ORDER,NRHS,NLHS,NVALS>::save(buffer);
FExtendCellType::save(buffer);
}
template <class BufferReaderClass>
void restore(BufferReaderClass& buffer){
FInterpCell<ORDER,NRHS,NLHS,NVALS>::restore(buffer);
FInterpCell<FReal,ORDER,NRHS,NLHS,NVALS>::restore(buffer);
FExtendCellType::restore(buffer);
}
void resetToInitialState(){
FInterpCell<ORDER,NRHS,NLHS,NVALS>::resetToInitialState();
FInterpCell<FReal,ORDER,NRHS,NLHS,NVALS>::resetToInitialState();
FExtendCellType::resetToInitialState();
}
......
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