diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d2d28629baf4d86fa09350cccc50ef755c84574..76a945659896b83fc8c1fe387bcfa1a0b8c45984 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 f1c6d76d926e05db6d468803697f4d038c9cc36e..e86be692538450504af822b6a36157bb12ca10d7 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 e5ffbdde1bb88865dd16d7ce0991a1d5004c93f7..9f4075080fa123237863fb4c42fcc1270342e7a2 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 65ed069c0496107a6c57ae6fdb03d7ac63387399..3f3bd0e52646e2f4482dc9c415ce52e52affff82 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 6bb5dbe9995c3274b968784a624afafadcafb34c..4e4a25304af0b7cc98790ece2054dda4d05f187a 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 01e40ef4e0046e86bc3bbab2b9936acd71f8257e..f9a74fd0f7d873f5f5a3c5302180a7842572bd1d 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 24286d036ebc476a9c197774e3e61ddefc30f375..9fa5b9b432442ac5d2bc1b11b1e0424bc5451544 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 19d05d40843d2d87bb48c07ceb154ac5dcc62614..24c98f5fa220908df2f3dc99be51aebc1ffd7a66 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 fedfe854bb14b018cd6048e9b82a7c3ea7b9b700..718ccd9dff979bda59594f23b3da88594911b60b 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 a3081a18af145832703bdb6fb0e6d1d6a8759f54..dfb88ecc83620f267ebe1ce6e66c24731bbb6c6a 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 7a6b7aedd1e4db152e72037f0e0b9f060cd6f7eb..c5642f7d3f9f421fef8614322c3f302ba3369f6e 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 b67485e5dd7a1ae5e94f1591de17d480dd32d14b..14e323fb23efd464cad6f14bbab5402e09e0789e 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 4ad22de976ea5137ecd57a35f56f5253f5cd04b6..a85da51ed140819b8938a459d534eb7ee63992f4 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 5bccb36ad74946c8d1d2d58fd1ed71a73977f33e..b5700661dcfa461dcc3f97a5a3c231f75447773e 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 674007a2e9457600f8c12bf98567598a71d45fd4..589899b09fd7a6fa558ad82309bf0edc7178dbf3 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 e39cb9949efb07d57c47a70b7fd15835acbfea75..c6e19072ce2a42c3cead6a770e40fe97018e21da 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 a250be2fcea26c0cc5b5d2c4ca346cbd7e0e5ed1..078c4f9203f415424e5787a7021422ff1795d493 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 e37fc3426f4e50f5fb034bdc977a4e7121902476..ab534a89000f324b8bdc3a4550e43809157482fc 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 fa714a3fc42c44be070f6ccefd5b180698cb3ab4..7725cbfe6a4297e09cb273f4c8d04f84bfcb85ff 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 802b28108228f11f699bf86dfc946c238746351a..5d9af466332e33d183172d7015d3608bb7848254 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 9811635d404cfabf29024bb2e69e9ae0c1c77f4b..2552c3d78da16d34948d51740ac1c1d56f95853f 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 cdef046e1c4864828a3a5af4069e155655fa1597..0c41211b732f5a5ae24ddf5fd64ee1fc324fcfbe 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 975fddd2bc7704e5e1408493ea5910d90f00b54d..a5e9a15ae1f1ccd6f6a9d9bcb815a92c75b01748 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 c9efe0f7f3bcdc51255bcf52ce105de4fceec144..048504cac79196981311af33be6cef7cce1132e1 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 aabfb401e7f17bc4a15d2d35d3a06a0dd42e7553..a7f52049ecca5af2e60d86c3b53c3dd2ec122aa8 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 3ec670e09c6ae5736363f9b125d67d51b1c37418..3f5fcea0050b8a5a92061e6543ebe105c11c3cb6 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 05e99838c9d509ad27b51a923983d41188a8fa28..d82e5315e1d1cdce48a12b006e96c9197f4db24d 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 16f768e828d1f747a592433011d9838a85ed0e3e..c8262f79b972b3c9e1473451a996a5e5a576bbf1 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 afc5a530be77e3e6c42e9ebc447c52e0475995b3..718df0a432440c3a1067251252828e5acf30d4e7 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 cc4bfb453e56087595a95b7ceed26167c11bd5e7..f4423cbeacb77e2765820a62b37f63f0fbc403e4 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 9f9b36bf401b4b677540b843b5c51a54defe3317..b2c2b5c843b65f2acb870bbffb1d7ca1f7a7b7a3 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 ee0bf7964e06a0bf469641ffc0084a8869c847a9..c3fa590a6678615a141e75a12ead63bb386ab409 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 737655c3d46fc8635fae9a31bca10d27cfd81c55..beb3267860f90e9a0df5edbba3b2d88b99430770 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 52bb59e26fe1f33ec8653b8e7ccf97cab601218e..06b45148d11f92128dafb7bff1e1457f4883647f 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) {