Skip to content

GitLab

Nektar
Nektar
Commit 95cec97d authored by Dave Moxey's avatar Dave Moxey
Browse files
Options

Fixed compiler warnings in MultiRegions.

parent 5745e063
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 158 deletions
CMakeLists.txt
View file @ 95cec97d
......@@ -242,7 +242,8 @@ ENDIF( )
# Set up include directories
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE})
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE})
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
#IF( NEKTAR_USE_PRECOMPILED_HEADERS )
# ADD_DEFINITIONS(-DNEKTAR_USE_PRECOMPILED_HEADERS)
......
cmake/ThirdPartyBoost.cmake
View file @ 95cec97d
......@@ -101,4 +101,4 @@ ELSE (THIRDPARTY_BUILD_BOOST)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
ENDIF()
ENDIF (THIRDPARTY_BUILD_BOOST)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
library/LibUtilities/Communication/GsLib.hpp
View file @ 95cec97d
......@@ -138,9 +138,9 @@ namespace Gs
* global DOF on the process.
* @param pComm Communication object used for inter-process
* communication.
* @returns GSLib data structure containing mapping information.
* @return GSLib data structure containing mapping information.
*/
static gs_data* Init ( const Nektar::Array<OneD, long> pId,
static inline gs_data* Init ( const Nektar::Array<OneD, long> pId,
const LibUtilities::CommSharedPtr& pComm)
{
#ifdef NEKTAR_USE_MPI
......@@ -170,8 +170,8 @@ namespace Gs
* -distributed dot products, for which the contributions of each DOF must
* be included only once.
*/
static void Unique ( const Nektar::Array<OneD, long> pId,
const LibUtilities::CommSharedPtr& pComm)
static inline void Unique(const Nektar::Array<OneD, long> pId,
const LibUtilities::CommSharedPtr& pComm)
{
#ifdef NEKTAR_USE_MPI
if (pComm->GetSize() == 1)
......@@ -192,7 +192,7 @@ namespace Gs
/**
* @brief Deallocates the GSLib mapping data.
*/
static void Finalise (gs_data *pGsh)
static inline void Finalise (gs_data *pGsh)
{
#ifdef NEKTAR_USE_MPI
if (pGsh)
......@@ -208,7 +208,7 @@ namespace Gs
*
* The
*/
static void Gather(Nektar::Array<OneD, NekDouble> pU, gs_op pOp,
static inline void Gather(Nektar::Array<OneD, NekDouble> pU, gs_op pOp,
gs_data *pGsh, Nektar::Array<OneD, NekDouble> pBuffer
= NullNekDouble1DArray)
{
......
library/MultiRegions/AssemblyMap/AssemblyMap.cpp
View file @ 95cec97d
......@@ -78,11 +78,11 @@ namespace Nektar
m_session(),
m_comm(),
m_hash(0),
m_solnType(eNoSolnType),
m_numLocalBndCoeffs(0),
m_numGlobalBndCoeffs(0),
m_numLocalDirBndCoeffs(0),
m_numGlobalDirBndCoeffs(0),
m_solnType(eNoSolnType),
m_bndSystemBandWidth(0),
m_gsh(0),
m_bndGsh(0)
......@@ -93,13 +93,13 @@ namespace Nektar
m_session(pSession),
m_comm(pSession->GetComm()),
m_hash(0),
m_solnType(pSession->GetSolverInfoAsEnum<GlobalSysSolnType>("GlobalSysSoln")),
m_preconType(pSession->GetSolverInfoAsEnum<PreconditionerType>("Preconditioner")),
m_numLocalBndCoeffs(0),
m_numGlobalBndCoeffs(0),
m_numLocalDirBndCoeffs(0),
m_numGlobalDirBndCoeffs(0),
m_solnType(pSession->GetSolverInfoAsEnum<GlobalSysSolnType>("GlobalSysSoln")),
m_bndSystemBandWidth(0),
m_preconType(pSession->GetSolverInfoAsEnum<PreconditionerType>("Preconditioner")),
m_gsh(0),
m_bndGsh(0)
{
......@@ -116,12 +116,12 @@ namespace Nektar
m_session(oldLevelMap->m_session),
m_comm(oldLevelMap->GetComm()),
m_hash(0),
m_solnType(oldLevelMap->m_solnType),
m_globalToUniversalBndMap(oldLevelMap->GetGlobalToUniversalBndMap()),
m_globalToUniversalBndMapUnique(oldLevelMap->GetGlobalToUniversalBndMapUnique()),
m_solnType(oldLevelMap->m_solnType),
m_preconType(oldLevelMap->m_preconType),
m_gsh(oldLevelMap->m_gsh),
m_bndGsh(oldLevelMap->m_bndGsh),
m_preconType(oldLevelMap->m_preconType),
m_lowestStaticCondLevel(oldLevelMap->m_lowestStaticCondLevel)
{
int i;
......@@ -132,7 +132,6 @@ namespace Nektar
// -- Extract information from the input argument
int numGlobalBndCoeffsOld = oldLevelMap->GetNumGlobalBndCoeffs();
int numGlobalDirBndCoeffsOld = oldLevelMap->GetNumGlobalDirBndCoeffs();
int numGlobalHomBndCoeffsOld = numGlobalBndCoeffsOld - numGlobalDirBndCoeffsOld;
int numLocalBndCoeffsOld = oldLevelMap->GetNumLocalBndCoeffs();
int numLocalDirBndCoeffsOld = oldLevelMap->GetNumLocalDirBndCoeffs();
bool signChangeOld = oldLevelMap->GetSignChange();
......
library/MultiRegions/AssemblyMap/AssemblyMapCG2D.cpp
View file @ 95cec97d
......@@ -818,7 +818,6 @@ namespace Nektar
}
/// - All other vertices and edges
int nEdgeCoeffs;
int elmtid;
for(i = 0; i < locExpVector.size(); ++i)
{
......@@ -829,7 +828,6 @@ namespace Nektar
m_numLocalBndCoeffs += locExpansion->NumBndryCoeffs();
nTotalVerts += locExpansion->GetNverts();
}
}
......
library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp
View file @ 95cec97d
......@@ -172,7 +172,7 @@ namespace Nektar
const map<int,pair<int, StdRegions::Orientation> >& periodicFacesId)
{
int i,j,k,l;
int cnt = 0,cnt1=0;
int cnt = 0;
int intDofCnt;
int meshVertId;
int meshVertId2;
......
library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
View file @ 95cec97d
......@@ -1370,7 +1370,7 @@ namespace Nektar
LocalRegions::PointExpSharedPtr locPointExp =
boost::dynamic_pointer_cast<
LocalRegions::PointExp>(m_elmtToTrace[eid][j]);
id = locPointExp->GetGeom()->GetEid();
id = locPointExp->GetGeom()->GetVid();
vGlobalId = m_localToGlobalBndMap[cnt+j];
m_globalToUniversalBndMap[vGlobalId]
= id * maxDof + j + 1;
......@@ -1423,7 +1423,7 @@ namespace Nektar
const ExpListSharedPtr trace)
{
StdRegions::StdExpansionSharedPtr locExpansion;
int i,j,k;
int i;
int maxQuad = 0, quad = 0, nDim = 0, eid = 0, offset = 0;
const StdRegions::StdExpansionVector &locExpVector = *(locExp.GetExp());
......
library/MultiRegions/ContField3DHomogeneous2D.cpp
View file @ 95cec97d
......@@ -51,7 +51,6 @@ namespace Nektar
DisContField3DHomogeneous2D (In,false)
{
bool False = false;
ContField1DSharedPtr zero_line = boost::dynamic_pointer_cast<ContField1D> (In.m_lines[0]);
for(int n = 0; n < m_lines.num_elements(); ++n)
......@@ -78,7 +77,6 @@ namespace Nektar
DisContField3DHomogeneous2D(pSession,HomoBasis_y,HomoBasis_z,lhom_y,lhom_z,useFFT,dealiasing)
{
int i,n,nel;
bool False = false;
ContField1DSharedPtr line_zero;
SpatialDomains::BoundaryConditions bcs(pSession, graph1D);
......
library/MultiRegions/DisContField1D.cpp
View file @ 95cec97d
......@@ -263,7 +263,6 @@ namespace Nektar
{
int i;
int cnt = 0;
int cnt2 = 0;
const SpatialDomains::BoundaryRegionCollection &bregions
= bcs.GetBoundaryRegions();
......@@ -317,7 +316,6 @@ namespace Nektar
{
int i;
int cnt = 0;
int cnt2 = 0;
const SpatialDomains::BoundaryRegionCollection &bregions
= bcs.GetBoundaryRegions();
......
library/MultiRegions/DisContField2D.cpp
View file @ 95cec97d
......@@ -64,9 +64,9 @@ namespace Nektar
m_globalBndMat (In.m_globalBndMat),
m_trace (In.m_trace),
m_traceMap (In.m_traceMap),
m_boundaryEdges (In.m_boundaryEdges),
m_periodicEdges (In.m_periodicEdges),
m_periodicVertices (In.m_periodicVertices),
m_boundaryEdges (In.m_boundaryEdges),
m_perEdgeToExpMap (In.m_perEdgeToExpMap)
{
}
......@@ -793,8 +793,7 @@ namespace Nektar
{
// Loop over elements and collect forward expansion
int nexp = GetExpSize();
StdRegions::Orientation edgedir;
int nquad_e,cnt,n,e,npts,offset, phys_offset;
int cnt, n, e, npts, phys_offset;
Array<OneD,NekDouble> e_tmp;
map<int,int>::iterator it2;
boost::unordered_map<int,pair<int,int> >::iterator it3;
......@@ -1105,8 +1104,8 @@ namespace Nektar
Array<OneD, int> &EdgeID)
{
map<int, int> globalIdMap;
int i,n,id;
int bid,cnt,Eid;
int i,n;
int cnt;
int nbcs = 0;
SpatialDomains::MeshGraph2DSharedPtr graph2D =
......@@ -1540,7 +1539,7 @@ namespace Nektar
const NekDouble x2_in,
const NekDouble x3_in)
{
int i,j;
int i;
int npoints;
int nbnd = m_bndCondExpansions.num_elements();
......
library/MultiRegions/DisContField3D.cpp
View file @ 95cec97d
......@@ -529,8 +529,6 @@ namespace Nektar
int region1ID;
int region2ID;
StdRegions::Orientation orient1;
StdRegions::Orientation orient2;
SpatialDomains::Composite comp1;
SpatialDomains::Composite comp2;
SpatialDomains::Geometry2DSharedPtr faceGeom1;
......@@ -657,9 +655,6 @@ namespace Nektar
boost::lexical_cast<string>(
StdRegions::OrientationMap[forient]));
int f1 = (*element1)[0]->m_FaceIndx;
int f2 = (*element2)[0]->m_FaceIndx;
// Vertex/edge maps for fwd/bwd orientation in
// a-direction.
int vmap[2][3] = {{0,1,2}, {1,0,2}};
......@@ -1064,8 +1059,8 @@ namespace Nektar
Array<OneD, int> &FaceID)
{
map<int,int> globalIdMap;
int i,n,id;
int bid,cnt,Fid;
int i, n;
int cnt;
int nbcs = 0;
SpatialDomains::MeshGraph3DSharedPtr graph3D =
......@@ -1350,7 +1345,7 @@ namespace Nektar
const NekDouble x2_in,
const NekDouble x3_in)
{
int i,j;
int i;
int npoints;
int nbnd = m_bndCondExpansions.num_elements();
MultiRegions::ExpListSharedPtr locExpList;
......
library/MultiRegions/DisContField3DHomogeneous1D.cpp
View file @ 95cec97d
......@@ -368,8 +368,6 @@ namespace Nektar
Array<OneD, NekDouble> tmp_V2;
Array<OneD, NekDouble> tmp_outarray;
bool NegateNormals;
int cnt = 0;
int exp_size, exp_size_per_plane, elmtID, boundaryID, Phys_offset, Coef_offset;
......
library/MultiRegions/DisContField3DHomogeneous2D.cpp
View file @ 95cec97d
......@@ -70,7 +70,6 @@ namespace Nektar
{
if(DeclareLinesSetCoeffPhys)
{
bool False = false;
DisContField1DSharedPtr zero_line = boost::dynamic_pointer_cast<DisContField1D> (In.m_lines[0]);
for(int n = 0; n < m_lines.num_elements(); ++n)
......@@ -96,8 +95,6 @@ namespace Nektar
m_bndConditions()
{
int i,n,nel;
bool True = true;
bool False = false;
DisContField1DSharedPtr line_zero;
SpatialDomains::BoundaryConditions bcs(pSession, graph1D);
......
library/MultiRegions/ExpList.cpp
View file @ 95cec97d
......@@ -78,21 +78,21 @@ namespace Nektar
* MultiRegions#ExpList2D or MultiRegions#ExpList3D).
*/
ExpList::ExpList():
m_session(),
m_comm(),
m_session(),
m_graph(),
m_ncoeffs(0),
m_npoints(0),
m_coeffs(),
m_phys(),
m_physState(false),
m_exp(MemoryManager<StdRegions::StdExpansionVector>
::AllocateSharedPtr()),
m_coeff_offset(),
m_phys_offset(),
m_offset_elmt_id(),
m_physState(false),
m_WaveSpace(false),
m_exp(MemoryManager<StdRegions::StdExpansionVector>
::AllocateSharedPtr()),
m_blockMat(MemoryManager<BlockMatrixMap>::AllocateSharedPtr())
m_blockMat(MemoryManager<BlockMatrixMap>::AllocateSharedPtr()),
m_WaveSpace(false)
{
}
......@@ -104,21 +104,21 @@ namespace Nektar
*/
ExpList::ExpList(
const LibUtilities::SessionReaderSharedPtr &pSession):
m_session(pSession),
m_comm(pSession->GetComm()),
m_session(pSession),
m_graph(),
m_ncoeffs(0),
m_npoints(0),
m_coeffs(),
m_phys(),
m_physState(false),
m_exp(MemoryManager<StdRegions::StdExpansionVector>
::AllocateSharedPtr()),
m_coeff_offset(),
m_phys_offset(),
m_offset_elmt_id(),
m_physState(false),
m_WaveSpace(false),
m_exp(MemoryManager<StdRegions::StdExpansionVector>
::AllocateSharedPtr()),
m_blockMat(MemoryManager<BlockMatrixMap>::AllocateSharedPtr())
m_blockMat(MemoryManager<BlockMatrixMap>::AllocateSharedPtr()),
m_WaveSpace(false)
{
}
......@@ -131,21 +131,21 @@ namespace Nektar
ExpList::ExpList(
const LibUtilities::SessionReaderSharedPtr &pSession,
const SpatialDomains::MeshGraphSharedPtr &pGraph):
m_session(pSession),
m_comm(pSession->GetComm()),
m_session(pSession),
m_graph(pGraph),
m_ncoeffs(0),
m_npoints(0),
m_coeffs(),
m_phys(),
m_physState(false),
m_exp(MemoryManager<StdRegions::StdExpansionVector>
::AllocateSharedPtr()),
m_coeff_offset(),
m_phys_offset(),
m_offset_elmt_id(),
m_physState(false),
m_WaveSpace(false),
m_exp(MemoryManager<StdRegions::StdExpansionVector>
::AllocateSharedPtr()),
m_blockMat(MemoryManager<BlockMatrixMap>::AllocateSharedPtr())
m_blockMat(MemoryManager<BlockMatrixMap>::AllocateSharedPtr()),
m_WaveSpace(false)
{
}
......@@ -155,19 +155,19 @@ namespace Nektar
* @param in Source expansion list.
*/
ExpList::ExpList(const ExpList &in, const bool DeclareCoeffPhysArrays):
m_session(in.m_session),
m_comm(in.m_comm),
m_session(in.m_session),
m_graph(in.m_graph),
m_ncoeffs(in.m_ncoeffs),
m_npoints(in.m_npoints),
m_physState(false),
m_WaveSpace(false),
m_exp(in.m_exp),
m_coeff_offset(in.m_coeff_offset),
m_phys_offset(in.m_phys_offset),
m_offset_elmt_id(in.m_offset_elmt_id),
m_globalOptParam(in.m_globalOptParam),
m_blockMat(in.m_blockMat)
m_blockMat(in.m_blockMat),
m_WaveSpace(false)
{
if(DeclareCoeffPhysArrays)
{
......@@ -1458,9 +1458,6 @@ namespace Nektar
int i,j,k;
int nElementalCoeffs = (*m_exp)[0]->GetBasisNumModes(0);
StdRegions::ExpansionType locShape
= (*m_exp)[0]->DetExpansionType();
int nDumpCoeffs = nElementalCoeffs*nElementalCoeffs;
Array<TwoD, int> exponentMap(nDumpCoeffs,3,0);
int cnt = 0;
......
library/MultiRegions/ExpList1D.cpp
View file @ 95cec97d
......@@ -894,9 +894,6 @@ namespace Nektar
int i,j,e_npoints,offset;
Array<OneD,NekDouble> normals;
// Assume whole array is of same coordimate dimention
int coordim = (*m_exp)[0]->GetGeom1D()->GetCoordim();
// Process each expansion.
for(i = 0; i < m_exp->size(); ++i)
{
......@@ -1054,7 +1051,6 @@ namespace Nektar
void ExpList1D::v_WriteVtkPieceHeader(std::ofstream &outfile, int expansion)
{
int i,j;
int coordim = (*m_exp)[expansion]->GetCoordim();
int nquad0 = (*m_exp)[expansion]->GetNumPoints(0);
int ntot = nquad0;
int ntotminus = (nquad0-1);
......
library/MultiRegions/ExpList1DHomogeneous2D.cpp
View file @ 95cec97d
......@@ -82,8 +82,6 @@ namespace Nektar
ExpList1DHomogeneous2D::ExpList1DHomogeneous2D(const ExpList1DHomogeneous2D &In):
ExpListHomogeneous2D(In)
{
bool False = false;
for(int n = 0; n < m_lines.num_elements(); ++n)
{
m_lines[n] = In.m_lines[n];
......@@ -141,7 +139,6 @@ namespace Nektar
{
int n,m,j;
Array<OneD, NekDouble> tmp_xc;
int nyzlines = m_lines.num_elements();
int nylines = m_homogeneousBasis_y->GetNumPoints();
int nzlines = m_homogeneousBasis_z->GetNumPoints();
int npoints = 1;
......@@ -201,7 +198,6 @@ namespace Nektar
{
int n,m,j;
Array<OneD, NekDouble> tmp_xc;
int nyzlines = m_lines.num_elements();
int npoints = 1;
int nylines = m_homogeneousBasis_y->GetNumPoints();
......
library/MultiRegions/ExpList2D.cpp
View file @ 95cec97d
......@@ -780,7 +780,7 @@ namespace Nektar
void ExpList2D::v_GetNormals(
Array<OneD, Array<OneD, NekDouble> > &normals)
{
int i,j,k,offset;
int i,k,offset;
Array<OneD,Array<OneD,NekDouble> > locnormals;
Array<OneD, NekDouble> tmp;
// Assume whole array is of same coordinate dimension
......@@ -906,7 +906,6 @@ namespace Nektar
void ExpList2D::v_WriteVtkPieceHeader(std::ofstream &outfile, int expansion)
{
int i,j;
int coordim = (*m_exp)[expansion]->GetCoordim();
int nquad0 = (*m_exp)[expansion]->GetNumPoints(0);
int nquad1 = (*m_exp)[expansion]->GetNumPoints(1);
int ntot = nquad0*nquad1;
......
library/MultiRegions/ExpList2DHomogeneous1D.cpp
View file @ 95cec97d
......@@ -340,7 +340,6 @@ namespace Nektar
void ExpList2DHomogeneous1D::v_WriteVtkPieceHeader(std::ofstream &outfile, int expansion)
{
int i,j;
int coordim = (*m_exp)[expansion]->GetCoordim();
int nquad0 = (*m_exp)[expansion]->GetNumPoints(0);
int nquad1 = m_planes.num_elements();
int ntot = nquad0*nquad1;
......
library/MultiRegions/ExpList3D.cpp
View file @ 95cec97d
......@@ -445,7 +445,6 @@ namespace Nektar
void ExpList3D::v_WriteVtkPieceHeader(std::ofstream &outfile, int expansion)
{
int i,j,k;
int coordim = (*m_exp)[expansion]->GetCoordim();
int nquad0 = (*m_exp)[expansion]->GetNumPoints(0);
int nquad1 = (*m_exp)[expansion]->GetNumPoints(1);
int nquad2 = (*m_exp)[expansion]->GetNumPoints(2);
......
library/MultiRegions/ExpList3DHomogeneous1D.cpp
View file @ 95cec97d
......@@ -307,7 +307,6 @@ namespace Nektar
void ExpList3DHomogeneous1D::v_WriteVtkPieceHeader(std::ofstream &outfile, int expansion)
{
int i,j,k;
int coordim = (*m_exp)[expansion]->GetCoordim();
int nquad0 = (*m_exp)[expansion]->GetNumPoints(0);
int nquad1 = (*m_exp)[expansion]->GetNumPoints(1);
int nquad2 = m_planes.num_elements();
......@@ -429,9 +428,6 @@ namespace Nektar
Array<OneD, NekDouble> ExpList3DHomogeneous1D::v_HomogeneousEnergy(void)
{
int cnt = 0, cnt1 = 0;
int ncoeffs_per_plane = m_planes[0]->GetNcoeffs();
Array<OneD, NekDouble> energy(m_planes.num_elements()/2);
double area = 0.0;
......
library/MultiRegions/ExpList3DHomogeneous2D.cpp
View file @ 95cec97d
......@@ -175,7 +175,6 @@ namespace Nektar
{
int n,m,j;
Array<OneD, NekDouble> tmp_xc;
int nyzlines = m_lines.num_elements();
int nylines = m_homogeneousBasis_y->GetNumPoints();
int nzlines = m_homogeneousBasis_z->GetNumPoints();
......@@ -234,7 +233,6 @@ namespace Nektar
{
int n,m,j;
Array<OneD, NekDouble> tmp_xc;
int nyzlines = m_lines.num_elements();
int npoints = m_lines[0]->GetTotPoints();
int nylines = m_homogeneousBasis_y->GetNumPoints();
......@@ -309,7 +307,6 @@ namespace Nektar
void ExpList3DHomogeneous2D::v_WriteVtkPieceHeader(std::ofstream &outfile, int expansion)
{
int i,j,k;
int coordim = (*m_exp)[expansion]->GetCoordim();
int nquad0 = (*m_exp)[expansion]->GetNumPoints(0);
int nquad1 = m_homogeneousBasis_y->GetNumPoints();
int nquad2 = m_homogeneousBasis_z->GetNumPoints();
......
library/MultiRegions/ExpListHomogeneous1D.cpp
View file @ 95cec97d
......@@ -54,10 +54,10 @@ namespace Nektar
ExpListHomogeneous1D::ExpListHomogeneous1D(const LibUtilities::SessionReaderSharedPtr
&pSession,const LibUtilities::BasisKey &HomoBasis, const NekDouble lhom, const bool useFFT, const bool dealiasing):
ExpList(pSession),
m_lhom(lhom),
m_useFFT(useFFT),
m_dealiasing(dealiasing),
m_homogeneous1DBlockMat(MemoryManager<Homo1DBlockMatrixMap>::AllocateSharedPtr())
m_lhom(lhom),
m_homogeneous1DBlockMat(MemoryManager<Homo1DBlockMatrixMap>::AllocateSharedPtr()),
m_dealiasing(dealiasing)
{
ASSERTL2(HomoBasis != LibUtilities::NullBasisKey,"Homogeneous Basis is a null basis");
......@@ -85,18 +85,18 @@ namespace Nektar
*/
ExpListHomogeneous1D::ExpListHomogeneous1D(const ExpListHomogeneous1D &In):
ExpList(In,false),
m_homogeneousBasis(In.m_homogeneousBasis),
m_homogeneous1DBlockMat(In.m_homogeneous1DBlockMat),
m_lhom(In.m_lhom),
m_transposition(In.m_transposition),
m_useFFT(In.m_useFFT),
m_FFT(In.m_FFT),
m_dealiasing(In.m_dealiasing),
m_padsize(In.m_padsize),
MatBwdPAD(In.MatBwdPAD),
MatFwdPAD(In.MatFwdPAD),
m_FFT(In.m_FFT),
m_tmpIN(In.m_tmpIN),
m_tmpOUT(In.m_tmpOUT),
m_transposition(In.m_transposition)
m_homogeneousBasis(In.m_homogeneousBasis),
m_lhom(In.m_lhom),
m_homogeneous1DBlockMat(In.m_homogeneous1DBlockMat),
m_dealiasing(In.m_dealiasing),
m_padsize(In.m_padsize),
MatFwdPAD(In.MatFwdPAD),
MatBwdPAD(In.MatBwdPAD)
{
m_planes = Array<OneD, ExpListSharedPtr>(In.m_planes.num_elements());
}
......@@ -737,11 +737,9 @@ namespace Nektar
//Extract the data in fielddata into the m_coeff list (for 2D files into 3D cases)
void ExpListHomogeneous1D::v_ExtractDataToCoeffs(SpatialDomains::FieldDefinitionsSharedPtr &fielddef, std::vector<NekDouble> &fielddata, std::string &field, bool BaseFlow3D)
{
int i,n;
int i;
int offset = 0;
int nzmodes = m_homogeneousBasis->GetNumModes();
int datalen = fielddata.size()/fielddef->m_fields.size();
int ncoeffs_per_plane = m_planes[0]->GetNcoeffs();
// Find data location according to field definition
for(i = 0; i < fielddef->m_fields.size(); ++i)
......
library/MultiRegions/ExpListHomogeneous2D.cpp
View file @ 95cec97d
......@@ -46,9 +46,9 @@ namespace Nektar
ExpListHomogeneous2D::ExpListHomogeneous2D():
ExpList(),
m_homogeneousBasis_y(LibUtilities::NullBasisSharedPtr),
m_homogeneousBasis_z(LibUtilities::NullBasisSharedPtr),
m_homogeneousBasis_z(LibUtilities::NullBasisSharedPtr),
m_lhom_y(1),
m_lhom_z(1),
m_lhom_z(1),
m_homogeneous2DBlockMat(MemoryManager<Homo2DBlockMatrixMap>::AllocateSharedPtr())
{
}
......@@ -61,11 +61,11 @@ namespace Nektar
const bool useFFT,
const bool dealiasing):
ExpList(pSession),
m_useFFT(useFFT),
m_lhom_y(lhom_y),
m_lhom_z(lhom_z),
m_useFFT(useFFT),
m_dealiasing(dealiasing),
m_homogeneous2DBlockMat(MemoryManager<Homo2DBlockMatrixMap>::AllocateSharedPtr())
m_lhom_z(lhom_z),
m_homogeneous2DBlockMat(MemoryManager<Homo2DBlockMatrixMap>::AllocateSharedPtr()),
m_dealiasing(dealiasing)
{
ASSERTL2(HomoBasis_y != LibUtilities::NullBasisKey,
"Homogeneous Basis in y direction is a null basis");
......@@ -104,24 +104,24 @@ namespace Nektar
*/
ExpListHomogeneous2D::ExpListHomogeneous2D(const ExpListHomogeneous2D &In):
ExpList(In,false),
m_useFFT(In.m_useFFT),
m_FFT_y(In.m_FFT_y),
m_FFT_z(In.m_FFT_z),