From 95cec97d11f0cf6dc16ac031b132551108f0c5d9 Mon Sep 17 00:00:00 2001 From: David Moxey Date: Tue, 20 Nov 2012 20:22:27 +0000 Subject: [PATCH] Fixed compiler warnings in MultiRegions. --- CMakeLists.txt | 3 +- cmake/ThirdPartyBoost.cmake | 2 +- library/LibUtilities/Communication/GsLib.hpp | 12 ++--- .../MultiRegions/AssemblyMap/AssemblyMap.cpp | 11 +++-- .../AssemblyMap/AssemblyMapCG2D.cpp | 2 - .../AssemblyMap/AssemblyMapCG3D.cpp | 2 +- .../AssemblyMap/AssemblyMapDG.cpp | 4 +- .../MultiRegions/ContField3DHomogeneous2D.cpp | 2 - library/MultiRegions/DisContField1D.cpp | 2 - library/MultiRegions/DisContField2D.cpp | 11 +++-- library/MultiRegions/DisContField3D.cpp | 11 ++--- .../DisContField3DHomogeneous1D.cpp | 2 - .../DisContField3DHomogeneous2D.cpp | 3 -- library/MultiRegions/ExpList.cpp | 45 +++++++++---------- library/MultiRegions/ExpList1D.cpp | 4 -- .../MultiRegions/ExpList1DHomogeneous2D.cpp | 4 -- library/MultiRegions/ExpList2D.cpp | 3 +- .../MultiRegions/ExpList2DHomogeneous1D.cpp | 1 - library/MultiRegions/ExpList3D.cpp | 1 - .../MultiRegions/ExpList3DHomogeneous1D.cpp | 4 -- .../MultiRegions/ExpList3DHomogeneous2D.cpp | 3 -- library/MultiRegions/ExpListHomogeneous1D.cpp | 28 ++++++------ library/MultiRegions/ExpListHomogeneous2D.cpp | 44 +++++++++--------- .../MultiRegions/GlobalLinSysDirectFull.cpp | 2 - .../GlobalLinSysDirectStaticCond.cpp | 4 +- .../GlobalLinSysIterativeFull.cpp | 1 - .../GlobalLinSysIterativeStaticCond.cpp | 6 +-- library/MultiRegions/GlobalLinSysKey.cpp | 4 +- library/MultiRegions/GlobalMatrixKey.cpp | 12 ++--- library/MultiRegions/Preconditioner.cpp | 4 +- .../MultiRegions/PreconditionerDiagonal.cpp | 10 ++--- library/MultiRegions/SubStructuredGraph.cpp | 2 - library/SolverUtils/DriverModifiedArnoldi.cpp | 3 -- library/SolverUtils/EquationSystem.cpp | 3 -- 34 files changed, 97 insertions(+), 158 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d2d28629..76a945659 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/cmake/ThirdPartyBoost.cmake b/cmake/ThirdPartyBoost.cmake index f1c6d76d9..e86be6925 100644 --- a/cmake/ThirdPartyBoost.cmake +++ b/cmake/ThirdPartyBoost.cmake @@ -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}) diff --git a/library/LibUtilities/Communication/GsLib.hpp b/library/LibUtilities/Communication/GsLib.hpp index e5ffbdde1..9f4075080 100644 --- a/library/LibUtilities/Communication/GsLib.hpp +++ b/library/LibUtilities/Communication/GsLib.hpp @@ -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 pId, + static inline gs_data* Init ( const Nektar::Array 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 pId, - const LibUtilities::CommSharedPtr& pComm) + static inline void Unique(const Nektar::Array 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 pU, gs_op pOp, + static inline void Gather(Nektar::Array pU, gs_op pOp, gs_data *pGsh, Nektar::Array pBuffer = NullNekDouble1DArray) { diff --git a/library/MultiRegions/AssemblyMap/AssemblyMap.cpp b/library/MultiRegions/AssemblyMap/AssemblyMap.cpp index 65ed069c0..3f3bd0e52 100644 --- a/library/MultiRegions/AssemblyMap/AssemblyMap.cpp +++ b/library/MultiRegions/AssemblyMap/AssemblyMap.cpp @@ -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("GlobalSysSoln")), - m_preconType(pSession->GetSolverInfoAsEnum("Preconditioner")), m_numLocalBndCoeffs(0), m_numGlobalBndCoeffs(0), m_numLocalDirBndCoeffs(0), m_numGlobalDirBndCoeffs(0), + m_solnType(pSession->GetSolverInfoAsEnum("GlobalSysSoln")), m_bndSystemBandWidth(0), + m_preconType(pSession->GetSolverInfoAsEnum("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(); diff --git a/library/MultiRegions/AssemblyMap/AssemblyMapCG2D.cpp b/library/MultiRegions/AssemblyMap/AssemblyMapCG2D.cpp index 6bb5dbe99..4e4a25304 100644 --- a/library/MultiRegions/AssemblyMap/AssemblyMapCG2D.cpp +++ b/library/MultiRegions/AssemblyMap/AssemblyMapCG2D.cpp @@ -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(); - } } diff --git a/library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp b/library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp index 01e40ef4e..f9a74fd0f 100644 --- a/library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp +++ b/library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp @@ -172,7 +172,7 @@ namespace Nektar const map >& periodicFacesId) { int i,j,k,l; - int cnt = 0,cnt1=0; + int cnt = 0; int intDofCnt; int meshVertId; int meshVertId2; diff --git a/library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp b/library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp index 24286d036..9fa5b9b43 100644 --- a/library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp +++ b/library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp @@ -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()); diff --git a/library/MultiRegions/ContField3DHomogeneous2D.cpp b/library/MultiRegions/ContField3DHomogeneous2D.cpp index 19d05d408..24c98f5fa 100644 --- a/library/MultiRegions/ContField3DHomogeneous2D.cpp +++ b/library/MultiRegions/ContField3DHomogeneous2D.cpp @@ -51,7 +51,6 @@ namespace Nektar DisContField3DHomogeneous2D (In,false) { - bool False = false; ContField1DSharedPtr zero_line = boost::dynamic_pointer_cast (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); diff --git a/library/MultiRegions/DisContField1D.cpp b/library/MultiRegions/DisContField1D.cpp index fedfe854b..718ccd9df 100644 --- a/library/MultiRegions/DisContField1D.cpp +++ b/library/MultiRegions/DisContField1D.cpp @@ -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(); diff --git a/library/MultiRegions/DisContField2D.cpp b/library/MultiRegions/DisContField2D.cpp index a3081a18a..dfb88ecc8 100644 --- a/library/MultiRegions/DisContField2D.cpp +++ b/library/MultiRegions/DisContField2D.cpp @@ -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 e_tmp; map::iterator it2; boost::unordered_map >::iterator it3; @@ -1105,8 +1104,8 @@ namespace Nektar Array &EdgeID) { map 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(); diff --git a/library/MultiRegions/DisContField3D.cpp b/library/MultiRegions/DisContField3D.cpp index 7a6b7aedd..c5642f7d3 100644 --- a/library/MultiRegions/DisContField3D.cpp +++ b/library/MultiRegions/DisContField3D.cpp @@ -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( 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 &FaceID) { map 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; diff --git a/library/MultiRegions/DisContField3DHomogeneous1D.cpp b/library/MultiRegions/DisContField3DHomogeneous1D.cpp index b67485e5d..14e323fb2 100644 --- a/library/MultiRegions/DisContField3DHomogeneous1D.cpp +++ b/library/MultiRegions/DisContField3DHomogeneous1D.cpp @@ -368,8 +368,6 @@ namespace Nektar Array tmp_V2; Array tmp_outarray; - bool NegateNormals; - int cnt = 0; int exp_size, exp_size_per_plane, elmtID, boundaryID, Phys_offset, Coef_offset; diff --git a/library/MultiRegions/DisContField3DHomogeneous2D.cpp b/library/MultiRegions/DisContField3DHomogeneous2D.cpp index 4ad22de97..a85da51ed 100644 --- a/library/MultiRegions/DisContField3DHomogeneous2D.cpp +++ b/library/MultiRegions/DisContField3DHomogeneous2D.cpp @@ -70,7 +70,6 @@ namespace Nektar { if(DeclareLinesSetCoeffPhys) { - bool False = false; DisContField1DSharedPtr zero_line = boost::dynamic_pointer_cast (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); diff --git a/library/MultiRegions/ExpList.cpp b/library/MultiRegions/ExpList.cpp index 5bccb36ad..b5700661d 100644 --- a/library/MultiRegions/ExpList.cpp +++ b/library/MultiRegions/ExpList.cpp @@ -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 + ::AllocateSharedPtr()), m_coeff_offset(), m_phys_offset(), m_offset_elmt_id(), - m_physState(false), - m_WaveSpace(false), - m_exp(MemoryManager - ::AllocateSharedPtr()), - m_blockMat(MemoryManager::AllocateSharedPtr()) + m_blockMat(MemoryManager::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 + ::AllocateSharedPtr()), m_coeff_offset(), m_phys_offset(), m_offset_elmt_id(), - m_physState(false), - m_WaveSpace(false), - m_exp(MemoryManager - ::AllocateSharedPtr()), - m_blockMat(MemoryManager::AllocateSharedPtr()) + m_blockMat(MemoryManager::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 + ::AllocateSharedPtr()), m_coeff_offset(), m_phys_offset(), m_offset_elmt_id(), - m_physState(false), - m_WaveSpace(false), - m_exp(MemoryManager - ::AllocateSharedPtr()), - m_blockMat(MemoryManager::AllocateSharedPtr()) + m_blockMat(MemoryManager::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 exponentMap(nDumpCoeffs,3,0); int cnt = 0; diff --git a/library/MultiRegions/ExpList1D.cpp b/library/MultiRegions/ExpList1D.cpp index 674007a2e..589899b09 100644 --- a/library/MultiRegions/ExpList1D.cpp +++ b/library/MultiRegions/ExpList1D.cpp @@ -894,9 +894,6 @@ namespace Nektar int i,j,e_npoints,offset; Array 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); diff --git a/library/MultiRegions/ExpList1DHomogeneous2D.cpp b/library/MultiRegions/ExpList1DHomogeneous2D.cpp index e39cb9949..c6e19072c 100644 --- a/library/MultiRegions/ExpList1DHomogeneous2D.cpp +++ b/library/MultiRegions/ExpList1DHomogeneous2D.cpp @@ -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 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 tmp_xc; - int nyzlines = m_lines.num_elements(); int npoints = 1; int nylines = m_homogeneousBasis_y->GetNumPoints(); diff --git a/library/MultiRegions/ExpList2D.cpp b/library/MultiRegions/ExpList2D.cpp index a250be2fc..078c4f920 100644 --- a/library/MultiRegions/ExpList2D.cpp +++ b/library/MultiRegions/ExpList2D.cpp @@ -780,7 +780,7 @@ namespace Nektar void ExpList2D::v_GetNormals( Array > &normals) { - int i,j,k,offset; + int i,k,offset; Array > locnormals; Array 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; diff --git a/library/MultiRegions/ExpList2DHomogeneous1D.cpp b/library/MultiRegions/ExpList2DHomogeneous1D.cpp index e37fc3426..ab534a890 100644 --- a/library/MultiRegions/ExpList2DHomogeneous1D.cpp +++ b/library/MultiRegions/ExpList2DHomogeneous1D.cpp @@ -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; diff --git a/library/MultiRegions/ExpList3D.cpp b/library/MultiRegions/ExpList3D.cpp index fa714a3fc..7725cbfe6 100644 --- a/library/MultiRegions/ExpList3D.cpp +++ b/library/MultiRegions/ExpList3D.cpp @@ -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); diff --git a/library/MultiRegions/ExpList3DHomogeneous1D.cpp b/library/MultiRegions/ExpList3DHomogeneous1D.cpp index 802b28108..5d9af4663 100644 --- a/library/MultiRegions/ExpList3DHomogeneous1D.cpp +++ b/library/MultiRegions/ExpList3DHomogeneous1D.cpp @@ -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 ExpList3DHomogeneous1D::v_HomogeneousEnergy(void) { - int cnt = 0, cnt1 = 0; - int ncoeffs_per_plane = m_planes[0]->GetNcoeffs(); - Array energy(m_planes.num_elements()/2); double area = 0.0; diff --git a/library/MultiRegions/ExpList3DHomogeneous2D.cpp b/library/MultiRegions/ExpList3DHomogeneous2D.cpp index 9811635d4..2552c3d78 100644 --- a/library/MultiRegions/ExpList3DHomogeneous2D.cpp +++ b/library/MultiRegions/ExpList3DHomogeneous2D.cpp @@ -175,7 +175,6 @@ namespace Nektar { int n,m,j; Array 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 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(); diff --git a/library/MultiRegions/ExpListHomogeneous1D.cpp b/library/MultiRegions/ExpListHomogeneous1D.cpp index cdef046e1..0c41211b7 100644 --- a/library/MultiRegions/ExpListHomogeneous1D.cpp +++ b/library/MultiRegions/ExpListHomogeneous1D.cpp @@ -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::AllocateSharedPtr()) + m_lhom(lhom), + m_homogeneous1DBlockMat(MemoryManager::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(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 &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) diff --git a/library/MultiRegions/ExpListHomogeneous2D.cpp b/library/MultiRegions/ExpListHomogeneous2D.cpp index 975fddd2b..a5e9a15ae 100644 --- a/library/MultiRegions/ExpListHomogeneous2D.cpp +++ b/library/MultiRegions/ExpListHomogeneous2D.cpp @@ -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::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::AllocateSharedPtr()) + m_lhom_z(lhom_z), + m_homogeneous2DBlockMat(MemoryManager::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), + m_transposition(In.m_transposition), + m_Ycomm(In.m_Ycomm), + m_Zcomm(In.m_Ycomm), m_homogeneousBasis_y(In.m_homogeneousBasis_y), - m_homogeneousBasis_z(In.m_homogeneousBasis_z), - m_homogeneous2DBlockMat(In.m_homogeneous2DBlockMat), + m_homogeneousBasis_z(In.m_homogeneousBasis_z), m_lhom_y(In.m_lhom_y), - m_lhom_z(In.m_lhom_z), - m_ny(In.m_ny), - m_nz(In.m_nz), - m_useFFT(In.m_useFFT), - m_FFT_y(In.m_FFT_y), - m_FFT_z(In.m_FFT_z), - m_dealiasing(In.m_dealiasing), - m_padsize_y(In.m_padsize_y), - m_padsize_z(In.m_padsize_z), - MatBwdPAD(In.MatBwdPAD), - MatFwdPAD(In.MatFwdPAD), - m_transposition(In.m_transposition), - m_Ycomm(In.m_Ycomm), - m_Zcomm(In.m_Ycomm) + m_lhom_z(In.m_lhom_z), + m_homogeneous2DBlockMat(In.m_homogeneous2DBlockMat), + m_ny(In.m_ny), + m_nz(In.m_nz), + m_dealiasing(In.m_dealiasing), + m_padsize_y(In.m_padsize_y), + m_padsize_z(In.m_padsize_z), + MatFwdPAD(In.MatFwdPAD), + MatBwdPAD(In.MatBwdPAD) { m_lines = Array(In.m_lines.num_elements()); } diff --git a/library/MultiRegions/GlobalLinSysDirectFull.cpp b/library/MultiRegions/GlobalLinSysDirectFull.cpp index c9efe0f7f..048504cac 100644 --- a/library/MultiRegions/GlobalLinSysDirectFull.cpp +++ b/library/MultiRegions/GlobalLinSysDirectFull.cpp @@ -127,8 +127,6 @@ namespace Nektar { // Calculate the dirichlet forcing and substract it // from the rhs - int nLocDofs = pLocToGloMap->GetNumLocalCoeffs(); - m_expList.lock()->GeneralMatrixOp( m_linSysKey, pOutput, tmp, eGlobal); diff --git a/library/MultiRegions/GlobalLinSysDirectStaticCond.cpp b/library/MultiRegions/GlobalLinSysDirectStaticCond.cpp index aabfb401e..a7f52049e 100644 --- a/library/MultiRegions/GlobalLinSysDirectStaticCond.cpp +++ b/library/MultiRegions/GlobalLinSysDirectStaticCond.cpp @@ -499,8 +499,6 @@ namespace Nektar const AssemblyMapSharedPtr& pLocToGloMap) { int i,j,n,cnt; - NekDouble one = 1.0; - NekDouble zero = 0.0; DNekScalBlkMatSharedPtr blkMatrices[4]; @@ -727,7 +725,7 @@ namespace Nektar { for(j = 0; j < 4; j++) { - tmpscalmat = MemoryManager::AllocateSharedPtr(one,substructuredMat[j][i]); + tmpscalmat = MemoryManager::AllocateSharedPtr(1.0,substructuredMat[j][i]); blkMatrices[j]->SetBlock(i,i,tmpscalmat); } } diff --git a/library/MultiRegions/GlobalLinSysIterativeFull.cpp b/library/MultiRegions/GlobalLinSysIterativeFull.cpp index 3ec670e09..3f5fcea00 100644 --- a/library/MultiRegions/GlobalLinSysIterativeFull.cpp +++ b/library/MultiRegions/GlobalLinSysIterativeFull.cpp @@ -127,7 +127,6 @@ namespace Nektar bool dirForcCalculated = (bool) pDirForcing.num_elements(); int nDirDofs = pLocToGloMap->GetNumGlobalDirBndCoeffs(); int nGlobDofs = pLocToGloMap->GetNumGlobalCoeffs(); - int nLocDofs = pLocToGloMap->GetNumLocalCoeffs(); int nDirTotal = nDirDofs; expList->GetComm()->AllReduce(nDirTotal, LibUtilities::ReduceSum); diff --git a/library/MultiRegions/GlobalLinSysIterativeStaticCond.cpp b/library/MultiRegions/GlobalLinSysIterativeStaticCond.cpp index 05e99838c..d82e5315e 100644 --- a/library/MultiRegions/GlobalLinSysIterativeStaticCond.cpp +++ b/library/MultiRegions/GlobalLinSysIterativeStaticCond.cpp @@ -599,8 +599,6 @@ namespace Nektar const AssemblyMapSharedPtr& pLocToGloMap) { int i,j,n,cnt; - NekDouble one = 1.0; - NekDouble zero = 0.0; DNekScalBlkMatSharedPtr blkMatrices[4]; // Create temporary matrices within an inner-local scope to ensure @@ -822,7 +820,7 @@ namespace Nektar { for(j = 0; j < 4; j++) { - tmpscalmat = MemoryManager::AllocateSharedPtr(one,substructuredMat[j][i]); + tmpscalmat = MemoryManager::AllocateSharedPtr(1.0,substructuredMat[j][i]); blkMatrices[j]->SetBlock(i,i,tmpscalmat); } } @@ -847,9 +845,7 @@ namespace Nektar Array& pOutput) { int nLocal = m_locToGloMap->GetNumLocalBndCoeffs(); - int nGlobal = m_locToGloMap->GetNumGlobalBndCoeffs(); int nDir = m_locToGloMap->GetNumGlobalDirBndCoeffs(); - int nNonDir = nGlobal - nDir; if (m_globalSchurCompl) { diff --git a/library/MultiRegions/GlobalLinSysKey.cpp b/library/MultiRegions/GlobalLinSysKey.cpp index 16f768e82..c8262f79b 100644 --- a/library/MultiRegions/GlobalLinSysKey.cpp +++ b/library/MultiRegions/GlobalLinSysKey.cpp @@ -69,8 +69,8 @@ namespace Nektar * @param key Existing key to duplicate. */ GlobalLinSysKey::GlobalLinSysKey(const GlobalLinSysKey &key): - m_solnType(key.m_solnType), - GlobalMatrixKey(key) + GlobalMatrixKey(key), + m_solnType(key.m_solnType) { } diff --git a/library/MultiRegions/GlobalMatrixKey.cpp b/library/MultiRegions/GlobalMatrixKey.cpp index afc5a530b..718df0a43 100644 --- a/library/MultiRegions/GlobalMatrixKey.cpp +++ b/library/MultiRegions/GlobalMatrixKey.cpp @@ -46,9 +46,9 @@ namespace Nektar const StdRegions::VarCoeffMap &varCoeffs) : m_matrixType(matrixType), m_expansionType(StdRegions::eNoExpansionType), - m_locToGloMap(locToGloMap), m_constFactors(factors), - m_varCoeffs(varCoeffs) + m_varCoeffs(varCoeffs), + m_locToGloMap(locToGloMap) { } @@ -56,18 +56,18 @@ namespace Nektar const StdRegions::ExpansionType expType): m_matrixType(key.m_matrixType), m_expansionType(expType), - m_locToGloMap(key.m_locToGloMap), m_constFactors(key.m_constFactors), - m_varCoeffs(key.m_varCoeffs) + m_varCoeffs(key.m_varCoeffs), + m_locToGloMap(key.m_locToGloMap) { } GlobalMatrixKey::GlobalMatrixKey(const GlobalMatrixKey &key): m_matrixType(key.m_matrixType), m_expansionType(key.m_expansionType), - m_locToGloMap(key.m_locToGloMap), m_constFactors(key.m_constFactors), - m_varCoeffs(key.m_varCoeffs) + m_varCoeffs(key.m_varCoeffs), + m_locToGloMap(key.m_locToGloMap) { } diff --git a/library/MultiRegions/Preconditioner.cpp b/library/MultiRegions/Preconditioner.cpp index cc4bfb453..f4423cbea 100644 --- a/library/MultiRegions/Preconditioner.cpp +++ b/library/MultiRegions/Preconditioner.cpp @@ -64,8 +64,8 @@ namespace Nektar const boost::shared_ptr &plinsys, const AssemblyMapSharedPtr &pLocToGloMap): m_linsys(plinsys), - m_locToGloMap(pLocToGloMap), - m_preconType(pLocToGloMap->GetPreconType()) + m_preconType(pLocToGloMap->GetPreconType()), + m_locToGloMap(pLocToGloMap) { } diff --git a/library/MultiRegions/PreconditionerDiagonal.cpp b/library/MultiRegions/PreconditionerDiagonal.cpp index 9f9b36bf4..b2c2b5c84 100644 --- a/library/MultiRegions/PreconditionerDiagonal.cpp +++ b/library/MultiRegions/PreconditionerDiagonal.cpp @@ -69,9 +69,9 @@ namespace Nektar const boost::shared_ptr &plinsys, const AssemblyMapSharedPtr &pLocToGloMap) : Preconditioner(plinsys, pLocToGloMap), - m_linsys(plinsys), - m_locToGloMap(pLocToGloMap), - m_preconType(pLocToGloMap->GetPreconType()) + m_linsys(plinsys), + m_preconType(pLocToGloMap->GetPreconType()), + m_locToGloMap(pLocToGloMap) { } @@ -106,8 +106,6 @@ namespace Nektar boost::shared_ptr expList = ((m_linsys.lock())->GetLocMat()).lock(); - const StdRegions::StdExpansionVector &locExpVector = - *(expList->GetExp()); StdRegions::StdExpansionSharedPtr locExpansion; int i,j,n,cnt,gid1,gid2; @@ -116,8 +114,6 @@ namespace Nektar int nDir = m_locToGloMap->GetNumGlobalDirBndCoeffs(); int nInt = nGlobal - nDir; - NekDouble zero = 0.0; - // fill global matrix DNekScalMatSharedPtr loc_mat; Array vOutput(nGlobal,0.0); diff --git a/library/MultiRegions/SubStructuredGraph.cpp b/library/MultiRegions/SubStructuredGraph.cpp index ee0bf7964..c3fa590a6 100644 --- a/library/MultiRegions/SubStructuredGraph.cpp +++ b/library/MultiRegions/SubStructuredGraph.cpp @@ -95,7 +95,6 @@ namespace Nektar offset += 5; int recurLevel = sepTree[offset+0]; - int branch = sepTree[offset+1]; int nLeftIntDofs = sepTree[offset+2]; int nRightIntDofs = sepTree[offset+3]; int nBndDofs = sepTree[offset+4]; @@ -594,7 +593,6 @@ namespace Nektar for(int i = 0; i < m_IntBlocks.size(); i++) { int OrigGlobIdOffset = m_IntBlocks[i]->GetIdOffset(); - int OrigNverts = m_IntBlocks[i]->GetNverts(); int newNverts = 0; m_IntBlocks[i]->SetIdOffset(offset); diff --git a/library/SolverUtils/DriverModifiedArnoldi.cpp b/library/SolverUtils/DriverModifiedArnoldi.cpp index 737655c3d..beb326786 100644 --- a/library/SolverUtils/DriverModifiedArnoldi.cpp +++ b/library/SolverUtils/DriverModifiedArnoldi.cpp @@ -257,7 +257,6 @@ namespace Nektar { Array fields; fields = m_equ[0]->UpdateFields(); - int ntot = fields[0]->GetNcoeffs(); //start Adjoint with latest fields of direct CopyFwdToAdj(); @@ -344,7 +343,6 @@ namespace Nektar NekDouble &resid0) { int idone = 0; - NekDouble re_ev, im_ev, abs_ev, ang_ev, re_Aev, im_Aev; // NekDouble period = 0.1; Array resid(kdim); @@ -447,7 +445,6 @@ namespace Nektar { // Converged, write out eigenvectors EV_big(Tseq, Kseq, ntot, kdim, icon, zvec, wr, wi); - int nq = m_equ[0]->UpdateFields()[0]->GetNcoeffs(); Array fields = m_equ[0]->UpdateFields(); diff --git a/library/SolverUtils/EquationSystem.cpp b/library/SolverUtils/EquationSystem.cpp index 52bb59e26..06b45148d 100644 --- a/library/SolverUtils/EquationSystem.cpp +++ b/library/SolverUtils/EquationSystem.cpp @@ -1039,7 +1039,6 @@ namespace Nektar Array > &base) { base = Array >(m_spacedim); - int nq = m_fields[0]->GetNpoints(); std::vector vel; vel.push_back("Vx"); vel.push_back("Vy"); @@ -1905,8 +1904,6 @@ namespace Nektar const std::string &name, bool IsInPhysicalSpace) { - int nq = m_fields[0]->GetTotPoints(); - std::string var = ""; for(int j = 0; j < m_fields.num_elements(); ++j) { -- GitLab