Skip to content

Nektar
Nektar
Commit fa188640 authored by Chris Cantwell's avatar Chris Cantwell
Browse files
Options

Updates to fix most warnings on cx1.

parent 7d8b960f
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 198 deletions
CMakeLists.txt
View file @ fa188640
......@@ -32,6 +32,7 @@ SET(LIB_DIR "lib")
IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
SET(LIB_DIR "lib64")
ENDIF()
SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem")
SET(NEKTAR_BIN_DIR bin)
SET(NEKTAR_LIB_DIR ${LIB_DIR})
......@@ -240,8 +241,7 @@ IF (APPLE)
SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
ENDIF (APPLE)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE})
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
# Build active components
IF (NEKTAR_BUILD_LIBRARY)
......
cmake/Nektar++Config.cmake.in
View file @ fa188640
......@@ -159,7 +159,8 @@ IF(NEKTAR_USE_ARPACK)
INCLUDE_DIRECTORIES(${ARPACK_INCLUDE_DIR})
ENDIF(NEKTAR_USE_ARPACK)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE} ${NIST_SPARSE_BLAS_INCLUDE_DIR})
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${LOKI_INCLUDE_DIR} ${TINYXML_BASE} ${NIST_SPARSE_BLAS_INCLUDE_DIR})
SET(NEKTAR_PACKAGE_GENERATOR "@NEKTAR_PACKAGE_GENERATOR@")
SET(NEKTAR_USING_BLAS "@NEKTAR_USING_BLAS@")
......
cmake/NektarCommon.cmake
View file @ fa188640
......@@ -103,16 +103,15 @@ MACRO(SET_COMMON_PROPERTIES name)
ENDIF( NEKTAR_FULL_DEBUG)
IF( NOT MSVC )
SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wno-deprecated")
IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -fpermissive -Wno-deprecated")
ELSE ()
SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -Wno-deprecated")
"${CMAKE_CXX_FLAGS_DEBUG} -fpermissive")
ENDIF()
SET(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} -Wno-deprecated")
"${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wno-deprecated")
ENDIF( NOT MSVC)
SET(CMAKE_CXX_FLAGS_RELEASE
......
cmake/ThirdPartyBoost.cmake
View file @ fa188640
......@@ -90,19 +90,24 @@ ELSE (THIRDPARTY_BUILD_BOOST)
SET(Boost_ADDITIONAL_VERSIONS "1.51" "1.51.0" "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47.0" "1.47" "1.46" "1.46. 1" "1.40" "1.40.0" "1.35.0" "1.35")
SET(Boost_NO_BOOST_CMAKE ON)
#If the user has not set BOOST_ROOT, look in a couple common places first.
IF( NOT BOOST_ROOT )
#If the user has not set BOOST_ROOT, look in a couple common places first.
SET(BOOST_ROOT $ENV{BOOST_HOME})
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time
IF (DEFINED($ENV{BOOST_HOME}))
SET(Boost_NO_SYSTEM_PATHS ON)
SET(BOOST_ROOT $ENV{BOOST_HOME})
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time
filesystem system program_options regex )
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/dist)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
ELSE ()
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/../ThirdParty/boost)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
SET(BOOST_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/dist)
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
ENDIF()
ELSE()
FIND_PACKAGE( Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex)
ENDIF()
ENDIF (THIRDPARTY_BUILD_BOOST)
INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
cmake/ThirdPartyLoki.cmake
View file @ fa188640
......@@ -13,3 +13,5 @@ IF (THIRDPARTY_BUILD_LOKI)
ENDIF()
INCLUDE (FindLoki)
INCLUDE_DIRECTORIES(SYSTEM ${LOKI_INCLUDE_DIR})
cmake/ThirdPartyTinyxml.cmake
View file @ fa188640
......@@ -33,7 +33,7 @@ ELSE (THIRDPARTY_BUILD_TINYXML)
INCLUDE (FindTinyXml)
ENDIF (THIRDPARTY_BUILD_TINYXML)
SET(TINYXML_LIB tinyxml)
INCLUDE_DIRECTORIES(${TINYXML_BASE})
INCLUDE_DIRECTORIES(SYSTEM ${TINYXML_BASE})
library/LibUtilities/BasicUtils/SessionReader.h
View file @ fa188640
......@@ -240,7 +240,7 @@ namespace Nektar
const std::string &trueval) const;
/// Check if the value of a solver info property matches.
template<typename T>
inline const bool MatchSolverInfoAsEnum(
inline bool MatchSolverInfoAsEnum(
const std::string &name,
const T &trueval) const;
/// Registers an enumeration value.
......@@ -458,7 +458,7 @@ namespace Nektar
*
*/
template<typename T>
inline const bool SessionReader::MatchSolverInfoAsEnum(
inline bool SessionReader::MatchSolverInfoAsEnum(
const std::string &name, const T &trueval) const
{
return (GetSolverInfoAsEnum<T>(name) == trueval);
......
library/LibUtilities/LinearAlgebra/NekVector.cpp
View file @ fa188640
......@@ -209,7 +209,7 @@ namespace Nektar
template<typename DataType>
const unsigned int NekVector<DataType>::GetDimension() const
unsigned int NekVector<DataType>::GetDimension() const
{
return m_size;
}
......
library/LibUtilities/LinearAlgebra/NekVector.hpp
View file @ fa188640
......@@ -135,7 +135,7 @@ namespace Nektar
/// \brief Returns the number of dimensions for the point.
LIB_UTILITIES_EXPORT const unsigned int GetDimension() const;
LIB_UTILITIES_EXPORT unsigned int GetDimension() const;
LIB_UTILITIES_EXPORT unsigned int GetRows() const;
......
library/MultiRegions/AssemblyMap/AssemblyMap.cpp
View file @ fa188640
......@@ -467,63 +467,63 @@ namespace Nektar
return result;
}
const void AssemblyMap::v_LocalToGlobal(
void AssemblyMap::v_LocalToGlobal(
const Array<OneD, const NekDouble>& loc,
Array<OneD, NekDouble>& global) const
{
ASSERTL0(false, "Not defined for this type of mapping.");
}
const void AssemblyMap::v_LocalToGlobal(
void AssemblyMap::v_LocalToGlobal(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const
{
ASSERTL0(false, "Not defined for this type of mapping.");
}
const void AssemblyMap::v_GlobalToLocal(
void AssemblyMap::v_GlobalToLocal(
const Array<OneD, const NekDouble>& global,
Array<OneD, NekDouble>& loc) const
{
ASSERTL0(false, "Not defined for this type of mapping.");
}
const void AssemblyMap::v_GlobalToLocal(
void AssemblyMap::v_GlobalToLocal(
const NekVector<NekDouble>& global,
NekVector< NekDouble>& loc) const
{
ASSERTL0(false, "Not defined for this type of mapping.");
}
const void AssemblyMap::v_Assemble(
void AssemblyMap::v_Assemble(
const Array<OneD, const NekDouble> &loc,
Array<OneD, NekDouble> &global) const
{
ASSERTL0(false, "Not defined for this type of mapping.");
}
const void AssemblyMap::v_Assemble(
void AssemblyMap::v_Assemble(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const
{
ASSERTL0(false, "Not defined for this type of mapping.");
}
const void AssemblyMap::v_UniversalAssemble(
void AssemblyMap::v_UniversalAssemble(
Array<OneD, NekDouble>& pGlobal) const
{
// Do nothing here since multi-level static condensation uses a
// AssemblyMap and thus will call this routine in serial.
}
const void AssemblyMap::v_UniversalAssemble(
void AssemblyMap::v_UniversalAssemble(
NekVector< NekDouble>& pGlobal) const
{
// Do nothing here since multi-level static condensation uses a
// AssemblyMap and thus will call this routine in serial.
}
const void AssemblyMap::v_UniversalAssemble(
void AssemblyMap::v_UniversalAssemble(
Array<OneD, NekDouble>& pGlobal,
int offset) const
{
......@@ -531,7 +531,7 @@ namespace Nektar
// AssemblyMap and thus will call this routine in serial.
}
const int AssemblyMap::v_GetFullSystemBandWidth() const
int AssemblyMap::v_GetFullSystemBandWidth() const
{
ASSERTL0(false, "Not defined for this type of mapping.");
return 0;
......@@ -607,68 +607,68 @@ namespace Nektar
return v_GetLocalToGlobalSign();
}
const void AssemblyMap::LocalToGlobal(
void AssemblyMap::LocalToGlobal(
const Array<OneD, const NekDouble>& loc,
Array<OneD, NekDouble>& global) const
{
v_LocalToGlobal(loc,global);
}
const void AssemblyMap::LocalToGlobal(
void AssemblyMap::LocalToGlobal(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const
{
v_LocalToGlobal(loc,global);
}
const void AssemblyMap::GlobalToLocal(
void AssemblyMap::GlobalToLocal(
const Array<OneD, const NekDouble>& global,
Array<OneD, NekDouble>& loc) const
{
v_GlobalToLocal(global,loc);
}
const void AssemblyMap::GlobalToLocal(
void AssemblyMap::GlobalToLocal(
const NekVector<NekDouble>& global,
NekVector< NekDouble>& loc) const
{
v_GlobalToLocal(global,loc);
}
const void AssemblyMap::Assemble(
void AssemblyMap::Assemble(
const Array<OneD, const NekDouble> &loc,
Array<OneD, NekDouble> &global) const
{
v_Assemble(loc,global);
}
const void AssemblyMap::Assemble(
void AssemblyMap::Assemble(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const
{
v_Assemble(loc,global);
}
const void AssemblyMap::UniversalAssemble(
void AssemblyMap::UniversalAssemble(
Array<OneD, NekDouble>& pGlobal) const
{
v_UniversalAssemble(pGlobal);
}
const void AssemblyMap::UniversalAssemble(
void AssemblyMap::UniversalAssemble(
NekVector< NekDouble>& pGlobal) const
{
v_UniversalAssemble(pGlobal);
}
const void AssemblyMap::UniversalAssemble(
void AssemblyMap::UniversalAssemble(
Array<OneD, NekDouble>& pGlobal,
int offset) const
{
v_UniversalAssemble(pGlobal, offset);
}
const int AssemblyMap::GetFullSystemBandWidth() const
int AssemblyMap::GetFullSystemBandWidth() const
{
return v_GetFullSystemBandWidth();
}
......@@ -949,7 +949,7 @@ namespace Nektar
UniversalAssembleBnd(global);
}
const void AssemblyMap::UniversalAssembleBnd(
void AssemblyMap::UniversalAssembleBnd(
Array<OneD, NekDouble>& pGlobal) const
{
ASSERTL1(pGlobal.num_elements() == m_numGlobalBndCoeffs,
......@@ -957,13 +957,13 @@ namespace Nektar
Gs::Gather(pGlobal, Gs::gs_add, m_bndGsh);
}
const void AssemblyMap::UniversalAssembleBnd(
void AssemblyMap::UniversalAssembleBnd(
NekVector< NekDouble>& pGlobal) const
{
UniversalAssembleBnd(pGlobal.GetPtr());
}
const void AssemblyMap::UniversalAssembleBnd(
void AssemblyMap::UniversalAssembleBnd(
Array<OneD, NekDouble>& pGlobal,
int offset) const
{
......@@ -1020,13 +1020,13 @@ namespace Nektar
}
const GlobalSysSolnType
GlobalSysSolnType
AssemblyMap::GetGlobalSysSolnType() const
{
return m_solnType;
}
const PreconditionerType
PreconditionerType
AssemblyMap::GetPreconType() const
{
return m_preconType;
......
library/MultiRegions/AssemblyMap/AssemblyMap.h
View file @ fa188640
......@@ -92,37 +92,37 @@ namespace Nektar
MULTI_REGIONS_EXPORT const Array<OneD, NekDouble>& GetLocalToGlobalSign() const;
MULTI_REGIONS_EXPORT const void LocalToGlobal(
MULTI_REGIONS_EXPORT void LocalToGlobal(
const Array<OneD, const NekDouble>& loc,
Array<OneD, NekDouble>& global) const;
MULTI_REGIONS_EXPORT const void LocalToGlobal(
MULTI_REGIONS_EXPORT void LocalToGlobal(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const;
MULTI_REGIONS_EXPORT const void GlobalToLocal(
MULTI_REGIONS_EXPORT void GlobalToLocal(
const Array<OneD, const NekDouble>& global,
Array<OneD, NekDouble>& loc) const;
MULTI_REGIONS_EXPORT const void GlobalToLocal(
MULTI_REGIONS_EXPORT void GlobalToLocal(
const NekVector<NekDouble>& global,
NekVector< NekDouble>& loc) const;
MULTI_REGIONS_EXPORT const void Assemble(
MULTI_REGIONS_EXPORT void Assemble(
const Array<OneD, const NekDouble> &loc,
Array<OneD, NekDouble> &global) const;
MULTI_REGIONS_EXPORT const void Assemble(
MULTI_REGIONS_EXPORT void Assemble(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const;
MULTI_REGIONS_EXPORT const void UniversalAssemble(
MULTI_REGIONS_EXPORT void UniversalAssemble(
Array<OneD, NekDouble>& pGlobal) const;
MULTI_REGIONS_EXPORT const void UniversalAssemble(
MULTI_REGIONS_EXPORT void UniversalAssemble(
NekVector< NekDouble>& pGlobal) const;
MULTI_REGIONS_EXPORT const void UniversalAssemble(
MULTI_REGIONS_EXPORT void UniversalAssemble(
Array<OneD, NekDouble>& pGlobal,
int offset) const;
......@@ -214,17 +214,17 @@ namespace Nektar
MULTI_REGIONS_EXPORT void AssembleBnd(const Array<OneD, const NekDouble>& loc,
Array<OneD, NekDouble>& global) const;
MULTI_REGIONS_EXPORT const void UniversalAssembleBnd(
MULTI_REGIONS_EXPORT void UniversalAssembleBnd(
Array<OneD, NekDouble>& pGlobal) const;
MULTI_REGIONS_EXPORT const void UniversalAssembleBnd(
MULTI_REGIONS_EXPORT void UniversalAssembleBnd(
NekVector< NekDouble>& pGlobal) const;
MULTI_REGIONS_EXPORT const void UniversalAssembleBnd(
MULTI_REGIONS_EXPORT void UniversalAssembleBnd(
Array<OneD, NekDouble>& pGlobal,
int offset) const;
MULTI_REGIONS_EXPORT const int GetFullSystemBandWidth() const;
MULTI_REGIONS_EXPORT int GetFullSystemBandWidth() const;
MULTI_REGIONS_EXPORT int GetNumNonDirVertexModes() const;
......@@ -260,10 +260,10 @@ namespace Nektar
/// static condensation.
MULTI_REGIONS_EXPORT bool AtLastLevel() const;
/// Returns the method of solving global systems.
MULTI_REGIONS_EXPORT const GlobalSysSolnType GetGlobalSysSolnType() const;
MULTI_REGIONS_EXPORT const PreconditionerType GetPreconType() const;
MULTI_REGIONS_EXPORT GlobalSysSolnType GetGlobalSysSolnType() const;
MULTI_REGIONS_EXPORT PreconditionerType GetPreconType() const;
MULTI_REGIONS_EXPORT const int GetLowestStaticCondLevel() const
MULTI_REGIONS_EXPORT int GetLowestStaticCondLevel() const
{
return m_lowestStaticCondLevel;
}
......@@ -383,41 +383,41 @@ namespace Nektar
virtual const Array<OneD, NekDouble>& v_GetLocalToGlobalSign() const;
virtual const void v_LocalToGlobal(
virtual void v_LocalToGlobal(
const Array<OneD, const NekDouble>& loc,
Array<OneD, NekDouble>& global) const;
virtual const void v_LocalToGlobal(
virtual void v_LocalToGlobal(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const;
virtual const void v_GlobalToLocal(
virtual void v_GlobalToLocal(
const Array<OneD, const NekDouble>& global,
Array<OneD, NekDouble>& loc) const;
virtual const void v_GlobalToLocal(
virtual void v_GlobalToLocal(
const NekVector<NekDouble>& global,
NekVector< NekDouble>& loc) const;
virtual const void v_Assemble(
virtual void v_Assemble(
const Array<OneD, const NekDouble> &loc,
Array<OneD, NekDouble> &global) const;
virtual const void v_Assemble(
virtual void v_Assemble(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const;
virtual const void v_UniversalAssemble(
virtual void v_UniversalAssemble(
Array<OneD, NekDouble>& pGlobal) const;
virtual const void v_UniversalAssemble(
virtual void v_UniversalAssemble(
NekVector< NekDouble>& pGlobal) const;
virtual const void v_UniversalAssemble(
virtual void v_UniversalAssemble(
Array<OneD, NekDouble>& pGlobal,
int offset) const;
virtual const int v_GetFullSystemBandWidth() const;
virtual int v_GetFullSystemBandWidth() const;
virtual int v_GetNumNonDirVertexModes() const;
......
library/MultiRegions/AssemblyMap/AssemblyMapCG.cpp
View file @ fa188640
......@@ -366,7 +366,7 @@ namespace Nektar
return m_localToGlobalSign;
}
const void AssemblyMapCG::v_LocalToGlobal(
void AssemblyMapCG::v_LocalToGlobal(
const Array<OneD, const NekDouble>& loc,
Array<OneD, NekDouble>& global) const
{
......@@ -391,14 +391,14 @@ namespace Nektar
}
}
const void AssemblyMapCG::v_LocalToGlobal(
void AssemblyMapCG::v_LocalToGlobal(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const
{
LocalToGlobal(loc.GetPtr(),global.GetPtr());
}
const void AssemblyMapCG::v_GlobalToLocal(
void AssemblyMapCG::v_GlobalToLocal(
const Array<OneD, const NekDouble>& global,
Array<OneD, NekDouble>& loc) const
{
......@@ -423,14 +423,14 @@ namespace Nektar
}
}
const void AssemblyMapCG::v_GlobalToLocal(
void AssemblyMapCG::v_GlobalToLocal(
const NekVector<NekDouble>& global,
NekVector< NekDouble>& loc) const
{
GlobalToLocal(global.GetPtr(),loc.GetPtr());
}
const void AssemblyMapCG::v_Assemble(
void AssemblyMapCG::v_Assemble(
const Array<OneD, const NekDouble> &loc,
Array<OneD, NekDouble> &global) const
{
......@@ -458,26 +458,26 @@ namespace Nektar
UniversalAssemble(global);
}
const void AssemblyMapCG::v_Assemble(
void AssemblyMapCG::v_Assemble(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const
{
Assemble(loc.GetPtr(),global.GetPtr());
}
const void AssemblyMapCG::v_UniversalAssemble(
void AssemblyMapCG::v_UniversalAssemble(
Array<OneD, NekDouble>& pGlobal) const
{
Gs::Gather(pGlobal, Gs::gs_add, m_gsh);
}
const void AssemblyMapCG::v_UniversalAssemble(
void AssemblyMapCG::v_UniversalAssemble(
NekVector< NekDouble>& pGlobal) const
{
UniversalAssemble(pGlobal.GetPtr());
}
const void AssemblyMapCG::v_UniversalAssemble(
void AssemblyMapCG::v_UniversalAssemble(
Array<OneD, NekDouble>& pGlobal,
int offset) const
{
......@@ -487,7 +487,7 @@ namespace Nektar
Vmath::Vcopy(offset, tmp, 1, pGlobal, 1);
}
const int AssemblyMapCG::v_GetFullSystemBandWidth() const
int AssemblyMapCG::v_GetFullSystemBandWidth() const
{
return m_fullSystemBandWidth;
}
......
library/MultiRegions/AssemblyMap/AssemblyMapCG.h
View file @ fa188640
......@@ -120,41 +120,41 @@ namespace Nektar
MULTI_REGIONS_EXPORT virtual const Array<OneD, NekDouble>& v_GetLocalToGlobalSign() const;
MULTI_REGIONS_EXPORT virtual const void v_LocalToGlobal(
MULTI_REGIONS_EXPORT virtual void v_LocalToGlobal(
const Array<OneD, const NekDouble>& loc,
Array<OneD, NekDouble>& global) const;
MULTI_REGIONS_EXPORT virtual const void v_LocalToGlobal(
MULTI_REGIONS_EXPORT virtual void v_LocalToGlobal(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const;
MULTI_REGIONS_EXPORT virtual const void v_GlobalToLocal(
MULTI_REGIONS_EXPORT virtual void v_GlobalToLocal(
const Array<OneD, const NekDouble>& global,
Array<OneD, NekDouble>& loc) const;
MULTI_REGIONS_EXPORT virtual const void v_GlobalToLocal(
MULTI_REGIONS_EXPORT virtual void v_GlobalToLocal(
const NekVector<NekDouble>& global,
NekVector< NekDouble>& loc) const;
MULTI_REGIONS_EXPORT virtual const void v_Assemble(
MULTI_REGIONS_EXPORT virtual void v_Assemble(
const Array<OneD, const NekDouble> &loc,
Array<OneD, NekDouble> &global) const;
MULTI_REGIONS_EXPORT virtual const void v_Assemble(
MULTI_REGIONS_EXPORT virtual void v_Assemble(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const;
MULTI_REGIONS_EXPORT virtual const void v_UniversalAssemble(
MULTI_REGIONS_EXPORT virtual void v_UniversalAssemble(
Array<OneD, NekDouble>& pGlobal) const;
MULTI_REGIONS_EXPORT virtual const void v_UniversalAssemble(
MULTI_REGIONS_EXPORT virtual void v_UniversalAssemble(
NekVector< NekDouble>& pGlobal) const;
MULTI_REGIONS_EXPORT virtual const void v_UniversalAssemble(
MULTI_REGIONS_EXPORT virtual void v_UniversalAssemble(
Array<OneD, NekDouble>& pGlobal,
int offset) const;
MULTI_REGIONS_EXPORT virtual const int v_GetFullSystemBandWidth() const;
MULTI_REGIONS_EXPORT virtual int v_GetFullSystemBandWidth() const;
MULTI_REGIONS_EXPORT virtual int v_GetNumNonDirVertexModes() const;
......
library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
View file @ fa188640
......@@ -1352,61 +1352,61 @@ namespace Nektar
return GetLocalToGlobalBndSign(i);
}
const void AssemblyMapDG::v_LocalToGlobal(
void AssemblyMapDG::v_LocalToGlobal(
const Array<OneD, const NekDouble>& loc,
Array<OneD, NekDouble>& global) const
{
AssembleBnd(loc,global);
}
const void AssemblyMapDG::v_LocalToGlobal(
void AssemblyMapDG::v_LocalToGlobal(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const
{
AssembleBnd(loc,global);
}
const void AssemblyMapDG::v_GlobalToLocal(
void AssemblyMapDG::v_GlobalToLocal(
const Array<OneD, const NekDouble>& global,
Array<OneD, NekDouble>& loc) const
{
GlobalToLocalBnd(global,loc);
}
const void AssemblyMapDG::v_GlobalToLocal(
void AssemblyMapDG::v_GlobalToLocal(
const NekVector<NekDouble>& global,
NekVector< NekDouble>& loc) const
{
GlobalToLocalBnd(global,loc);
}
const void AssemblyMapDG::v_Assemble(
void AssemblyMapDG::v_Assemble(
const Array<OneD, const NekDouble> &loc,
Array<OneD, NekDouble> &global) const
{
AssembleBnd(loc,global);
}
const void AssemblyMapDG::v_Assemble(
void AssemblyMapDG::v_Assemble(
const NekVector<NekDouble>& loc,
NekVector< NekDouble>& global) const
{
AssembleBnd(loc,global);
}
const void AssemblyMapDG::v_UniversalAssemble(
void AssemblyMapDG::v_UniversalAssemble(
Array<OneD, NekDouble>& pGlobal) const
{
Gs::Gather(pGlobal, Gs::gs_add, m_gsh);
}
const void AssemblyMapDG::v_UniversalAssemble(
void AssemblyMapDG::v_UniversalAssemble(
NekVector< NekDouble>& pGlobal) const
{
UniversalAssemble(pGlobal.GetPtr());
}
const int AssemblyMapDG::v_GetFullSystemBandWidth() const
int AssemblyMapDG::v_GetFullSystemBandWidth() const
{
return GetBndSystemBandWidth();
}
......