Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Nektar
Nektar
Commits
9806c49d
Commit
9806c49d
authored
Jun 18, 2017
by
Dave Moxey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some compiler warnings and error if memory pools disabled
parent
158e1f18
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
31 additions
and
22 deletions
+31
-22
CMakeLists.txt
CMakeLists.txt
+12
-8
cmake/ThirdPartyMPI.cmake
cmake/ThirdPartyMPI.cmake
+1
-1
library/LibUtilities/Memory/NekMemoryManager.hpp
library/LibUtilities/Memory/NekMemoryManager.hpp
+1
-0
library/MultiRegions/PreconditionerBlock.cpp
library/MultiRegions/PreconditionerBlock.cpp
+1
-1
library/NekMeshUtils/CADSystem/CADCurve.h
library/NekMeshUtils/CADSystem/CADCurve.h
+1
-1
library/NekMeshUtils/CADSystem/CADSurf.h
library/NekMeshUtils/CADSystem/CADSurf.h
+1
-1
library/NekMeshUtils/CADSystem/CADVert.h
library/NekMeshUtils/CADSystem/CADVert.h
+3
-1
library/NekMeshUtils/CADSystem/OCE/CADCurveOCE.h
library/NekMeshUtils/CADSystem/OCE/CADCurveOCE.h
+1
-1
library/NekMeshUtils/CADSystem/OCE/CADSurfOCE.cpp
library/NekMeshUtils/CADSystem/OCE/CADSurfOCE.cpp
+3
-3
library/NekMeshUtils/CADSystem/OCE/CADSurfOCE.h
library/NekMeshUtils/CADSystem/OCE/CADSurfOCE.h
+1
-1
library/NekMeshUtils/CADSystem/OCE/CADSystemOCE.h
library/NekMeshUtils/CADSystem/OCE/CADSystemOCE.h
+3
-1
library/NekMeshUtils/CADSystem/OCE/CADVertOCE.h
library/NekMeshUtils/CADSystem/OCE/CADVertOCE.h
+1
-1
library/SolverUtils/Filters/FilterFieldConvert.cpp
library/SolverUtils/Filters/FilterFieldConvert.cpp
+2
-2
No files found.
CMakeLists.txt
View file @
9806c49d
...
...
@@ -7,14 +7,18 @@ PROJECT(Nektar++ C CXX)
# Nektar++ requires C++11. Try to infer this for older CMake versions (less than
# 3.1.0)
IF
(
"
${
CMAKE_VERSION
}
"
VERSION_LESS
"3.1"
AND NOT MSVC
)
INCLUDE
(
CheckCXXCompilerFlag
)
CHECK_CXX_COMPILER_FLAG
(
"-std=c++11"
COMPILER_SUPPORTS_CXX11
)
IF
(
COMPILER_SUPPORTS_CXX11
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11"
)
ELSE
()
MESSAGE
(
STATUS
"Nektar++ requires a compiler with C++11 support."
)
IF
(
"
${
CMAKE_VERSION
}
"
VERSION_LESS
"3.1"
)
IF
(
NOT MSVC
)
INCLUDE
(
CheckCXXCompilerFlag
)
CHECK_CXX_COMPILER_FLAG
(
"-std=c++11"
COMPILER_SUPPORTS_CXX11
)
IF
(
COMPILER_SUPPORTS_CXX11
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11"
)
ELSE
()
MESSAGE
(
FATAL_ERROR
"Nektar++ requires a compiler with C++11 support."
)
ENDIF
()
ELSEIF
(
CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0
)
MESSAGE
(
FATAL_ERROR
"Nektar++ requires full C++11 support: please upgrade to Visual Studio 2013 or later"
)
ENDIF
()
ELSE
()
SET
(
CMAKE_CXX_STANDARD 11
)
...
...
cmake/ThirdPartyMPI.cmake
View file @
9806c49d
...
...
@@ -25,7 +25,7 @@ IF( NEKTAR_USE_MPI )
IF
(
NOT
"
${
HAVE_MPI_H
}
"
OR NOT
"
${
HAVE_MPI_SEND
}
"
)
FIND_PACKAGE
(
MPI REQUIRED
)
INCLUDE_DIRECTORIES
(
${
MPI_CXX_INCLUDE_PATH
}
)
INCLUDE_DIRECTORIES
(
SYSTEM
${
MPI_CXX_INCLUDE_PATH
}
)
MESSAGE
(
STATUS
"Found MPI:
${
MPI_CXX_LIBRARIES
}
"
)
ELSE
()
SET
(
MPI_BUILTIN ON
)
...
...
library/LibUtilities/Memory/NekMemoryManager.hpp
View file @
9806c49d
...
...
@@ -177,6 +177,7 @@ public:
///
/// The allocated object must be returned to the memory pool
/// via Deallocate.
template
<
typename
...
Args
>
static
DataType
*
Allocate
(
const
Args
&
...
args
)
{
return
new
DataType
(
args
...);
...
...
library/MultiRegions/PreconditionerBlock.cpp
View file @
9806c49d
...
...
@@ -120,7 +120,7 @@ namespace Nektar
DNekScalBlkMatSharedPtr
loc_mat
;
DNekScalMatSharedPtr
bnd_mat
;
int
nel
,
i
,
j
,
k
,
n
,
cnt
,
gId
;
int
i
,
j
,
k
,
n
,
cnt
,
gId
;
int
meshVertId
,
meshEdgeId
,
meshFaceId
;
const
int
nExp
=
expList
->
GetExpSize
();
...
...
library/NekMeshUtils/CADSystem/CADCurve.h
View file @
9806c49d
...
...
@@ -62,7 +62,7 @@ public:
m_type
=
CADType
::
eCurve
;
}
~
CADCurve
()
virtual
~
CADCurve
()
{
}
...
...
library/NekMeshUtils/CADSystem/CADSurf.h
View file @
9806c49d
...
...
@@ -66,7 +66,7 @@ public:
m_orientation
=
CADOrientation
::
eForwards
;
}
~
CADSurf
()
virtual
~
CADSurf
()
{
}
...
...
library/NekMeshUtils/CADSystem/CADVert.h
View file @
9806c49d
...
...
@@ -66,7 +66,9 @@ public:
m_type
=
CADType
::
eVert
;
}
~
CADVert
(){};
virtual
~
CADVert
()
{
}
/**
* @brief Get x,y,z location of the vertex
...
...
library/NekMeshUtils/CADSystem/OCE/CADCurveOCE.h
View file @
9806c49d
...
...
@@ -59,7 +59,7 @@ public:
{
}
~
CADCurveOCE
()
virtual
~
CADCurveOCE
()
{
}
...
...
library/NekMeshUtils/CADSystem/OCE/CADSurfOCE.cpp
View file @
9806c49d
...
...
@@ -89,9 +89,9 @@ Array<OneD, NekDouble> CADSurfOCE::locuv(Array<OneD, NekDouble> p)
uvr
[
0
]
=
p2
.
X
();
uvr
[
1
]
=
p2
.
Y
();
gp_Pnt
p3
=
m_sas
->
Value
(
p2
)
;
WARNINGL2
(
p3
.
Distance
(
loc
)
<
1e-3
,
"large locuv distance "
+
boost
::
lexical_cast
<
string
>
(
p3
.
Distance
(
loc
)
/
1000.0
)
+
" "
+
WARNINGL2
(
m_sas
->
Value
(
p2
)
.
Distance
(
loc
)
<
1e-3
,
"large locuv distance "
+
boost
::
lexical_cast
<
string
>
(
m_sas
->
Value
(
p2
)
.
Distance
(
loc
)
/
1000.0
)
+
" "
+
boost
::
lexical_cast
<
string
>
(
m_id
));
// if the uv returned is slightly off the surface
...
...
library/NekMeshUtils/CADSystem/OCE/CADSurfOCE.h
View file @
9806c49d
...
...
@@ -59,7 +59,7 @@ public:
{
}
~
CADSurfOCE
()
virtual
~
CADSurfOCE
()
{
}
...
...
library/NekMeshUtils/CADSystem/OCE/CADSystemOCE.h
View file @
9806c49d
...
...
@@ -59,7 +59,9 @@ public:
* @brief Default constructor.
*/
CADSystemOCE
(
std
::
string
name
)
:
CADSystem
(
name
)
{}
~
CADSystemOCE
(){};
virtual
~
CADSystemOCE
()
{
}
bool
LoadCAD
();
...
...
library/NekMeshUtils/CADSystem/OCE/CADVertOCE.h
View file @
9806c49d
...
...
@@ -62,7 +62,7 @@ public:
{
}
~
CADVertOCE
()
virtual
~
CADVertOCE
()
{
}
...
...
library/SolverUtils/Filters/FilterFieldConvert.cpp
View file @
9806c49d
...
...
@@ -196,7 +196,7 @@ void FilterFieldConvert::v_Initialise(
fld
->
Import
(
m_restartFile
,
fieldDef
,
fieldData
,
fieldMetaData
);
// Extract fields to output
int
nfield
,
k
;
int
nfield
=
-
1
,
k
;
for
(
int
j
=
0
;
j
<
m_variables
.
size
();
++
j
)
{
// see if m_variables is part of pFields definition and if
...
...
@@ -210,7 +210,7 @@ void FilterFieldConvert::v_Initialise(
break
;
}
}
if
(
k
==
pFields
.
num_elements
()
)
if
(
nfield
==
-
1
)
{
nfield
=
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment