Commit cd5bbe42 authored by Pavel Burovskiy's avatar Pavel Burovskiy

Reducing number of warnings. Including LibSMV header.

parent 572634aa
......@@ -3,16 +3,16 @@ SET(SMV_SEARCH_PATHS
${CMAKE_SOURCE_DIR}/ThirdParty/libsmv/lib
${CMAKE_SOURCE_DIR}/../ThirdParty/libsmv/lib
${CMAKE_SOURCE_DIR}/ThirdParty/dist/lib
${CMAKE_SOURCE_DIR}/../ThirdParty/dist/lib
CACHE PATH "SMV include path")
${CMAKE_SOURCE_DIR}/../ThirdParty/dist/lib)
FIND_PATH(SMV_INCLUDE_DIR libsmv.h PATHS ${SMV_SEARCH_PATHS})
FIND_PATH(SMV_INCLUDE_DIR NAMES smv.h PATHS ${SMV_SEARCH_PATHS})
FIND_LIBRARY(SMV_LIBRARY NAMES smv PATHS ${SMV_SEARCH_PATHS})
SET(SMV_FOUND FALSE)
IF (SMV_LIBRARY)
SET(SMV_FOUND TRUE)
INCLUDE_DIRECTORIES(${SMV_INCLUDE_DIR})
MARK_AS_ADVANCED(SMV_LIBRARY)
MARK_AS_ADVANCED(SMV_INCLUDE_DIR)
ENDIF (SMV_LIBRARY)
......
......@@ -154,10 +154,6 @@ MARK_AS_ADVANCED(NEKTAR_RELEASE_LIBRARIES)
MARK_AS_ADVANCED(NEKTAR_DEBUG_LIBRARIES)
MARK_AS_ADVANCED(NEKTAR_RELEASE_WITH_DEBUG_INFO_LIBRARIES)
IF(NEKTAR_USE_SMV)
INCLUDE_DIRECTORIES(${SMV_INCLUDE_DIR})
ENDIF(NEKTAR_USE_SMV)
IF(NEKTAR_USE_FFTW)
INCLUDE_DIRECTORIES(${FFTW_INCLUDE_DIR})
ENDIF(NEKTAR_USE_FFTW)
......
......@@ -42,8 +42,7 @@
#include <LibUtilities/LibUtilitiesDeclspec.h>
#include <boost/preprocessor/iteration/local.hpp>
#define LIBSMV_MAX_RANK 12
#include <smv.h>
namespace Smv
......
......@@ -61,8 +61,8 @@ namespace Nektar
m_rows(0),
m_cols(0),
m_rowoffset(sparseStoragePtrVector.num_elements()+1, 0.0),
m_submatrix(sparseStoragePtrVector.num_elements(),sparseStoragePtrVector),
m_mulCallsCounter(0)
m_mulCallsCounter(0),
m_submatrix(sparseStoragePtrVector.num_elements(),sparseStoragePtrVector)
{
for (int i = 0; i < sparseStoragePtrVector.num_elements(); i++)
{
......@@ -78,8 +78,8 @@ namespace Nektar
m_rows(src.m_rows),
m_cols(src.m_cols),
m_rowoffset(src.m_rowoffset),
m_submatrix(src.m_submatrix),
m_mulCallsCounter(src.m_mulCallsCounter)
m_mulCallsCounter(src.m_mulCallsCounter),
m_submatrix(src.m_submatrix)
{
}
......
......@@ -56,15 +56,15 @@ namespace Nektar
template<typename SparseStorageType>
NekSparseMatrix<SparseStorageType>::NekSparseMatrix(const SparseStorageSharedPtr& sparseStoragePtr):
m_sparseStorage(sparseStoragePtr),
m_mulCallsCounter(0)
m_mulCallsCounter(0),
m_sparseStorage(sparseStoragePtr)
{
}
template<typename SparseStorageType>
NekSparseMatrix<SparseStorageType>::NekSparseMatrix(const NekSparseMatrix& src):
m_sparseStorage(src.m_sparseStorage),
m_mulCallsCounter(src.m_mulCallsCounter)
m_mulCallsCounter(src.m_mulCallsCounter),
m_sparseStorage(src.m_sparseStorage)
{
}
......
......@@ -605,21 +605,20 @@ namespace Nektar
const double *pb;
const double *pval;
int i,j,jb,je;
int ii,jj;
int jb,je;
int bs;
const int mm=lb*lb;
double *pc=c;
for (i=0;i!=mb*lb;i++) *pc++ = 0;
for (int i=0;i!=mb*lb;i++) *pc++ = 0;
pc=c;
for (i=0;i!=mb;i++)
for (int i=0;i!=mb;i++)
{
jb = bpntrb[i];
je = bpntre[i];
pval = &val[jb*mm];
for (j=jb;j!=je;j++)
for (int j=jb;j!=je;j++)
{
bs=bindx[j]*lb;
pb = &b[bs];
......@@ -628,10 +627,10 @@ namespace Nektar
m_mvKernel(pval,pb,pc);
pval+=mm;
#else
for (jj=0;jj!=lb;jj++)
for (int jj=0;jj!=lb;jj++)
{
const double t = pb[jj];
for (ii=0;ii!=lb;ii++)
for (int ii=0;ii!=lb;ii++)
{
pc[ii] += t* (*pval++);
}
......
......@@ -221,11 +221,11 @@ namespace Nektar
const BCOMatType& bcoMat,
const MatrixStorage matType):
m_matType (matType),
m_blkDim (blkDim),
m_blkRows (blkRows),
m_blkCols (blkCols),
m_nnz (0),
m_blkDim (blkDim),
m_bnnz (bcoMat.size()),
m_nnz (0),
m_val (m_bnnz * blkDim*blkDim),
m_indx (m_bnnz+1),
m_pntr (blkRows+1)
......@@ -247,11 +247,11 @@ namespace Nektar
template<typename DataType>
StorageNistBsr<DataType>::StorageNistBsr(const StorageNistBsr& src):
m_matType(src.m_matType),
m_blkDim(src.m_blkDim),
m_blkRows (src.m_blkRows),
m_blkCols (src.m_blkCols),
m_nnz(src.m_nnz),
m_blkDim(src.m_blkDim),
m_bnnz(src.m_bnnz),
m_nnz(src.m_nnz),
m_val(src.m_val),
m_indx(src.m_indx),
m_pntr(src.m_pntr)
......
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