Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Backofen, Rainer
amdis
Commits
2e10969e
Commit
2e10969e
authored
Feb 15, 2013
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MS Windows compatibility and Warnings removed
parent
3484b9be
Changes
39
Hide whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
152 additions
and
138 deletions
+152
-138
AMDiS/src/AdaptInfo.h
AMDiS/src/AdaptInfo.h
+3
-3
AMDiS/src/AdaptInstationary.h
AMDiS/src/AdaptInstationary.h
+1
-1
AMDiS/src/BasisFunction.h
AMDiS/src/BasisFunction.h
+3
-3
AMDiS/src/DOFAdmin.h
AMDiS/src/DOFAdmin.h
+7
-7
AMDiS/src/DOFVector.h
AMDiS/src/DOFVector.h
+29
-29
AMDiS/src/DOFVector.hh
AMDiS/src/DOFVector.hh
+1
-1
AMDiS/src/ElInfo.h
AMDiS/src/ElInfo.h
+1
-1
AMDiS/src/ElInfo1d.cc
AMDiS/src/ElInfo1d.cc
+1
-1
AMDiS/src/ElInfo1d.h
AMDiS/src/ElInfo1d.h
+1
-1
AMDiS/src/ElInfo2d.cc
AMDiS/src/ElInfo2d.cc
+1
-1
AMDiS/src/ElInfo2d.h
AMDiS/src/ElInfo2d.h
+1
-1
AMDiS/src/ElInfo3d.cc
AMDiS/src/ElInfo3d.cc
+1
-1
AMDiS/src/ElInfo3d.h
AMDiS/src/ElInfo3d.h
+1
-1
AMDiS/src/Element.h
AMDiS/src/Element.h
+2
-2
AMDiS/src/ElementData.h
AMDiS/src/ElementData.h
+1
-1
AMDiS/src/ElementRegion_ED.h
AMDiS/src/ElementRegion_ED.h
+1
-1
AMDiS/src/Flag.h
AMDiS/src/Flag.h
+1
-1
AMDiS/src/Global.cc
AMDiS/src/Global.cc
+4
-0
AMDiS/src/Global.h
AMDiS/src/Global.h
+10
-0
AMDiS/src/Initfile.cc
AMDiS/src/Initfile.cc
+1
-1
AMDiS/src/LeafData.h
AMDiS/src/LeafData.h
+5
-5
AMDiS/src/Mesh.h
AMDiS/src/Mesh.h
+11
-11
AMDiS/src/MeshStructure_ED.h
AMDiS/src/MeshStructure_ED.h
+1
-1
AMDiS/src/QPsiPhi.cc
AMDiS/src/QPsiPhi.cc
+7
-7
AMDiS/src/QPsiPhi.h
AMDiS/src/QPsiPhi.h
+28
-28
AMDiS/src/Quadrature.cc
AMDiS/src/Quadrature.cc
+1
-1
AMDiS/src/Quadrature.h
AMDiS/src/Quadrature.h
+3
-3
AMDiS/src/RCNeighbourList.h
AMDiS/src/RCNeighbourList.h
+1
-1
AMDiS/src/ScalableQuadrature.h
AMDiS/src/ScalableQuadrature.h
+1
-1
AMDiS/src/SubElInfo.h
AMDiS/src/SubElInfo.h
+2
-2
AMDiS/src/SurfaceRegion_ED.h
AMDiS/src/SurfaceRegion_ED.h
+1
-1
AMDiS/src/compositeFEM/ElementLevelSet.h
AMDiS/src/compositeFEM/ElementLevelSet.h
+2
-2
AMDiS/src/io/ArhReader.cc
AMDiS/src/io/ArhReader.cc
+1
-1
AMDiS/src/io/ElementFileWriter.cc
AMDiS/src/io/ElementFileWriter.cc
+1
-1
AMDiS/src/io/MacroInfo.cc
AMDiS/src/io/MacroInfo.cc
+11
-11
AMDiS/src/reinit/ElementLevelSet.h
AMDiS/src/reinit/ElementLevelSet.h
+1
-1
AMDiS/src/reinit/ElementUpdate_3d.cc
AMDiS/src/reinit/ElementUpdate_3d.cc
+1
-1
AMDiS/src/reinit/ElementUpdate_3d.h
AMDiS/src/reinit/ElementUpdate_3d.h
+1
-1
AMDiS/src/time/RosenbrockAdaptInstationary.cc
AMDiS/src/time/RosenbrockAdaptInstationary.cc
+2
-2
No files found.
AMDiS/src/AdaptInfo.h
View file @
2e10969e
...
...
@@ -617,13 +617,13 @@ namespace AMDiS {
}
/// Returns \ref refineBisections
inline
const
int
getRefineBisections
(
int
index
)
const
inline
int
getRefineBisections
(
int
index
)
const
{
return
scalContents
[
index
]
->
refineBisections
;
}
/// Returns \ref coarseBisections
inline
const
int
getCoarseBisections
(
int
index
)
const
inline
int
getCoarseBisections
(
int
index
)
const
{
return
scalContents
[
index
]
->
coarseBisections
;
}
...
...
@@ -679,7 +679,7 @@ namespace AMDiS {
}
/// Returns true, if the adaptive procedure was deserialized from a file.
const
bool
isDeserialized
()
const
bool
isDeserialized
()
const
{
return
deserialized
;
}
...
...
AMDiS/src/AdaptInstationary.h
View file @
2e10969e
...
...
@@ -83,7 +83,7 @@ namespace AMDiS {
}
/// Returns \ref strategy
const
int
getStrategy
()
const
int
getStrategy
()
const
{
return
strategy
;
}
...
...
AMDiS/src/BasisFunction.h
View file @
2e10969e
...
...
@@ -125,19 +125,19 @@ namespace AMDiS {
virtual
void
getBound
(
const
ElInfo
*
,
BoundaryType
*
)
const
{}
/// Returns \ref degree of BasisFunction
inline
const
int
getDegree
()
const
inline
int
getDegree
()
const
{
return
degree
;
}
/// Returns \ref dim of BasisFunction
inline
const
int
getDim
()
const
inline
int
getDim
()
const
{
return
dim
;
}
/// Returns \ref nBasFcts which is the number of local basis functions
inline
const
int
getNumber
()
const
inline
int
getNumber
()
const
{
return
nBasFcts
;
}
...
...
AMDiS/src/DOFAdmin.h
View file @
2e10969e
...
...
@@ -121,25 +121,25 @@ namespace AMDiS {
*/
/// Returns \ref sizeUsed.
inline
const
int
getUsedSize
()
const
inline
int
getUsedSize
()
const
{
return
sizeUsed
;
}
/// Returns \ref size
inline
const
int
getSize
()
const
inline
int
getSize
()
const
{
return
size
;
}
/// Returns \ref usedCount
inline
const
int
getUsedDofs
()
const
inline
int
getUsedDofs
()
const
{
return
usedCount
;
}
/// Returns \ref holeCount
inline
const
int
getHoleCount
()
const
inline
int
getHoleCount
()
const
{
return
holeCount
;
}
...
...
@@ -151,7 +151,7 @@ namespace AMDiS {
}
/// Returns \ref nDof[i], i.e., the number of DOFs for the position i.
inline
const
int
getNumberOfDofs
(
int
i
)
const
inline
int
getNumberOfDofs
(
int
i
)
const
{
return
nDof
[
i
];
}
...
...
@@ -163,7 +163,7 @@ namespace AMDiS {
}
/// Returns \ref nPreDof[i]
inline
const
int
getNumberOfPreDofs
(
int
i
)
const
inline
int
getNumberOfPreDofs
(
int
i
)
const
{
return
nPreDof
[
i
];
}
...
...
@@ -187,7 +187,7 @@ namespace AMDiS {
}
/// Returns if the given DOF is free.
inline
const
bool
isDofFree
(
int
i
)
const
inline
bool
isDofFree
(
int
i
)
const
{
return
dofFree
[
i
];
}
...
...
AMDiS/src/DOFVector.h
View file @
2e10969e
...
...
@@ -154,33 +154,33 @@ namespace AMDiS {
operatorEstFactor
.
push_back
(
estFactor
);
}
inline
vector
<
double
*>::
iterator
getOperatorFactorBegin
()
inline
std
::
vector
<
double
*>::
iterator
getOperatorFactorBegin
()
{
return
operatorFactor
.
begin
();
}
inline
vector
<
double
*>::
iterator
getOperatorFactorEnd
()
inline
std
::
vector
<
double
*>::
iterator
getOperatorFactorEnd
()
{
return
operatorFactor
.
end
();
}
inline
vector
<
double
*>::
iterator
getOperatorEstFactorBegin
()
inline
std
::
vector
<
double
*>::
iterator
getOperatorEstFactorBegin
()
{
return
operatorEstFactor
.
begin
();
}
inline
vector
<
double
*>::
iterator
getOperatorEstFactorEnd
()
inline
std
::
vector
<
double
*>::
iterator
getOperatorEstFactorEnd
()
{
return
operatorEstFactor
.
end
();
}
inline
vector
<
Operator
*>::
iterator
getOperatorsBegin
()
inline
std
::
vector
<
Operator
*>::
iterator
getOperatorsBegin
()
{
return
operators
.
begin
();
}
inline
vector
<
Operator
*>::
iterator
getOperatorsEnd
()
inline
std
::
vector
<
Operator
*>::
iterator
getOperatorsEnd
()
{
return
operators
.
end
();
}
...
...
@@ -193,17 +193,17 @@ namespace AMDiS {
/// and \f$ m \f$ is the number of basis functions
T
evalUh
(
const
DimVec
<
double
>&
lambda
,
DegreeOfFreedom
*
ind
);
inline
vector
<
Operator
*>&
getOperators
()
inline
std
::
vector
<
Operator
*>&
getOperators
()
{
return
operators
;
}
inline
vector
<
double
*>&
getOperatorFactor
()
inline
std
::
vector
<
double
*>&
getOperatorFactor
()
{
return
operatorFactor
;
}
inline
vector
<
double
*>&
getOperatorEstFactor
()
inline
std
::
vector
<
double
*>&
getOperatorEstFactor
()
{
return
operatorEstFactor
;
}
...
...
@@ -251,13 +251,13 @@ namespace AMDiS {
ElementVector
elementVector
;
///
vector
<
Operator
*>
operators
;
std
::
vector
<
Operator
*>
operators
;
///
vector
<
double
*>
operatorFactor
;
std
::
vector
<
double
*>
operatorFactor
;
///
vector
<
double
*>
operatorEstFactor
;
std
::
vector
<
double
*>
operatorEstFactor
;
///
BoundaryManager
*
boundaryManager
;
...
...
@@ -345,7 +345,7 @@ namespace AMDiS {
void
init
(
const
FiniteElemSpace
*
f
,
string
n
);
/// Copy Constructor
DOFVector
(
const
DOFVector
&
rhs
)
DOFVector
(
const
DOFVector
&
rhs
)
:
DOFVectorBase
<
T
>
()
{
*
this
=
rhs
;
this
->
name
=
rhs
.
name
+
"copy"
;
...
...
@@ -357,25 +357,25 @@ namespace AMDiS {
virtual
~
DOFVector
();
/// Returns iterator to the begin of \ref vec
typename
vector
<
T
>::
iterator
begin
()
typename
std
::
vector
<
T
>::
iterator
begin
()
{
return
vec
.
begin
();
}
/// Returns iterator to the end of \ref vec
typename
vector
<
T
>::
iterator
end
()
typename
std
::
vector
<
T
>::
iterator
end
()
{
return
vec
.
end
();
}
/// Returns const_iterator to the begin of \ref vec
typename
vector
<
T
>::
const_iterator
begin
()
const
typename
std
::
vector
<
T
>::
const_iterator
begin
()
const
{
return
vec
.
begin
();
}
/// Returns const_iterator to the end of \ref vec
typename
vector
<
T
>::
const_iterator
end
()
const
typename
std
::
vector
<
T
>::
const_iterator
end
()
const
{
return
vec
.
end
();
}
...
...
@@ -383,7 +383,7 @@ namespace AMDiS {
/// Used by DOFAdmin to compress this DOFVector. Implementation of
/// \ref DOFIndexedBase::compress()
virtual
void
compressDOFIndexed
(
int
first
,
int
last
,
vector
<
DegreeOfFreedom
>
&
newDof
);
std
::
vector
<
DegreeOfFreedom
>
&
newDof
);
/// Sets \ref coarsenOperation to op
inline
void
setCoarsenOperation
(
CoarsenOperation
op
)
...
...
@@ -404,7 +404,7 @@ namespace AMDiS {
inline
void
refineInterpol
(
RCNeighbourList
&
,
int
)
{}
/// Returns \ref vec
vector
<
T
>&
getVector
()
std
::
vector
<
T
>&
getVector
()
{
return
vec
;
}
...
...
@@ -597,7 +597,7 @@ namespace AMDiS {
/// Determine the DegreeOfFreedom that has coords with minimal euclidean
/// distance to WorldVector p. return true if DOF is found, and false
/// otherwise.
const
bool
getDofIdxAtPoint
(
WorldVector
<
double
>
&
p
,
bool
getDofIdxAtPoint
(
WorldVector
<
double
>
&
p
,
DegreeOfFreedom
&
idx
,
ElInfo
*
oldElInfo
=
NULL
,
bool
useOldElInfo
=
false
)
const
;
...
...
@@ -630,7 +630,7 @@ namespace AMDiS {
protected:
/// Data container
vector
<
T
>
vec
;
std
::
vector
<
T
>
vec
;
/// Specifies what operation should be performed after coarsening
CoarsenOperation
coarsenOperation
;
...
...
@@ -846,7 +846,7 @@ namespace AMDiS {
}
template
<
typename
T
>
inline
void
checkFeSpace
(
const
FiniteElemSpace
*
feSpace
,
const
vector
<
T
>&
vec
)
inline
void
checkFeSpace
(
const
FiniteElemSpace
*
feSpace
,
const
std
::
vector
<
T
>&
vec
)
{
TEST_EXIT_DBG
(
feSpace
)(
"feSpace is NULL
\n
"
);
TEST_EXIT_DBG
(
feSpace
->
getAdmin
())(
"admin is NULL
\n
"
);
...
...
@@ -859,8 +859,8 @@ namespace AMDiS {
WorldVector
<
DOFVector
<
double
>*>
*
result
);
template
<
typename
T
>
vector
<
DOFVector
<
double
>*>
*
transform
(
DOFVector
<
typename
GradientType
<
T
>::
type
>
*
vec
,
vector
<
DOFVector
<
double
>*>
*
res
);
std
::
vector
<
DOFVector
<
double
>*>
*
transform
(
DOFVector
<
typename
GradientType
<
T
>::
type
>
*
vec
,
std
::
vector
<
DOFVector
<
double
>*>
*
res
);
/// Computes the integral: \f$ \int f(\vec{x})\,\text{d}\vec{x}\f$
...
...
@@ -931,14 +931,14 @@ namespace AMDiS {
BinaryAbstractFunction
<
TOut
,
T
,
WorldVector
<
double
>
>
*
fct
);
/// Computes the integral: \f$ \int f(\{v_i(\vec{x})\}_i)\,\text{d}\vec{x}\f$
double
integrateGeneral
(
const
vector
<
DOFVector
<
double
>*>
&
vecs
,
AbstractFunction
<
double
,
vector
<
double
>
>
*
fct
);
double
integrateGeneral
(
const
std
::
vector
<
DOFVector
<
double
>*>
&
vecs
,
AbstractFunction
<
double
,
std
::
vector
<
double
>
>
*
fct
);
/// Computes the integral:
/// \f$ \int f(\{v_i(\vec{x})\}_i,\{\nabla w_i(\vec{x})\}_i)\,\text{d}\vec{x}\f$
double
integrateGeneralGradient
(
const
vector
<
DOFVector
<
double
>*>
&
vecs
,
const
vector
<
DOFVector
<
double
>*>
&
grds
,
BinaryAbstractFunction
<
double
,
vector
<
double
>
,
vector
<
WorldVector
<
double
>
>
>
*
fct
);
double
integrateGeneralGradient
(
const
std
::
vector
<
DOFVector
<
double
>*>
&
vecs
,
const
std
::
vector
<
DOFVector
<
double
>*>
&
grds
,
BinaryAbstractFunction
<
double
,
std
::
vector
<
double
>
,
std
::
vector
<
WorldVector
<
double
>
>
>
*
fct
);
}
...
...
AMDiS/src/DOFVector.hh
View file @
2e10969e
...
...
@@ -947,7 +947,7 @@ namespace AMDiS {
template
<
typename
T
>
const
bool
DOFVector
<
T
>::
getDofIdxAtPoint
(
WorldVector
<
double
>
&
p
,
bool
DOFVector
<
T
>::
getDofIdxAtPoint
(
WorldVector
<
double
>
&
p
,
DegreeOfFreedom
&
idx
,
ElInfo
*
oldElInfo
,
bool
useOldElInfo
)
const
...
...
AMDiS/src/ElInfo.h
View file @
2e10969e
...
...
@@ -385,7 +385,7 @@ namespace AMDiS {
/// with respect to \ref element of a point with world coordinates world.
/// The barycentric coordinates are stored in lambda.
/// pure virtual => must be overriden in sub-class.
virtual
const
int
worldToCoord
(
const
WorldVector
<
double
>&
world
,
virtual
int
worldToCoord
(
const
WorldVector
<
double
>&
world
,
DimVec
<
double
>*
lambda
)
const
=
0
;
/// Fills this ElInfo with macro element information of mel.
...
...
AMDiS/src/ElInfo1d.cc
View file @
2e10969e
...
...
@@ -143,7 +143,7 @@ namespace AMDiS {
return
sqrt
(
adet2
);
}
const
int
ElInfo1d
::
worldToCoord
(
const
WorldVector
<
double
>&
x
,
int
ElInfo1d
::
worldToCoord
(
const
WorldVector
<
double
>&
x
,
DimVec
<
double
>*
lambda
)
const
{
FUNCNAME
(
"ElInfo1d::worldToCoord()"
);
...
...
AMDiS/src/ElInfo1d.h
View file @
2e10969e
...
...
@@ -47,7 +47,7 @@ namespace AMDiS {
void
fillMacroInfo
(
const
MacroElement
*
);
/// 1-dimensional realisation of ElInfo's worldToCoord method.
const
int
worldToCoord
(
const
WorldVector
<
double
>&
w
,
DimVec
<
double
>*
l
)
const
;
int
worldToCoord
(
const
WorldVector
<
double
>&
w
,
DimVec
<
double
>*
l
)
const
;
/// 1-dimensional realisation of ElInfo's calcGrdLambda method.
double
calcGrdLambda
(
DimVec
<
WorldVector
<
double
>
>&
grd_lam
);
...
...
AMDiS/src/ElInfo2d.cc
View file @
2e10969e
...
...
@@ -661,7 +661,7 @@ namespace AMDiS {
}
const
int
ElInfo2d
::
worldToCoord
(
const
WorldVector
<
double
>&
xy
,
int
ElInfo2d
::
worldToCoord
(
const
WorldVector
<
double
>&
xy
,
DimVec
<
double
>*
lambda
)
const
{
FUNCNAME
(
"ElInfo::worldToCoord()"
);
...
...
AMDiS/src/ElInfo2d.h
View file @
2e10969e
...
...
@@ -48,7 +48,7 @@ namespace AMDiS {
void
fillMacroInfo
(
const
MacroElement
*
);
/// 2-dimensional realisation of ElInfo's worldToCoord method.
const
int
worldToCoord
(
const
WorldVector
<
double
>&
w
,
DimVec
<
double
>*
l
)
const
;
int
worldToCoord
(
const
WorldVector
<
double
>&
w
,
DimVec
<
double
>*
l
)
const
;
/// 2-dimensional realisation of ElInfo's calcGrdLambda method.
double
calcGrdLambda
(
DimVec
<
WorldVector
<
double
>
>&
grd_lam
);
...
...
AMDiS/src/ElInfo3d.cc
View file @
2e10969e
...
...
@@ -318,7 +318,7 @@ namespace AMDiS {
}
const
int
ElInfo3d
::
worldToCoord
(
const
WorldVector
<
double
>&
xy
,
int
ElInfo3d
::
worldToCoord
(
const
WorldVector
<
double
>&
xy
,
DimVec
<
double
>*
lambda
)
const
{
FUNCNAME
(
"ElInfo::worldToCoord()"
);
...
...
AMDiS/src/ElInfo3d.h
View file @
2e10969e
...
...
@@ -60,7 +60,7 @@ namespace AMDiS {
void
fillMacroInfo
(
const
MacroElement
*
);
/// 3-dimensional realisation of ElInfo's worldToCoord method.
const
int
worldToCoord
(
const
WorldVector
<
double
>&
w
,
DimVec
<
double
>*
l
)
const
;
int
worldToCoord
(
const
WorldVector
<
double
>&
w
,
DimVec
<
double
>*
l
)
const
;
/// 3-dimensional realisation of ElInfo's calcGrdLambda method.
double
calcGrdLambda
(
DimVec
<
WorldVector
<
double
>
>&
grd_lam
);
...
...
AMDiS/src/Element.h
View file @
2e10969e
...
...
@@ -111,7 +111,7 @@ namespace AMDiS {
/// Returns true if Element is a leaf element (\ref child[0] == NULL), returns
/// false otherwise.
inline
const
bool
isLeaf
()
const
inline
bool
isLeaf
()
const
{
return
(
child
[
0
]
==
NULL
);
}
...
...
@@ -204,7 +204,7 @@ namespace AMDiS {
virtual
int
getGeo
(
GeoIndex
i
)
const
=
0
;
/// Returns Element's \ref mark
inline
const
int
getMark
()
const
inline
int
getMark
()
const
{
return
mark
;
}
...
...
AMDiS/src/ElementData.h
View file @
2e10969e
...
...
@@ -86,7 +86,7 @@ namespace AMDiS {
}
/// Returns the id of element data type.
virtual
const
int
getTypeID
()
const
virtual
int
getTypeID
()
const
{
return
0
;
}
...
...
AMDiS/src/ElementRegion_ED.h
View file @
2e10969e
...
...
@@ -64,7 +64,7 @@ namespace AMDiS {
return
"ElementRegion_ED"
;
}
inline
const
int
getTypeID
()
const
inline
int
getTypeID
()
const
{
return
ELEMENT_REGION
;
}
...
...
AMDiS/src/Flag.h
View file @
2e10969e
...
...
@@ -110,7 +110,7 @@ namespace AMDiS {
flags
&=
~
f
.
flags
;
}
inline
const
unsigned
long
getFlags
()
const
inline
unsigned
long
getFlags
()
const
{
return
flags
;
}
...
...
AMDiS/src/Global.cc
View file @
2e10969e
...
...
@@ -349,6 +349,7 @@ namespace AMDiS {
void
processMemUsage
(
double
&
vm_usage
,
double
&
resident_set
,
bool
inMegaByte
)
{
#ifndef _WIN32
using
std
::
ios_base
;
using
std
::
ifstream
;
using
std
::
string
;
...
...
@@ -383,6 +384,9 @@ namespace AMDiS {
vm_usage
/=
1024.0
;
resident_set
/=
1024.0
;
}
#else
ERROR
(
"Function not available under MS Windows
\n
"
);
#endif
}
...
...
AMDiS/src/Global.h
View file @
2e10969e
...
...
@@ -52,6 +52,12 @@
#include <float.h>
#include <time.h>
#ifdef _WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
#if HAVE_PARALLEL_DOMAIN_AMDIS
#include <mpi.h>
#endif
...
...
@@ -133,7 +139,11 @@ namespace AMDiS {
/// check for file existence
inline
bool
file_exists
(
const
std
::
string
filename
)
{
#ifdef _WIN32
return
_access
(
filename
.
c_str
(),
0
)
==
0
;
#else
return
access
(
filename
.
c_str
(),
F_OK
)
==
0
;
#endif
};
/// trim std::string
...
...
AMDiS/src/Initfile.cc
View file @
2e10969e
...
...
@@ -65,7 +65,7 @@ namespace AMDiS {
/// Fill an initfile from an input stream
void
Initfile
::
read
(
istream
&
in
)
{
unsigned
line_length
=
512
;
const
unsigned
line_length
=
512
;
char
swap
[
line_length
];
in
.
getline
(
swap
,
line_length
);
while
(
in
.
good
()
||
in
.
gcount
()
>
0
)
{
...
...
AMDiS/src/LeafData.h
View file @
2e10969e
...
...
@@ -112,7 +112,7 @@ namespace AMDiS {
return
"LeafDataEstimatable"
;
}
inline
const
int
getTypeID
()
const
inline
int
getTypeID
()
const
{
return
ESTIMATABLE
;
}
...
...
@@ -198,7 +198,7 @@ namespace AMDiS {
return
"LeafDataEstimatableVec"
;
}
inline
const
int
getTypeID
()
const
inline
int
getTypeID
()
const
{
return
ESTIMATABLE
;
}
...
...
@@ -294,7 +294,7 @@ namespace AMDiS {
return
"LeafDataCoarsenable"
;
}
inline
const
int
getTypeID
()
const
inline
int
getTypeID
()
const
{
return
COARSENABLE
;
}
...
...
@@ -379,7 +379,7 @@ namespace AMDiS {
return
"LeafDataCoarsenableVec"
;
}
inline
const
int
getTypeID
()
const
inline
int
getTypeID
()
const
{
return
COARSENABLE
;
}
...
...
@@ -484,7 +484,7 @@ namespace AMDiS {
return
"LeafDataPeriodic"
;
}
inline
const
int
getTypeID
()
const
inline
int
getTypeID
()
const
{
return
PERIODIC
;
}
...
...
AMDiS/src/Mesh.h
View file @
2e10969e
...
...
@@ -96,49 +96,49 @@ namespace AMDiS {
}
/// Returns \ref nDofEl of the mesh
inline
const
int
getNumberOfAllDofs
()
const
inline
int
getNumberOfAllDofs
()
const
{
return
nDofEl
;
}
/// Returns \ref nNodeEl of the mesh
inline
const
int
getNumberOfNodes
()
const
inline
int
getNumberOfNodes
()
const
{
return
nNodeEl
;
}
/// Returns \ref nVertices of the mesh
inline
const
int
getNumberOfVertices
()
const
inline
int
getNumberOfVertices
()
const
{
return
nVertices
;
}
/// Returns \ref nEdges of the mesh
inline
const
int
getNumberOfEdges
()
const
inline
int
getNumberOfEdges
()
const
{
return
nEdges
;
}
/// Returns \ref nFaces of the mesh
inline
const
int
getNumberOfFaces
()
const
inline
int
getNumberOfFaces
()
const
{
return
nFaces
;
}
/// Returns \ref nLeaves of the mesh
inline
const
int
getNumberOfLeaves
()
const
inline
int
getNumberOfLeaves
()
const
{
return
nLeaves
;
}
/// Returns \ref nElements of the mesh
inline
const
int
getNumberOfElements
()
const
inline
int
getNumberOfElements
()
const
{
return
nElements
;
}
/// Returns \ref maxEdgeNeigh of the mesh
inline
const
int
getMaxEdgeNeigh
()
const
inline
int
getMaxEdgeNeigh
()
const
{
return
maxEdgeNeigh
;
}
...
...
@@ -156,7 +156,7 @@ namespace AMDiS {
}
/// Returns nDof[i] of the mesh
inline
const
int
getNumberOfDofs
(
int
i
)
const
inline
int
getNumberOfDofs
(
int
i
)
const
{
TEST_EXIT_DBG
(
i
<=
dim
)(
"Wrong index: %d %d
\n
"
,
i
,
dim
);
return
nDof
[
i
];
...
...
@@ -199,14 +199,14 @@ namespace AMDiS {
/// Returns the size of \ref admin which is the number of the DOFAdmins
/// belonging to this mesh
const
int
getNumberOfDOFAdmin
()
const
int
getNumberOfDOFAdmin
()
const
{
return
admin
.
size
();
}
/// Returns the size of \ref macroElements which is the number of
/// of macro elements of this mesh
const
int
getNumberOfMacros
()
const
int
getNumberOfMacros
()
const
{
return
macroElements
.
size
();
}
...
...
AMDiS/src/MeshStructure_ED.h
View file @
2e10969e
...
...
@@ -84,7 +84,7 @@ namespace AMDiS {
return
true
;
}
virtual
const
int
getTypeID
()
const
virtual
int
getTypeID
()
const
{
return
MESH_STRUCTURE
;