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
5745e063
Commit
5745e063
authored
Nov 20, 2012
by
Dave Moxey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed compiler warnings in LoclRegions.
parent
82ba5c00
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
209 additions
and
622 deletions
+209
-622
library/LocalRegions/Expansion0D.cpp
library/LocalRegions/Expansion0D.cpp
+2
-2
library/LocalRegions/Expansion1D.cpp
library/LocalRegions/Expansion1D.cpp
+1
-6
library/LocalRegions/Expansion1D.h
library/LocalRegions/Expansion1D.h
+4
-4
library/LocalRegions/Expansion2D.cpp
library/LocalRegions/Expansion2D.cpp
+22
-61
library/LocalRegions/Expansion2D.h
library/LocalRegions/Expansion2D.h
+0
-76
library/LocalRegions/Expansion3D.cpp
library/LocalRegions/Expansion3D.cpp
+66
-69
library/LocalRegions/Expansion3D.h
library/LocalRegions/Expansion3D.h
+23
-77
library/LocalRegions/HexExp.cpp
library/LocalRegions/HexExp.cpp
+20
-74
library/LocalRegions/HexExp.h
library/LocalRegions/HexExp.h
+2
-10
library/LocalRegions/NodalTriExp.cpp
library/LocalRegions/NodalTriExp.cpp
+4
-4
library/LocalRegions/NodalTriExp.h
library/LocalRegions/NodalTriExp.h
+6
-4
library/LocalRegions/PrismExp.cpp
library/LocalRegions/PrismExp.cpp
+5
-9
library/LocalRegions/PyrExp.cpp
library/LocalRegions/PyrExp.cpp
+8
-20
library/LocalRegions/PyrExp.h
library/LocalRegions/PyrExp.h
+0
-7
library/LocalRegions/QuadExp.cpp
library/LocalRegions/QuadExp.cpp
+3
-5
library/LocalRegions/SegExp.cpp
library/LocalRegions/SegExp.cpp
+7
-7
library/LocalRegions/SegExp.h
library/LocalRegions/SegExp.h
+4
-3
library/LocalRegions/TetExp.cpp
library/LocalRegions/TetExp.cpp
+6
-10
library/LocalRegions/TriExp.cpp
library/LocalRegions/TriExp.cpp
+12
-13
library/LocalRegions/TriExp.h
library/LocalRegions/TriExp.h
+10
-11
library/StdRegions/StdExpansion.cpp
library/StdRegions/StdExpansion.cpp
+0
-48
library/StdRegions/StdExpansion.h
library/StdRegions/StdExpansion.h
+0
-38
library/StdRegions/StdHexExp.cpp
library/StdRegions/StdHexExp.cpp
+4
-15
library/StdRegions/StdHexExp.h
library/StdRegions/StdHexExp.h
+0
-4
library/StdRegions/StdPyrExp.h
library/StdRegions/StdPyrExp.h
+0
-7
library/StdRegions/StdQuadExp.cpp
library/StdRegions/StdQuadExp.cpp
+0
-7
library/StdRegions/StdQuadExp.h
library/StdRegions/StdQuadExp.h
+0
-4
library/StdRegions/StdTetExp.cpp
library/StdRegions/StdTetExp.cpp
+0
-10
library/StdRegions/StdTetExp.h
library/StdRegions/StdTetExp.h
+0
-4
library/StdRegions/StdTriExp.cpp
library/StdRegions/StdTriExp.cpp
+0
-9
library/StdRegions/StdTriExp.h
library/StdRegions/StdTriExp.h
+0
-4
No files found.
library/LocalRegions/Expansion0D.cpp
View file @
5745e063
...
...
@@ -39,8 +39,8 @@ namespace Nektar
{
namespace
LocalRegions
{
Expansion0D
::
Expansion0D
()
:
StdExpansion
0D
(),
Expansion
(),
StdExpansion
()
Expansion0D
::
Expansion0D
()
:
StdExpansion
(),
Expansion
(),
StdExpansion0D
()
{
m_elementVertexLeft
=
-
1
;
m_elementVertexRight
=
-
1
;
...
...
library/LocalRegions/Expansion1D.cpp
View file @
5745e063
...
...
@@ -42,7 +42,6 @@ namespace Nektar
DNekMatSharedPtr
Expansion1D
::
v_GenMatrix
(
const
StdRegions
::
StdMatrixKey
&
mkey
)
{
DNekMatSharedPtr
returnval
;
switch
(
mkey
.
GetMatrixType
())
...
...
@@ -141,7 +140,6 @@ namespace Nektar
{
int
j
,
k
,
dir
;
int
nbndry
=
NumDGBndryCoeffs
();
int
nquad
=
GetNumPoints
(
0
);
int
ncoeffs
=
GetNcoeffs
();
Array
<
OneD
,
NekDouble
>
lambda
(
nbndry
);
...
...
@@ -159,9 +157,6 @@ namespace Nektar
returnval
=
MemoryManager
<
DNekMat
>::
AllocateSharedPtr
(
ncoeffs
,
nbndry
);
DNekMat
&
Qmat
=
*
returnval
;
// Helmholtz matrix
DNekScalMat
&
invHmat
=
*
GetLocMatrix
(
StdRegions
::
eInvHybridDGHelmholtz
,
factors
);
// Lambda to U matrix
DNekScalMat
&
lamToU
=
*
GetLocMatrix
(
StdRegions
::
eHybridDGLamToU
,
factors
);
...
...
@@ -284,7 +279,7 @@ namespace Nektar
}
}
void
Expansion1D
::
v_
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
void
Expansion1D
::
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
const
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
NekDouble
>
&
outarray
)
{
int
i
,
n
;
...
...
library/LocalRegions/Expansion1D.h
View file @
5745e063
...
...
@@ -77,14 +77,14 @@ namespace Nektar
int
edge
,
Expansion2DSharedPtr
&
e
);
protected:
virtual
DNekMatSharedPtr
v_GenMatrix
(
const
StdRegions
::
StdMatrixKey
&
mkey
);
virtual
void
v_AddHDGHelmholtzTraceTerms
(
void
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
const
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
NekDouble
>
&
outarray
);
protected:
virtual
DNekMatSharedPtr
v_GenMatrix
(
const
StdRegions
::
StdMatrixKey
&
mkey
);
virtual
void
v_AddRobinMassMatrix
(
const
int
vert
,
const
Array
<
OneD
,
const
NekDouble
>
&
primCoeffs
,
...
...
library/LocalRegions/Expansion2D.cpp
View file @
5745e063
...
...
@@ -44,7 +44,7 @@ namespace Nektar
namespace
LocalRegions
{
Expansion2D
::
Expansion2D
()
:
StdExpansion
2D
(),
Expansion
(),
StdExpansion
()
StdExpansion
(),
Expansion
(),
StdExpansion2D
()
{
m_elementFaceLeft
=
-
1
;
m_elementFaceRight
=
-
1
;
...
...
@@ -67,7 +67,6 @@ namespace Nektar
// is enforced here by taking the minimum size and padding with
// zeros.
int
nquad_e
=
min
(
EdgeExp
->
GetNumPoints
(
0
),
int
(
normals
[
0
].
num_elements
()));
int
coordim
=
GetCoordim
();
Vmath
::
Zero
(
EdgeExp
->
GetNumPoints
(
0
),
EdgeExp
->
UpdatePhys
(),
1
);
Vmath
::
Vmul
(
nquad_e
,
normals
[
0
],
1
,
Fx
,
1
,
...
...
@@ -184,40 +183,6 @@ namespace Nektar
}
}
// void Expansion2D::v_AddEdgeNormBoundaryBiInt(const int edge,
// StdRegions::StdExpansion1DSharedPtr &EdgeExp,
// const Array<OneD, const NekDouble> &Fwd,
// const Array<OneD, const NekDouble> &Bwd,
// Array<OneD, NekDouble> &outarray)
// {
// int i;
// int order_e = EdgeExp->GetNcoeffs();
// Array<OneD,unsigned int> map;
// Array<OneD,int> sign;
// StdRegions::Orientation edgedir = GetEorient(edge);
//
// // ASSERTL1(v_GetCoordim() == 2,"Routine only set up for two-dimensions");
//
// GetEdgeToElementMap(edge,edgedir,map,sign);
//
// if(edgedir == StdRegions::eForwards)
// {
// EdgeExp->IProductWRTBase(Fwd,EdgeExp->UpdateCoeffs());
// }
//
// else if(edgedir == StdRegions::eBackwards)
// {
// EdgeExp->IProductWRTBase(Bwd,EdgeExp->UpdateCoeffs());
// }
//
// // add data to outarray if forward edge normal is outwards
// for(i = 0; i < order_e; ++i)
// {
// outarray[map[i]] += sign[i]*EdgeExp->GetCoeff(i);
// }
// }
void
Expansion2D
::
SetTraceToGeomOrientation
(
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
inout
)
{
int
i
,
cnt
=
0
;
...
...
@@ -237,7 +202,7 @@ namespace Nektar
* Computes the C matrix entries due to the presence of the identity
* matrix in Eqn. 32.
*/
void
Expansion2D
::
v_
AddNormTraceInt
(
const
int
dir
,
void
Expansion2D
::
AddNormTraceInt
(
const
int
dir
,
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,
...
...
@@ -246,7 +211,6 @@ namespace Nektar
int
i
,
e
,
cnt
;
int
order_e
,
nquad_e
;
int
nedges
=
GetNedges
();
int
coordim
=
GetCoordim
();
cnt
=
0
;
for
(
e
=
0
;
e
<
nedges
;
++
e
)
...
...
@@ -267,17 +231,17 @@ namespace Nektar
// Multiply by variable coefficient
/// @TODO: Document this
StdRegions
::
VarCoeffType
VarCoeff
[
3
]
=
{
StdRegions
::
eVarCoeffD00
,
StdRegions
::
eVarCoeffD11
,
StdRegions
::
eVarCoeffD22
};
StdRegions
::
VarCoeffMap
::
const_iterator
x
;
Array
<
OneD
,
NekDouble
>
varcoeff_work
(
nquad_e
);
//
if ((x = varcoeffs.find(VarCoeff[dir])) != varcoeffs.end())
//
{
//
GetPhysEdgeVarCoeffsFromElement(e,EdgeExp[e],x->second,varcoeff_work);
//
Vmath::Vmul(nquad_e,varcoeff_work,1,EdgeExp[e]->GetPhys(),1,EdgeExp[e]->UpdatePhys(),1);
//
}
//
StdRegions::VarCoeffType VarCoeff[3] = {StdRegions::eVarCoeffD00,
//
StdRegions::eVarCoeffD11,
//
StdRegions::eVarCoeffD22};
//
StdRegions::VarCoeffMap::const_iterator x;
//
Array<OneD, NekDouble> varcoeff_work(nquad_e);
//
if ((x = varcoeffs.find(VarCoeff[dir])) != varcoeffs.end())
//
{
//
GetPhysEdgeVarCoeffsFromElement(e,EdgeExp[e],x->second,varcoeff_work);
//
Vmath::Vmul(nquad_e,varcoeff_work,1,EdgeExp[e]->GetPhys(),1,EdgeExp[e]->UpdatePhys(),1);
//
}
Vmath
::
Vmul
(
nquad_e
,
normals
[
dir
],
1
,
EdgeExp
[
e
]
->
GetPhys
(),
1
,
...
...
@@ -287,7 +251,7 @@ namespace Nektar
}
}
void
Expansion2D
::
v_
AddNormTraceInt
(
const
int
dir
,
void
Expansion2D
::
AddNormTraceInt
(
const
int
dir
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
)
{
...
...
@@ -318,7 +282,7 @@ namespace Nektar
/**
* For a given edge add the \tilde{F}_1j contributions
*/
void
Expansion2D
::
v_
AddEdgeBoundaryInt
(
const
int
edge
,
void
Expansion2D
::
AddEdgeBoundaryInt
(
const
int
edge
,
StdRegions
::
StdExpansionSharedPtr
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,
const
StdRegions
::
VarCoeffMap
&
varcoeffs
)
...
...
@@ -357,7 +321,7 @@ namespace Nektar
// This method assumes that data in EdgeExp is orientated
// according to elemental counter clockwise format
// AddHDGHelmholtzTraceTerms with directions
void
Expansion2D
::
v_
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
void
Expansion2D
::
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
const
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
...
...
@@ -390,7 +354,7 @@ namespace Nektar
// evaluate additional terms in HDG edges. Not that this assumes that
// edges are unpacked into local cartesian order.
void
Expansion2D
::
v_
AddHDGHelmholtzEdgeTerms
(
const
NekDouble
tau
,
void
Expansion2D
::
AddHDGHelmholtzEdgeTerms
(
const
NekDouble
tau
,
const
int
edge
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
const
StdRegions
::
VarCoeffMap
&
varcoeffs
,
...
...
@@ -628,12 +592,11 @@ namespace Nektar
// U^e (P22)
case
StdRegions
::
eHybridDGLamToU
:
{
int
i
,
j
,
k
;
int
nbndry
=
NumDGBndryCoeffs
();
int
ncoeffs
=
GetNcoeffs
();
int
nedges
=
GetNedges
();
NekDouble
lambdaval
=
mkey
.
GetConstFactor
(
StdRegions
::
eFactorLambda
);
NekDouble
tau
=
mkey
.
GetConstFactor
(
StdRegions
::
eFactorTau
);
int
i
,
j
,
k
;
int
nbndry
=
NumDGBndryCoeffs
();
int
ncoeffs
=
GetNcoeffs
();
int
nedges
=
GetNedges
();
NekDouble
tau
=
mkey
.
GetConstFactor
(
StdRegions
::
eFactorTau
);
Array
<
OneD
,
NekDouble
>
lambda
(
nbndry
);
DNekVec
Lambda
(
nbndry
,
lambda
,
eWrapper
);
...
...
@@ -696,7 +659,6 @@ namespace Nektar
{
int
i
,
j
,
k
,
dir
;
int
nbndry
=
NumDGBndryCoeffs
();
int
nquad
=
GetNumPoints
(
0
);
int
ncoeffs
=
GetNcoeffs
();
int
nedges
=
GetNedges
();
...
...
@@ -974,7 +936,6 @@ namespace Nektar
StdRegions
::
eWeakDeriv2
};
int
ncoeffs
=
GetNcoeffs
();
int
nedges
=
GetNedges
();
DNekScalMat
&
InvMass
=
*
GetLocMatrix
(
StdRegions
::
eInvMass
);
DNekScalMat
&
Dmat
=
*
GetLocMatrix
(
DerivType
[
dir
]);
...
...
library/LocalRegions/Expansion2D.h
View file @
5745e063
...
...
@@ -104,39 +104,11 @@ namespace Nektar
virtual
DNekMatSharedPtr
v_GenMatrix
(
const
StdRegions
::
StdMatrixKey
&
mkey
);
// Hybridized DG routines
virtual
void
v_AddNormTraceInt
(
const
int
dir
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
);
virtual
void
v_AddNormTraceInt
(
const
int
dir
,
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,
const
StdRegions
::
VarCoeffMap
&
varcoeffs
);
virtual
void
v_AddHDGHelmholtzEdgeTerms
(
const
NekDouble
tau
,
const
int
edge
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
);
virtual
void
v_AddEdgeBoundaryInt
(
const
int
edge
,
StdRegions
::
StdExpansionSharedPtr
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,
const
StdRegions
::
VarCoeffMap
&
varcoeffs
);
virtual
void
v_DGDeriv
(
const
int
dir
,
const
Array
<
OneD
,
const
NekDouble
>&
incoeffs
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
out_d
);
virtual
void
v_AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
const
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
);
virtual
void
v_AddEdgeNormBoundaryInt
(
const
int
edge
,
StdRegions
::
StdExpansionSharedPtr
&
EdgeExp
,
...
...
@@ -149,12 +121,6 @@ namespace Nektar
StdRegions
::
StdExpansionSharedPtr
&
EdgeExp
,
const
Array
<
OneD
,
const
NekDouble
>
&
Fn
,
Array
<
OneD
,
NekDouble
>
&
outarray
);
//
// virtual void v_AddEdgeNormBoundaryBiInt(const int edge,
// StdRegions::StdExpansion1DSharedPtr &EdgeExp,
// const Array<OneD, const NekDouble> &Fwd,
// const Array<OneD, const NekDouble> &Bwd,
// Array<OneD, NekDouble> &outarray);
virtual
void
v_AddRobinMassMatrix
(
const
int
edgeid
,
const
Array
<
OneD
,
const
NekDouble
>
&
primCoeffs
,
DNekMatSharedPtr
&
inoutmat
);
...
...
@@ -199,48 +165,6 @@ namespace Nektar
m_edgeExp
[
edge
]
=
e
;
}
inline
void
Expansion2D
::
AddNormTraceInt
(
const
int
dir
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
)
{
v_AddNormTraceInt
(
dir
,
EdgeExp
,
outarray
);
}
inline
void
Expansion2D
::
AddNormTraceInt
(
const
int
dir
,
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,
const
StdRegions
::
VarCoeffMap
&
varcoeffs
)
{
v_AddNormTraceInt
(
dir
,
inarray
,
EdgeExp
,
outarray
,
varcoeffs
);
}
inline
void
Expansion2D
::
AddEdgeBoundaryInt
(
const
int
edge
,
StdRegions
::
StdExpansionSharedPtr
&
EdgeExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,
const
StdRegions
::
VarCoeffMap
&
varcoeffs
)
{
v_AddEdgeBoundaryInt
(
edge
,
EdgeExp
,
outarray
,
varcoeffs
);
}
inline
void
Expansion2D
::
AddHDGHelmholtzEdgeTerms
(
const
NekDouble
tau
,
const
int
edge
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
)
{
v_AddHDGHelmholtzEdgeTerms
(
tau
,
edge
,
EdgeExp
,
dirForcing
,
outarray
);
}
inline
void
Expansion2D
::
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
const
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
EdgeExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
)
{
v_AddHDGHelmholtzTraceTerms
(
tau
,
inarray
,
EdgeExp
,
dirForcing
,
outarray
);
}
inline
Expansion3DSharedPtr
Expansion2D
::
GetLeftAdjacentElementExp
()
const
{
ASSERTL1
(
m_elementLeft
.
lock
().
get
(),
"Left adjacent element not set."
);
...
...
library/LocalRegions/Expansion3D.cpp
View file @
5745e063
...
...
@@ -44,11 +44,11 @@ namespace Nektar
{
Expansion3D
::
Expansion3D
(){}
void
Expansion3D
::
v_
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
const
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
FaceExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
)
void
Expansion3D
::
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
const
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
FaceExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
)
{
ASSERTL0
(
&
inarray
[
0
]
!=
&
outarray
[
0
],
"Input and output arrays use the same memory"
);
...
...
@@ -77,7 +77,7 @@ namespace Nektar
// evaluate additional terms in HDG face. Note that this assumes that
// edges are unpacked into local cartesian order.
void
Expansion3D
::
v_
AddHDGHelmholtzFaceTerms
(
const
NekDouble
tau
,
void
Expansion3D
::
AddHDGHelmholtzFaceTerms
(
const
NekDouble
tau
,
const
int
face
,
StdRegions
::
StdExpansionSharedPtr
FaceExp
,
const
StdRegions
::
VarCoeffMap
&
varcoeffs
,
...
...
@@ -190,7 +190,7 @@ namespace Nektar
* Computes the C matrix entries due to the presence of the identity
* matrix in Eqn. 32.
*/
void
Expansion3D
::
v_
AddNormTraceInt
(
const
int
dir
,
void
Expansion3D
::
AddNormTraceInt
(
const
int
dir
,
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
FaceExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,
...
...
@@ -199,7 +199,6 @@ namespace Nektar
int
i
,
f
,
cnt
;
int
order_f
,
nquad_f
;
int
nfaces
=
GetNfaces
();
int
coordim
=
GetCoordim
();
cnt
=
0
;
for
(
f
=
0
;
f
<
nfaces
;
++
f
)
...
...
@@ -244,14 +243,13 @@ namespace Nektar
/**
* For a given face add the \tilde{F}_1j contributions
*/
void
Expansion3D
::
v_
AddFaceBoundaryInt
(
const
int
face
,
StdRegions
::
StdExpansionSharedPtr
&
FaceExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,
const
StdRegions
::
VarCoeffMap
&
varcoeffs
)
void
Expansion3D
::
AddFaceBoundaryInt
(
const
int
face
,
StdRegions
::
StdExpansionSharedPtr
&
FaceExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,
const
StdRegions
::
VarCoeffMap
&
varcoeffs
)
{
int
i
;
int
order_f
=
FaceExp
->
GetNcoeffs
();
int
nquad_f
=
FaceExp
->
GetNumPoints
(
0
)
*
FaceExp
->
GetNumPoints
(
1
);
Array
<
OneD
,
unsigned
int
>
map
;
Array
<
OneD
,
int
>
sign
;
Array
<
OneD
,
NekDouble
>
coeff
(
order_f
);
...
...
@@ -280,59 +278,60 @@ namespace Nektar
}
}
/**
* Aligns face orientation with the geometry orientation
*/
void
Expansion3D
::
SetFaceToGeomOrientation
(
const
int
face
,
Array
<
OneD
,
NekDouble
>
&
inout
)
{
int
j
,
k
;
StdRegions
::
Orientation
dir2
,
dir1
=
StdRegions
::
eDir1FwdDir1_Dir2FwdDir2
;
dir2
=
GetFaceOrient
(
face
);
Array
<
OneD
,
unsigned
int
>
map1
,
map2
;
Array
<
OneD
,
int
>
sign1
,
sign2
;
int
nface
=
GetFaceNcoeffs
(
face
);
Array
<
OneD
,
NekDouble
>
f_in
(
nface
);
Vmath
::
Vcopy
(
nface
,
&
inout
[
0
],
1
,
&
f_in
[
0
],
1
);
/**
* Aligns face orientation with the geometry orientation
*/
void
Expansion3D
::
SetFaceToGeomOrientation
(
const
int
face
,
Array
<
OneD
,
NekDouble
>
&
inout
)
{
int
j
,
k
;
StdRegions
::
Orientation
dir2
,
dir1
=
StdRegions
::
eDir1FwdDir1_Dir2FwdDir2
;
dir2
=
GetFaceOrient
(
face
);
Array
<
OneD
,
unsigned
int
>
map1
,
map2
;
Array
<
OneD
,
int
>
sign1
,
sign2
;
int
nface
=
GetFaceNcoeffs
(
face
);
Array
<
OneD
,
NekDouble
>
f_in
(
nface
);
Vmath
::
Vcopy
(
nface
,
&
inout
[
0
],
1
,
&
f_in
[
0
],
1
);
//retreiving face to element map for standard face orientation and for actual face orientation
GetFaceToElementMap
(
face
,
dir1
,
map1
,
sign1
);
GetFaceToElementMap
(
face
,
dir2
,
map2
,
sign2
);
//retreiving face to element map for standard face orientation and for actual face orientation
GetFaceToElementMap
(
face
,
dir1
,
map1
,
sign1
);
GetFaceToElementMap
(
face
,
dir2
,
map2
,
sign2
);
ASSERTL1
(
map1
.
num_elements
()
==
map2
.
num_elements
(),
"There is an error with the GetFaceToElementMap"
);
ASSERTL1
(
map1
.
num_elements
()
==
map2
.
num_elements
(),
"There is an error with the GetFaceToElementMap"
);
for
(
j
=
0
;
j
<
map1
.
num_elements
();
++
j
)
//index in the standard orientation
for
(
k
=
0
;
k
<
map2
.
num_elements
();
++
k
)
//index in the actual orientation
{
if
(
map1
[
j
]
==
map2
[
k
]
&&
k
!=
j
)
{
inout
[
k
]
=
f_in
[
j
];
//checking if sign is changing
if
(
sign1
[
j
]
!=
sign2
[
k
])
inout
[
k
]
*=
-
1.0
;
break
;
}
for
(
j
=
0
;
j
<
map1
.
num_elements
();
++
j
)
//index in the standard orientation
for
(
k
=
0
;
k
<
map2
.
num_elements
();
++
k
)
//index in the actual orientation
{
if
(
map1
[
j
]
==
map2
[
k
]
&&
k
!=
j
)
{
inout
[
k
]
=
f_in
[
j
];
//checking if sign is changing
if
(
sign1
[
j
]
!=
sign2
[
k
])
inout
[
k
]
*=
-
1.0
;
break
;
}
}
}
}
}
/**
* Aligns trace orientation with the geometry orientation
*/
/**
* Aligns trace orientation with the geometry orientation
*/
void
Expansion3D
::
SetTraceToGeomOrientation
(
Array
<
OneD
,
NekDouble
>
&
inout
)
{
int
i
,
cnt
=
0
;
int
nfaces
=
GetNfaces
();
Array
<
OneD
,
NekDouble
>
f_tmp
;
Array
<
OneD
,
NekDouble
>
f_tmp
;
for
(
i
=
0
;
i
<
nfaces
;
++
i
)
{
SetFaceToGeomOrientation
(
i
,
f_tmp
=
inout
+
cnt
);
{
SetFaceToGeomOrientation
(
i
,
f_tmp
=
inout
+
cnt
);
cnt
+=
GetFaceNcoeffs
(
i
);
}
}
}
/**
* Computes matrices needed for the HDG formulation. References to
* equations relate to the following paper (with a suitable changes in formulation to adapt to 3D):
...
...
@@ -343,10 +342,10 @@ namespace Nektar
*/
DNekMatSharedPtr
Expansion3D
::
v_GenMatrix
(
const
StdRegions
::
StdMatrixKey
&
mkey
)
{
//Variable coefficients are not implemented/////////
ASSERTL1
(
!
mkey
.
HasVarCoeff
(
StdRegions
::
eVarCoeffD00
),
"Matrix construction is not implemented for variable coefficients at the moment"
);
////////////////////////////////////////////////////
//Variable coefficients are not implemented/////////
ASSERTL1
(
!
mkey
.
HasVarCoeff
(
StdRegions
::
eVarCoeffD00
),
"Matrix construction is not implemented for variable coefficients at the moment"
);
////////////////////////////////////////////////////
DNekMatSharedPtr
returnval
;
switch
(
mkey
.
GetMatrixType
())
...
...
@@ -379,15 +378,15 @@ namespace Nektar
DNekMat
&
Mat
=
*
returnval
;
Vmath
::
Zero
(
ncoeffs
*
ncoeffs
,
Mat
.
GetPtr
(),
1
);
StdRegions
::
VarCoeffType
Coeffs
[
3
]
=
{
StdRegions
::
eVarCoeffD00
,
StdRegions
::
eVarCoeffD11
,
StdRegions
::
eVarCoeffD22
};
//
StdRegions::VarCoeffType Coeffs[3] = {StdRegions::eVarCoeffD00,
//
StdRegions::eVarCoeffD11,
//
StdRegions::eVarCoeffD22};
for
(
i
=
0
;
i
<
coordim
;
++
i
)
{
DNekScalMat
&
Dmat
=
*
GetLocMatrix
(
DerivType
[
i
]);
Mat
=
Mat
+
Dmat
*
invMass
*
Transpose
(
Dmat
);
DNekScalMat
&
Dmat
=
*
GetLocMatrix
(
DerivType
[
i
]);
Mat
=
Mat
+
Dmat
*
invMass
*
Transpose
(
Dmat
);
// if(mkey.HasVarCoeff(Coeffs[i]))
// {
// MatrixKey DmatkeyL(DerivType[i], DetExpansionType(), *this, StdRegions::NullConstFactorMap, mkey.GetVarCoeffAsMap(Coeffs[i]));
...
...
@@ -444,12 +443,11 @@ namespace Nektar
// U^e (P22)
case
StdRegions
::
eHybridDGLamToU
:
{
int
i
,
j
,
k
;
int
nbndry
=
NumDGBndryCoeffs
();
int
ncoeffs
=
GetNcoeffs
();
int
nfaces
=
GetNfaces
();
NekDouble
lambdaval
=
mkey
.
GetConstFactor
(
StdRegions
::
eFactorLambda
);
NekDouble
tau
=
mkey
.
GetConstFactor
(
StdRegions
::
eFactorTau
);
int
i
,
j
,
k
;
int
nbndry
=
NumDGBndryCoeffs
();
int
ncoeffs
=
GetNcoeffs
();
int
nfaces
=
GetNfaces
();
NekDouble
tau
=
mkey
.
GetConstFactor
(
StdRegions
::
eFactorTau
);
Array
<
OneD
,
NekDouble
>
lambda
(
nbndry
);
DNekVec
Lambda
(
nbndry
,
lambda
,
eWrapper
);
...
...
@@ -647,7 +645,6 @@ namespace Nektar
int
i
,
j
,
f
,
cnt
;
int
order_f
,
nquad_f
;
int
nbndry
=
NumDGBndryCoeffs
();
int
coordim
=
GetCoordim
();
int
nfaces
=
GetNfaces
();
NekDouble
tau
=
mkey
.
GetConstFactor
(
StdRegions
::
eFactorTau
);
...
...
library/LocalRegions/Expansion3D.h
View file @
5745e063
...
...
@@ -61,28 +61,32 @@ namespace Nektar
LOCAL_REGIONS_EXPORT
void
SetTraceToGeomOrientation
(
Array
<
OneD
,
NekDouble
>
&
inout
);
LOCAL_REGIONS_EXPORT
void
SetFaceToGeomOrientation
(
const
int
face
,
Array
<
OneD
,
NekDouble
>
&
inout
);
inline
void
AddHDGHelmholtzFaceTerms
(
const
NekDouble
tau
,
const
int
edge
,
StdRegions
::
StdExpansionSharedPtr
FaceExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
);
inline
void
AddHDGHelmholtzFaceTerms
(
const
NekDouble
tau
,
const
int
edge
,
StdRegions
::
StdExpansionSharedPtr
FaceExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
);
inline
void
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
const
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
FaceExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
);
inline
void
AddHDGHelmholtzTraceTerms
(
const
NekDouble
tau
,
const
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
FaceExp
,
const
StdRegions
::
VarCoeffMap
&
dirForcing
,
Array
<
OneD
,
NekDouble
>
&
outarray
);
inline
void
AddNormTraceInt
(
const
int
dir
,
Array
<
OneD
,
const
NekDouble
>
&
inarray
,
Array
<
OneD
,
StdRegions
::
StdExpansionSharedPtr
>
&
FaceExp
,
Array
<
OneD
,
NekDouble
>
&
outarray
,