Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Nektar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
84
Issues
84
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
45
Merge Requests
45
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nektar
Nektar
Commits
95cec97d
Commit
95cec97d
authored
Nov 20, 2012
by
Dave Moxey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compiler warnings in MultiRegions.
parent
5745e063
Changes
34
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
97 additions
and
158 deletions
+97
-158
CMakeLists.txt
CMakeLists.txt
+2
-1
cmake/ThirdPartyBoost.cmake
cmake/ThirdPartyBoost.cmake
+1
-1
library/LibUtilities/Communication/GsLib.hpp
library/LibUtilities/Communication/GsLib.hpp
+6
-6
library/MultiRegions/AssemblyMap/AssemblyMap.cpp
library/MultiRegions/AssemblyMap/AssemblyMap.cpp
+5
-6
library/MultiRegions/AssemblyMap/AssemblyMapCG2D.cpp
library/MultiRegions/AssemblyMap/AssemblyMapCG2D.cpp
+0
-2
library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp
library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp
+1
-1
library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
+2
-2
library/MultiRegions/ContField3DHomogeneous2D.cpp
library/MultiRegions/ContField3DHomogeneous2D.cpp
+0
-2
library/MultiRegions/DisContField1D.cpp
library/MultiRegions/DisContField1D.cpp
+0
-2
library/MultiRegions/DisContField2D.cpp
library/MultiRegions/DisContField2D.cpp
+5
-6
library/MultiRegions/DisContField3D.cpp
library/MultiRegions/DisContField3D.cpp
+3
-8
library/MultiRegions/DisContField3DHomogeneous1D.cpp
library/MultiRegions/DisContField3DHomogeneous1D.cpp
+0
-2
library/MultiRegions/DisContField3DHomogeneous2D.cpp
library/MultiRegions/DisContField3DHomogeneous2D.cpp
+0
-3
library/MultiRegions/ExpList.cpp
library/MultiRegions/ExpList.cpp
+21
-24
library/MultiRegions/ExpList1D.cpp
library/MultiRegions/ExpList1D.cpp
+0
-4
library/MultiRegions/ExpList1DHomogeneous2D.cpp
library/MultiRegions/ExpList1DHomogeneous2D.cpp
+0
-4
library/MultiRegions/ExpList2D.cpp
library/MultiRegions/ExpList2D.cpp
+1
-2
library/MultiRegions/ExpList2DHomogeneous1D.cpp
library/MultiRegions/ExpList2DHomogeneous1D.cpp
+0
-1
library/MultiRegions/ExpList3D.cpp
library/MultiRegions/ExpList3D.cpp
+0
-1
library/MultiRegions/ExpList3DHomogeneous1D.cpp
library/MultiRegions/ExpList3DHomogeneous1D.cpp
+0
-4
library/MultiRegions/ExpList3DHomogeneous2D.cpp
library/MultiRegions/ExpList3DHomogeneous2D.cpp
+0
-3
library/MultiRegions/ExpListHomogeneous1D.cpp
library/MultiRegions/ExpListHomogeneous1D.cpp
+13
-15
library/MultiRegions/ExpListHomogeneous2D.cpp
library/MultiRegions/ExpListHomogeneous2D.cpp
+22
-22
library/MultiRegions/GlobalLinSysDirectFull.cpp
library/MultiRegions/GlobalLinSysDirectFull.cpp
+0
-2
library/MultiRegions/GlobalLinSysDirectStaticCond.cpp
library/MultiRegions/GlobalLinSysDirectStaticCond.cpp
+1
-3
library/MultiRegions/GlobalLinSysIterativeFull.cpp
library/MultiRegions/GlobalLinSysIterativeFull.cpp
+0
-1
library/MultiRegions/GlobalLinSysIterativeStaticCond.cpp
library/MultiRegions/GlobalLinSysIterativeStaticCond.cpp
+1
-5
library/MultiRegions/GlobalLinSysKey.cpp
library/MultiRegions/GlobalLinSysKey.cpp
+2
-2
library/MultiRegions/GlobalMatrixKey.cpp
library/MultiRegions/GlobalMatrixKey.cpp
+6
-6
library/MultiRegions/Preconditioner.cpp
library/MultiRegions/Preconditioner.cpp
+2
-2
library/MultiRegions/PreconditionerDiagonal.cpp
library/MultiRegions/PreconditionerDiagonal.cpp
+3
-7
library/MultiRegions/SubStructuredGraph.cpp
library/MultiRegions/SubStructuredGraph.cpp
+0
-2
library/SolverUtils/DriverModifiedArnoldi.cpp
library/SolverUtils/DriverModifiedArnoldi.cpp
+0
-3
library/SolverUtils/EquationSystem.cpp
library/SolverUtils/EquationSystem.cpp
+0
-3
No files found.
CMakeLists.txt
View file @
95cec97d
...
@@ -242,7 +242,8 @@ ENDIF( )
...
@@ -242,7 +242,8 @@ ENDIF( )
# Set up include directories
# 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 )
#IF( NEKTAR_USE_PRECOMPILED_HEADERS )
# ADD_DEFINITIONS(-DNEKTAR_USE_PRECOMPILED_HEADERS)
# ADD_DEFINITIONS(-DNEKTAR_USE_PRECOMPILED_HEADERS)
...
...
cmake/ThirdPartyBoost.cmake
View file @
95cec97d
...
@@ -101,4 +101,4 @@ ELSE (THIRDPARTY_BUILD_BOOST)
...
@@ -101,4 +101,4 @@ ELSE (THIRDPARTY_BUILD_BOOST)
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
FIND_PACKAGE
(
Boost COMPONENTS thread iostreams zlib date_time filesystem system program_options regex
)
ENDIF
()
ENDIF
()
ENDIF
(
THIRDPARTY_BUILD_BOOST
)
ENDIF
(
THIRDPARTY_BUILD_BOOST
)
INCLUDE_DIRECTORIES
(
${
Boost_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
SYSTEM
${
Boost_INCLUDE_DIRS
}
)
library/LibUtilities/Communication/GsLib.hpp
View file @
95cec97d
...
@@ -138,9 +138,9 @@ namespace Gs
...
@@ -138,9 +138,9 @@ namespace Gs
* global DOF on the process.
* global DOF on the process.
* @param pComm Communication object used for inter-process
* @param pComm Communication object used for inter-process
* communication.
* communication.
* @return
s
GSLib data structure containing mapping information.
* @return GSLib data structure containing mapping information.
*/
*/
static
gs_data
*
Init
(
const
Nektar
::
Array
<
OneD
,
long
>
pId
,
static
inline
gs_data
*
Init
(
const
Nektar
::
Array
<
OneD
,
long
>
pId
,
const
LibUtilities
::
CommSharedPtr
&
pComm
)
const
LibUtilities
::
CommSharedPtr
&
pComm
)
{
{
#ifdef NEKTAR_USE_MPI
#ifdef NEKTAR_USE_MPI
...
@@ -170,8 +170,8 @@ namespace Gs
...
@@ -170,8 +170,8 @@ namespace Gs
* -distributed dot products, for which the contributions of each DOF must
* -distributed dot products, for which the contributions of each DOF must
* be included only once.
* be included only once.
*/
*/
static
void
Unique
(
const
Nektar
::
Array
<
OneD
,
long
>
pId
,
static
inline
void
Unique
(
const
Nektar
::
Array
<
OneD
,
long
>
pId
,
const
LibUtilities
::
CommSharedPtr
&
pComm
)
const
LibUtilities
::
CommSharedPtr
&
pComm
)
{
{
#ifdef NEKTAR_USE_MPI
#ifdef NEKTAR_USE_MPI
if
(
pComm
->
GetSize
()
==
1
)
if
(
pComm
->
GetSize
()
==
1
)
...
@@ -192,7 +192,7 @@ namespace Gs
...
@@ -192,7 +192,7 @@ namespace Gs
/**
/**
* @brief Deallocates the GSLib mapping data.
* @brief Deallocates the GSLib mapping data.
*/
*/
static
void
Finalise
(
gs_data
*
pGsh
)
static
inline
void
Finalise
(
gs_data
*
pGsh
)
{
{
#ifdef NEKTAR_USE_MPI
#ifdef NEKTAR_USE_MPI
if
(
pGsh
)
if
(
pGsh
)
...
@@ -208,7 +208,7 @@ namespace Gs
...
@@ -208,7 +208,7 @@ namespace Gs
*
*
* The
* The
*/
*/
static
void
Gather
(
Nektar
::
Array
<
OneD
,
NekDouble
>
pU
,
gs_op
pOp
,
static
inline
void
Gather
(
Nektar
::
Array
<
OneD
,
NekDouble
>
pU
,
gs_op
pOp
,
gs_data
*
pGsh
,
Nektar
::
Array
<
OneD
,
NekDouble
>
pBuffer
gs_data
*
pGsh
,
Nektar
::
Array
<
OneD
,
NekDouble
>
pBuffer
=
NullNekDouble1DArray
)
=
NullNekDouble1DArray
)
{
{
...
...
library/MultiRegions/AssemblyMap/AssemblyMap.cpp
View file @
95cec97d
...
@@ -78,11 +78,11 @@ namespace Nektar
...
@@ -78,11 +78,11 @@ namespace Nektar
m_session
(),
m_session
(),
m_comm
(),
m_comm
(),
m_hash
(
0
),
m_hash
(
0
),
m_solnType
(
eNoSolnType
),
m_numLocalBndCoeffs
(
0
),
m_numLocalBndCoeffs
(
0
),
m_numGlobalBndCoeffs
(
0
),
m_numGlobalBndCoeffs
(
0
),
m_numLocalDirBndCoeffs
(
0
),
m_numLocalDirBndCoeffs
(
0
),
m_numGlobalDirBndCoeffs
(
0
),
m_numGlobalDirBndCoeffs
(
0
),
m_solnType
(
eNoSolnType
),
m_bndSystemBandWidth
(
0
),
m_bndSystemBandWidth
(
0
),
m_gsh
(
0
),
m_gsh
(
0
),
m_bndGsh
(
0
)
m_bndGsh
(
0
)
...
@@ -93,13 +93,13 @@ namespace Nektar
...
@@ -93,13 +93,13 @@ namespace Nektar
m_session
(
pSession
),
m_session
(
pSession
),
m_comm
(
pSession
->
GetComm
()),
m_comm
(
pSession
->
GetComm
()),
m_hash
(
0
),
m_hash
(
0
),
m_solnType
(
pSession
->
GetSolverInfoAsEnum
<
GlobalSysSolnType
>
(
"GlobalSysSoln"
)),
m_preconType
(
pSession
->
GetSolverInfoAsEnum
<
PreconditionerType
>
(
"Preconditioner"
)),
m_numLocalBndCoeffs
(
0
),
m_numLocalBndCoeffs
(
0
),
m_numGlobalBndCoeffs
(
0
),
m_numGlobalBndCoeffs
(
0
),
m_numLocalDirBndCoeffs
(
0
),
m_numLocalDirBndCoeffs
(
0
),
m_numGlobalDirBndCoeffs
(
0
),
m_numGlobalDirBndCoeffs
(
0
),
m_solnType
(
pSession
->
GetSolverInfoAsEnum
<
GlobalSysSolnType
>
(
"GlobalSysSoln"
)),
m_bndSystemBandWidth
(
0
),
m_bndSystemBandWidth
(
0
),
m_preconType
(
pSession
->
GetSolverInfoAsEnum
<
PreconditionerType
>
(
"Preconditioner"
)),
m_gsh
(
0
),
m_gsh
(
0
),
m_bndGsh
(
0
)
m_bndGsh
(
0
)
{
{
...
@@ -116,12 +116,12 @@ namespace Nektar
...
@@ -116,12 +116,12 @@ namespace Nektar
m_session
(
oldLevelMap
->
m_session
),
m_session
(
oldLevelMap
->
m_session
),
m_comm
(
oldLevelMap
->
GetComm
()),
m_comm
(
oldLevelMap
->
GetComm
()),
m_hash
(
0
),
m_hash
(
0
),
m_solnType
(
oldLevelMap
->
m_solnType
),
m_globalToUniversalBndMap
(
oldLevelMap
->
GetGlobalToUniversalBndMap
()),
m_globalToUniversalBndMap
(
oldLevelMap
->
GetGlobalToUniversalBndMap
()),
m_globalToUniversalBndMapUnique
(
oldLevelMap
->
GetGlobalToUniversalBndMapUnique
()),
m_globalToUniversalBndMapUnique
(
oldLevelMap
->
GetGlobalToUniversalBndMapUnique
()),
m_solnType
(
oldLevelMap
->
m_solnType
),
m_preconType
(
oldLevelMap
->
m_preconType
),
m_gsh
(
oldLevelMap
->
m_gsh
),
m_gsh
(
oldLevelMap
->
m_gsh
),
m_bndGsh
(
oldLevelMap
->
m_bndGsh
),
m_bndGsh
(
oldLevelMap
->
m_bndGsh
),
m_preconType
(
oldLevelMap
->
m_preconType
),
m_lowestStaticCondLevel
(
oldLevelMap
->
m_lowestStaticCondLevel
)
m_lowestStaticCondLevel
(
oldLevelMap
->
m_lowestStaticCondLevel
)
{
{
int
i
;
int
i
;
...
@@ -132,7 +132,6 @@ namespace Nektar
...
@@ -132,7 +132,6 @@ namespace Nektar
// -- Extract information from the input argument
// -- Extract information from the input argument
int
numGlobalBndCoeffsOld
=
oldLevelMap
->
GetNumGlobalBndCoeffs
();
int
numGlobalBndCoeffsOld
=
oldLevelMap
->
GetNumGlobalBndCoeffs
();
int
numGlobalDirBndCoeffsOld
=
oldLevelMap
->
GetNumGlobalDirBndCoeffs
();
int
numGlobalDirBndCoeffsOld
=
oldLevelMap
->
GetNumGlobalDirBndCoeffs
();
int
numGlobalHomBndCoeffsOld
=
numGlobalBndCoeffsOld
-
numGlobalDirBndCoeffsOld
;
int
numLocalBndCoeffsOld
=
oldLevelMap
->
GetNumLocalBndCoeffs
();
int
numLocalBndCoeffsOld
=
oldLevelMap
->
GetNumLocalBndCoeffs
();
int
numLocalDirBndCoeffsOld
=
oldLevelMap
->
GetNumLocalDirBndCoeffs
();
int
numLocalDirBndCoeffsOld
=
oldLevelMap
->
GetNumLocalDirBndCoeffs
();
bool
signChangeOld
=
oldLevelMap
->
GetSignChange
();
bool
signChangeOld
=
oldLevelMap
->
GetSignChange
();
...
...
library/MultiRegions/AssemblyMap/AssemblyMapCG2D.cpp
View file @
95cec97d
...
@@ -818,7 +818,6 @@ namespace Nektar
...
@@ -818,7 +818,6 @@ namespace Nektar
}
}
/// - All other vertices and edges
/// - All other vertices and edges
int
nEdgeCoeffs
;
int
elmtid
;
int
elmtid
;
for
(
i
=
0
;
i
<
locExpVector
.
size
();
++
i
)
for
(
i
=
0
;
i
<
locExpVector
.
size
();
++
i
)
{
{
...
@@ -829,7 +828,6 @@ namespace Nektar
...
@@ -829,7 +828,6 @@ namespace Nektar
m_numLocalBndCoeffs
+=
locExpansion
->
NumBndryCoeffs
();
m_numLocalBndCoeffs
+=
locExpansion
->
NumBndryCoeffs
();
nTotalVerts
+=
locExpansion
->
GetNverts
();
nTotalVerts
+=
locExpansion
->
GetNverts
();
}
}
}
}
...
...
library/MultiRegions/AssemblyMap/AssemblyMapCG3D.cpp
View file @
95cec97d
...
@@ -172,7 +172,7 @@ namespace Nektar
...
@@ -172,7 +172,7 @@ namespace Nektar
const
map
<
int
,
pair
<
int
,
StdRegions
::
Orientation
>
>&
periodicFacesId
)
const
map
<
int
,
pair
<
int
,
StdRegions
::
Orientation
>
>&
periodicFacesId
)
{
{
int
i
,
j
,
k
,
l
;
int
i
,
j
,
k
,
l
;
int
cnt
=
0
,
cnt1
=
0
;
int
cnt
=
0
;
int
intDofCnt
;
int
intDofCnt
;
int
meshVertId
;
int
meshVertId
;
int
meshVertId2
;
int
meshVertId2
;
...
...
library/MultiRegions/AssemblyMap/AssemblyMapDG.cpp
View file @
95cec97d
...
@@ -1370,7 +1370,7 @@ namespace Nektar
...
@@ -1370,7 +1370,7 @@ namespace Nektar
LocalRegions
::
PointExpSharedPtr
locPointExp
=
LocalRegions
::
PointExpSharedPtr
locPointExp
=
boost
::
dynamic_pointer_cast
<
boost
::
dynamic_pointer_cast
<
LocalRegions
::
PointExp
>
(
m_elmtToTrace
[
eid
][
j
]);
LocalRegions
::
PointExp
>
(
m_elmtToTrace
[
eid
][
j
]);
id
=
locPointExp
->
GetGeom
()
->
Get
E
id
();
id
=
locPointExp
->
GetGeom
()
->
Get
V
id
();
vGlobalId
=
m_localToGlobalBndMap
[
cnt
+
j
];
vGlobalId
=
m_localToGlobalBndMap
[
cnt
+
j
];
m_globalToUniversalBndMap
[
vGlobalId
]
m_globalToUniversalBndMap
[
vGlobalId
]
=
id
*
maxDof
+
j
+
1
;
=
id
*
maxDof
+
j
+
1
;
...
@@ -1423,7 +1423,7 @@ namespace Nektar
...
@@ -1423,7 +1423,7 @@ namespace Nektar
const
ExpListSharedPtr
trace
)
const
ExpListSharedPtr
trace
)
{
{
StdRegions
::
StdExpansionSharedPtr
locExpansion
;
StdRegions
::
StdExpansionSharedPtr
locExpansion
;
int
i
,
j
,
k
;
int
i
;
int
maxQuad
=
0
,
quad
=
0
,
nDim
=
0
,
eid
=
0
,
offset
=
0
;
int
maxQuad
=
0
,
quad
=
0
,
nDim
=
0
,
eid
=
0
,
offset
=
0
;
const
StdRegions
::
StdExpansionVector
&
locExpVector
=
*
(
locExp
.
GetExp
());
const
StdRegions
::
StdExpansionVector
&
locExpVector
=
*
(
locExp
.
GetExp
());
...
...
library/MultiRegions/ContField3DHomogeneous2D.cpp
View file @
95cec97d
...
@@ -51,7 +51,6 @@ namespace Nektar
...
@@ -51,7 +51,6 @@ namespace Nektar
DisContField3DHomogeneous2D
(
In
,
false
)
DisContField3DHomogeneous2D
(
In
,
false
)
{
{
bool
False
=
false
;
ContField1DSharedPtr
zero_line
=
boost
::
dynamic_pointer_cast
<
ContField1D
>
(
In
.
m_lines
[
0
]);
ContField1DSharedPtr
zero_line
=
boost
::
dynamic_pointer_cast
<
ContField1D
>
(
In
.
m_lines
[
0
]);
for
(
int
n
=
0
;
n
<
m_lines
.
num_elements
();
++
n
)
for
(
int
n
=
0
;
n
<
m_lines
.
num_elements
();
++
n
)
...
@@ -78,7 +77,6 @@ namespace Nektar
...
@@ -78,7 +77,6 @@ namespace Nektar
DisContField3DHomogeneous2D
(
pSession
,
HomoBasis_y
,
HomoBasis_z
,
lhom_y
,
lhom_z
,
useFFT
,
dealiasing
)
DisContField3DHomogeneous2D
(
pSession
,
HomoBasis_y
,
HomoBasis_z
,
lhom_y
,
lhom_z
,
useFFT
,
dealiasing
)
{
{
int
i
,
n
,
nel
;
int
i
,
n
,
nel
;
bool
False
=
false
;
ContField1DSharedPtr
line_zero
;
ContField1DSharedPtr
line_zero
;
SpatialDomains
::
BoundaryConditions
bcs
(
pSession
,
graph1D
);
SpatialDomains
::
BoundaryConditions
bcs
(
pSession
,
graph1D
);
...
...
library/MultiRegions/DisContField1D.cpp
View file @
95cec97d
...
@@ -263,7 +263,6 @@ namespace Nektar
...
@@ -263,7 +263,6 @@ namespace Nektar
{
{
int
i
;
int
i
;
int
cnt
=
0
;
int
cnt
=
0
;
int
cnt2
=
0
;
const
SpatialDomains
::
BoundaryRegionCollection
&
bregions
const
SpatialDomains
::
BoundaryRegionCollection
&
bregions
=
bcs
.
GetBoundaryRegions
();
=
bcs
.
GetBoundaryRegions
();
...
@@ -317,7 +316,6 @@ namespace Nektar
...
@@ -317,7 +316,6 @@ namespace Nektar
{
{
int
i
;
int
i
;
int
cnt
=
0
;
int
cnt
=
0
;
int
cnt2
=
0
;
const
SpatialDomains
::
BoundaryRegionCollection
&
bregions
const
SpatialDomains
::
BoundaryRegionCollection
&
bregions
=
bcs
.
GetBoundaryRegions
();
=
bcs
.
GetBoundaryRegions
();
...
...
library/MultiRegions/DisContField2D.cpp
View file @
95cec97d
...
@@ -64,9 +64,9 @@ namespace Nektar
...
@@ -64,9 +64,9 @@ namespace Nektar
m_globalBndMat
(
In
.
m_globalBndMat
),
m_globalBndMat
(
In
.
m_globalBndMat
),
m_trace
(
In
.
m_trace
),
m_trace
(
In
.
m_trace
),
m_traceMap
(
In
.
m_traceMap
),
m_traceMap
(
In
.
m_traceMap
),
m_boundaryEdges
(
In
.
m_boundaryEdges
),
m_periodicEdges
(
In
.
m_periodicEdges
),
m_periodicEdges
(
In
.
m_periodicEdges
),
m_periodicVertices
(
In
.
m_periodicVertices
),
m_periodicVertices
(
In
.
m_periodicVertices
),
m_boundaryEdges
(
In
.
m_boundaryEdges
),
m_perEdgeToExpMap
(
In
.
m_perEdgeToExpMap
)
m_perEdgeToExpMap
(
In
.
m_perEdgeToExpMap
)
{
{
}
}
...
@@ -793,8 +793,7 @@ namespace Nektar
...
@@ -793,8 +793,7 @@ namespace Nektar
{
{
// Loop over elements and collect forward expansion
// Loop over elements and collect forward expansion
int
nexp
=
GetExpSize
();
int
nexp
=
GetExpSize
();
StdRegions
::
Orientation
edgedir
;
int
cnt
,
n
,
e
,
npts
,
phys_offset
;
int
nquad_e
,
cnt
,
n
,
e
,
npts
,
offset
,
phys_offset
;
Array
<
OneD
,
NekDouble
>
e_tmp
;
Array
<
OneD
,
NekDouble
>
e_tmp
;
map
<
int
,
int
>::
iterator
it2
;
map
<
int
,
int
>::
iterator
it2
;
boost
::
unordered_map
<
int
,
pair
<
int
,
int
>
>::
iterator
it3
;
boost
::
unordered_map
<
int
,
pair
<
int
,
int
>
>::
iterator
it3
;
...
@@ -1105,8 +1104,8 @@ namespace Nektar
...
@@ -1105,8 +1104,8 @@ namespace Nektar
Array
<
OneD
,
int
>
&
EdgeID
)
Array
<
OneD
,
int
>
&
EdgeID
)
{
{
map
<
int
,
int
>
globalIdMap
;
map
<
int
,
int
>
globalIdMap
;
int
i
,
n
,
id
;
int
i
,
n
;
int
bid
,
cnt
,
Eid
;
int
cnt
;
int
nbcs
=
0
;
int
nbcs
=
0
;
SpatialDomains
::
MeshGraph2DSharedPtr
graph2D
=
SpatialDomains
::
MeshGraph2DSharedPtr
graph2D
=
...
@@ -1540,7 +1539,7 @@ namespace Nektar
...
@@ -1540,7 +1539,7 @@ namespace Nektar
const
NekDouble
x2_in
,
const
NekDouble
x2_in
,
const
NekDouble
x3_in
)
const
NekDouble
x3_in
)
{
{
int
i
,
j
;
int
i
;
int
npoints
;
int
npoints
;
int
nbnd
=
m_bndCondExpansions
.
num_elements
();
int
nbnd
=
m_bndCondExpansions
.
num_elements
();
...
...
library/MultiRegions/DisContField3D.cpp
View file @
95cec97d
...
@@ -529,8 +529,6 @@ namespace Nektar
...
@@ -529,8 +529,6 @@ namespace Nektar
int
region1ID
;
int
region1ID
;
int
region2ID
;
int
region2ID
;
StdRegions
::
Orientation
orient1
;
StdRegions
::
Orientation
orient2
;
SpatialDomains
::
Composite
comp1
;
SpatialDomains
::
Composite
comp1
;
SpatialDomains
::
Composite
comp2
;
SpatialDomains
::
Composite
comp2
;
SpatialDomains
::
Geometry2DSharedPtr
faceGeom1
;
SpatialDomains
::
Geometry2DSharedPtr
faceGeom1
;
...
@@ -657,9 +655,6 @@ namespace Nektar
...
@@ -657,9 +655,6 @@ namespace Nektar
boost
::
lexical_cast
<
string
>
(
boost
::
lexical_cast
<
string
>
(
StdRegions
::
OrientationMap
[
forient
]));
StdRegions
::
OrientationMap
[
forient
]));
int
f1
=
(
*
element1
)[
0
]
->
m_FaceIndx
;
int
f2
=
(
*
element2
)[
0
]
->
m_FaceIndx
;
// Vertex/edge maps for fwd/bwd orientation in
// Vertex/edge maps for fwd/bwd orientation in
// a-direction.
// a-direction.
int
vmap
[
2
][
3
]
=
{{
0
,
1
,
2
},
{
1
,
0
,
2
}};
int
vmap
[
2
][
3
]
=
{{
0
,
1
,
2
},
{
1
,
0
,
2
}};
...
@@ -1064,8 +1059,8 @@ namespace Nektar
...
@@ -1064,8 +1059,8 @@ namespace Nektar
Array
<
OneD
,
int
>
&
FaceID
)
Array
<
OneD
,
int
>
&
FaceID
)
{
{
map
<
int
,
int
>
globalIdMap
;
map
<
int
,
int
>
globalIdMap
;
int
i
,
n
,
id
;
int
i
,
n
;
int
bid
,
cnt
,
Fid
;
int
cnt
;
int
nbcs
=
0
;
int
nbcs
=
0
;
SpatialDomains
::
MeshGraph3DSharedPtr
graph3D
=
SpatialDomains
::
MeshGraph3DSharedPtr
graph3D
=
...
@@ -1350,7 +1345,7 @@ namespace Nektar
...
@@ -1350,7 +1345,7 @@ namespace Nektar
const
NekDouble
x2_in
,
const
NekDouble
x2_in
,
const
NekDouble
x3_in
)
const
NekDouble
x3_in
)
{
{
int
i
,
j
;
int
i
;
int
npoints
;
int
npoints
;
int
nbnd
=
m_bndCondExpansions
.
num_elements
();
int
nbnd
=
m_bndCondExpansions
.
num_elements
();
MultiRegions
::
ExpListSharedPtr
locExpList
;
MultiRegions
::
ExpListSharedPtr
locExpList
;
...
...
library/MultiRegions/DisContField3DHomogeneous1D.cpp
View file @
95cec97d
...
@@ -368,8 +368,6 @@ namespace Nektar
...
@@ -368,8 +368,6 @@ namespace Nektar
Array
<
OneD
,
NekDouble
>
tmp_V2
;
Array
<
OneD
,
NekDouble
>
tmp_V2
;
Array
<
OneD
,
NekDouble
>
tmp_outarray
;
Array
<
OneD
,
NekDouble
>
tmp_outarray
;
bool
NegateNormals
;
int
cnt
=
0
;
int
cnt
=
0
;
int
exp_size
,
exp_size_per_plane
,
elmtID
,
boundaryID
,
Phys_offset
,
Coef_offset
;
int
exp_size
,
exp_size_per_plane
,
elmtID
,
boundaryID
,
Phys_offset
,
Coef_offset
;
...
...
library/MultiRegions/DisContField3DHomogeneous2D.cpp
View file @
95cec97d
...
@@ -70,7 +70,6 @@ namespace Nektar
...
@@ -70,7 +70,6 @@ namespace Nektar
{
{
if
(
DeclareLinesSetCoeffPhys
)
if
(
DeclareLinesSetCoeffPhys
)
{
{
bool
False
=
false
;
DisContField1DSharedPtr
zero_line
=
boost
::
dynamic_pointer_cast
<
DisContField1D
>
(
In
.
m_lines
[
0
]);
DisContField1DSharedPtr
zero_line
=
boost
::
dynamic_pointer_cast
<
DisContField1D
>
(
In
.
m_lines
[
0
]);
for
(
int
n
=
0
;
n
<
m_lines
.
num_elements
();
++
n
)
for
(
int
n
=
0
;
n
<
m_lines
.
num_elements
();
++
n
)
...
@@ -96,8 +95,6 @@ namespace Nektar
...
@@ -96,8 +95,6 @@ namespace Nektar
m_bndConditions
()
m_bndConditions
()
{
{
int
i
,
n
,
nel
;
int
i
,
n
,
nel
;
bool
True
=
true
;
bool
False
=
false
;
DisContField1DSharedPtr
line_zero
;
DisContField1DSharedPtr
line_zero
;
SpatialDomains
::
BoundaryConditions
bcs
(
pSession
,
graph1D
);
SpatialDomains
::
BoundaryConditions
bcs
(
pSession
,
graph1D
);
...
...
library/MultiRegions/ExpList.cpp
View file @
95cec97d
...
@@ -78,21 +78,21 @@ namespace Nektar
...
@@ -78,21 +78,21 @@ namespace Nektar
* MultiRegions#ExpList2D or MultiRegions#ExpList3D).
* MultiRegions#ExpList2D or MultiRegions#ExpList3D).
*/
*/
ExpList
::
ExpList
()
:
ExpList
::
ExpList
()
:
m_session
(),
m_comm
(),
m_comm
(),
m_session
(),
m_graph
(),
m_graph
(),
m_ncoeffs
(
0
),
m_ncoeffs
(
0
),
m_npoints
(
0
),
m_npoints
(
0
),
m_coeffs
(),
m_coeffs
(),
m_phys
(),
m_phys
(),
m_physState
(
false
),
m_exp
(
MemoryManager
<
StdRegions
::
StdExpansionVector
>
::
AllocateSharedPtr
()),
m_coeff_offset
(),
m_coeff_offset
(),
m_phys_offset
(),
m_phys_offset
(),
m_offset_elmt_id
(),
m_offset_elmt_id
(),
m_physState
(
false
),
m_blockMat
(
MemoryManager
<
BlockMatrixMap
>::
AllocateSharedPtr
()),
m_WaveSpace
(
false
),
m_WaveSpace
(
false
)
m_exp
(
MemoryManager
<
StdRegions
::
StdExpansionVector
>
::
AllocateSharedPtr
()),
m_blockMat
(
MemoryManager
<
BlockMatrixMap
>::
AllocateSharedPtr
())
{
{
}
}
...
@@ -104,21 +104,21 @@ namespace Nektar
...
@@ -104,21 +104,21 @@ namespace Nektar
*/
*/
ExpList
::
ExpList
(
ExpList
::
ExpList
(
const
LibUtilities
::
SessionReaderSharedPtr
&
pSession
)
:
const
LibUtilities
::
SessionReaderSharedPtr
&
pSession
)
:
m_session
(
pSession
),
m_comm
(
pSession
->
GetComm
()),
m_comm
(
pSession
->
GetComm
()),
m_session
(
pSession
),
m_graph
(),
m_graph
(),
m_ncoeffs
(
0
),
m_ncoeffs
(
0
),
m_npoints
(
0
),
m_npoints
(
0
),
m_coeffs
(),
m_coeffs
(),
m_phys
(),
m_phys
(),
m_physState
(
false
),
m_exp
(
MemoryManager
<
StdRegions
::
StdExpansionVector
>
::
AllocateSharedPtr
()),
m_coeff_offset
(),
m_coeff_offset
(),
m_phys_offset
(),
m_phys_offset
(),
m_offset_elmt_id
(),
m_offset_elmt_id
(),
m_physState
(
false
),
m_blockMat
(
MemoryManager
<
BlockMatrixMap
>::
AllocateSharedPtr
()),
m_WaveSpace
(
false
),
m_WaveSpace
(
false
)
m_exp
(
MemoryManager
<
StdRegions
::
StdExpansionVector
>
::
AllocateSharedPtr
()),
m_blockMat
(
MemoryManager
<
BlockMatrixMap
>::
AllocateSharedPtr
())
{
{
}
}
...
@@ -131,21 +131,21 @@ namespace Nektar
...
@@ -131,21 +131,21 @@ namespace Nektar
ExpList
::
ExpList
(
ExpList
::
ExpList
(
const
LibUtilities
::
SessionReaderSharedPtr
&
pSession
,
const
LibUtilities
::
SessionReaderSharedPtr
&
pSession
,
const
SpatialDomains
::
MeshGraphSharedPtr
&
pGraph
)
:
const
SpatialDomains
::
MeshGraphSharedPtr
&
pGraph
)
:
m_session
(
pSession
),
m_comm
(
pSession
->
GetComm
()),
m_comm
(
pSession
->
GetComm
()),
m_session
(
pSession
),
m_graph
(
pGraph
),
m_graph
(
pGraph
),
m_ncoeffs
(
0
),
m_ncoeffs
(
0
),
m_npoints
(
0
),
m_npoints
(
0
),
m_coeffs
(),
m_coeffs
(),
m_phys
(),
m_phys
(),
m_physState
(
false
),
m_exp
(
MemoryManager
<
StdRegions
::
StdExpansionVector
>
::
AllocateSharedPtr
()),
m_coeff_offset
(),
m_coeff_offset
(),
m_phys_offset
(),
m_phys_offset
(),
m_offset_elmt_id
(),
m_offset_elmt_id
(),
m_physState
(
false
),
m_blockMat
(
MemoryManager
<
BlockMatrixMap
>::
AllocateSharedPtr
()),
m_WaveSpace
(
false
),
m_WaveSpace
(
false
)
m_exp
(
MemoryManager
<
StdRegions
::
StdExpansionVector
>
::
AllocateSharedPtr
()),
m_blockMat
(
MemoryManager
<
BlockMatrixMap
>::
AllocateSharedPtr
())
{
{
}
}
...
@@ -155,19 +155,19 @@ namespace Nektar
...
@@ -155,19 +155,19 @@ namespace Nektar
* @param in Source expansion list.
* @param in Source expansion list.
*/
*/
ExpList
::
ExpList
(
const
ExpList
&
in
,
const
bool
DeclareCoeffPhysArrays
)
:
ExpList
::
ExpList
(
const
ExpList
&
in
,
const
bool
DeclareCoeffPhysArrays
)
:
m_session
(
in
.
m_session
),
m_comm
(
in
.
m_comm
),
m_comm
(
in
.
m_comm
),
m_session
(
in
.
m_session
),
m_graph
(
in
.
m_graph
),
m_graph
(
in
.
m_graph
),
m_ncoeffs
(
in
.
m_ncoeffs
),
m_ncoeffs
(
in
.
m_ncoeffs
),
m_npoints
(
in
.
m_npoints
),
m_npoints
(
in
.
m_npoints
),
m_physState
(
false
),
m_physState
(
false
),
m_WaveSpace
(
false
),
m_exp
(
in
.
m_exp
),
m_exp
(
in
.
m_exp
),
m_coeff_offset
(
in
.
m_coeff_offset
),
m_coeff_offset
(
in
.
m_coeff_offset
),
m_phys_offset
(
in
.
m_phys_offset
),
m_phys_offset