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
amdis
amdis-core
Commits
f47c56f1
Commit
f47c56f1
authored
Oct 14, 2020
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use standard attributes instead of dune macros
parent
4d4855f0
Pipeline
#5091
passed with stage
in 75 minutes and 52 seconds
Changes
13
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
30 additions
and
51 deletions
+30
-51
amdis/AMDiS.hpp
amdis/AMDiS.hpp
+2
-2
amdis/functions/Nodes.hpp
amdis/functions/Nodes.hpp
+2
-4
amdis/linearalgebra/Communication.hpp
amdis/linearalgebra/Communication.hpp
+1
-2
amdis/linearalgebra/eigen/IterativeRunner.hpp
amdis/linearalgebra/eigen/IterativeRunner.hpp
+1
-3
amdis/linearalgebra/eigen/SolverConfig.hpp
amdis/linearalgebra/eigen/SolverConfig.hpp
+1
-1
amdis/linearalgebra/istl/AMGPrecon.hpp
amdis/linearalgebra/istl/AMGPrecon.hpp
+4
-8
amdis/linearalgebra/istl/PreconCreator.hpp
amdis/linearalgebra/istl/PreconCreator.hpp
+3
-7
amdis/linearalgebra/mtl/HyprePrecon.hpp
amdis/linearalgebra/mtl/HyprePrecon.hpp
+2
-2
amdis/linearalgebra/petsc/PetscRunner.hpp
amdis/linearalgebra/petsc/PetscRunner.hpp
+1
-2
amdis/utility/UniqueBorderPartition.hpp
amdis/utility/UniqueBorderPartition.hpp
+3
-7
test/ExpressionsTest.cpp
test/ExpressionsTest.cpp
+6
-6
test/GlobalIdSetTest.cpp
test/GlobalIdSetTest.cpp
+1
-1
test/NodeIndicesTest.cpp
test/NodeIndicesTest.cpp
+3
-6
No files found.
amdis/AMDiS.hpp
View file @
f47c56f1
...
...
@@ -24,7 +24,7 @@ namespace AMDiS
* }
*
**/
inline
void
DUNE_DEPRECATED
init
(
int
&
argc
,
char
**&
argv
,
std
::
string
const
&
initFileName
=
""
)
inline
void
[[
deprecated
]]
init
(
int
&
argc
,
char
**&
argv
,
std
::
string
const
&
initFileName
=
""
)
{
static
Environment
env
(
argc
,
argv
,
initFileName
);
}
...
...
@@ -35,6 +35,6 @@ namespace AMDiS
*
* The \ref Environment is closed automatically on destruction.
**/
inline
void
DUNE_DEPRECATED
finalize
()
{
/* no nothing */
}
inline
void
[[
deprecated
]]
finalize
()
{
/* no nothing */
}
}
// end namespace AMDiS
amdis/functions/Nodes.hpp
View file @
f47c56f1
...
...
@@ -24,24 +24,22 @@ namespace AMDiS
// dune version independent creation of node from preBasis
template
<
class
PB
,
class
TP
>
auto
makeNode
(
PB
const
&
preBasis
,
TP
const
&
treePath
)
auto
makeNode
(
PB
const
&
preBasis
,
[[
maybe_unused
]]
TP
const
&
treePath
)
{
#if DUNE_VERSION_LT(DUNE_FUNCTIONS,2,7)
return
preBasis
.
node
(
treePath
);
#else
DUNE_UNUSED_PARAMETER
(
treePath
);
return
preBasis
.
makeNode
();
#endif
}
// dune version independent creation of node from preBasis
template
<
class
PB
,
class
TP
>
auto
makeNodeIndexSet
(
PB
const
&
preBasis
,
TP
const
&
treePath
)
auto
makeNodeIndexSet
(
PB
const
&
preBasis
,
[[
maybe_unused
]]
TP
const
&
treePath
)
{
#if DUNE_VERSION_LT(DUNE_FUNCTIONS,2,7)
return
preBasis
.
indexSet
(
treePath
);
#else
DUNE_UNUSED_PARAMETER
(
treePath
);
return
preBasis
.
makeIndexSet
();
#endif
}
...
...
amdis/linearalgebra/Communication.hpp
View file @
f47c56f1
...
...
@@ -49,9 +49,8 @@ namespace AMDiS
using
Communication
=
C
;
template
<
class
Basis
>
static
Communication
create
(
Basis
const
&
basis
,
std
::
string
const
&
prefix
=
""
)
static
Communication
create
(
Basis
const
&
basis
,
[[
maybe_unused
]]
std
::
string
const
&
prefix
=
""
)
{
DUNE_UNUSED_PARAMETER
(
prefix
);
return
DefaultCommunicationCreator
<
C
>::
create
(
basis
);
}
};
...
...
amdis/linearalgebra/eigen/IterativeRunner.hpp
View file @
f47c56f1
...
...
@@ -49,10 +49,8 @@ namespace AMDiS
}
/// Implements \ref RunnerInterface::solve()
int
solve
(
M
const
&
A
,
X
&
x
,
Y
const
&
b
,
SolverInfo
&
solverInfo
)
override
int
solve
(
[[
maybe_unused
]]
M
const
&
A
,
X
&
x
,
Y
const
&
b
,
SolverInfo
&
solverInfo
)
override
{
DUNE_UNUSED_PARAMETER
(
A
);
x
=
solver_
.
solveWithGuess
(
b
,
x
);
Y
r
=
b
;
...
...
amdis/linearalgebra/eigen/SolverConfig.hpp
View file @
f47c56f1
...
...
@@ -76,7 +76,7 @@ namespace AMDiS
{
static
void
init
(
std
::
string
const
&
prefix
,
Eigen
::
UmfPackLU
<
M
>&
solver
)
{
DUNE_UNUSED
auto
&
control
=
solver
.
umfpackControl
();
[[
maybe_unused
]]
auto
&
control
=
solver
.
umfpackControl
();
// TODO: initialized umfpack parameters
}
};
...
...
amdis/linearalgebra/istl/AMGPrecon.hpp
View file @
f47c56f1
...
...
@@ -38,9 +38,8 @@ namespace AMDiS
template
<
class
Smoother
,
class
LinOp
,
class
Criterion
,
class
Comm
>
static
std
::
unique_ptr
<
PrecBase
>
create
(
std
::
string
prefix
,
LinOp
const
&
linOp
,
Criterion
const
&
criterion
,
SmootherArgs
<
Smoother
>
const
&
smootherArgs
,
Comm
const
&
comm
)
create
(
[[
maybe_unused
]]
std
::
string
prefix
,
LinOp
const
&
linOp
,
Criterion
const
&
criterion
,
SmootherArgs
<
Smoother
>
const
&
smootherArgs
,
Comm
const
&
comm
)
{
DUNE_UNUSED_PARAMETER
(
prefix
);
using
Solver
=
Dune
::
Amg
::
AMG
<
LinOp
,
typename
Traits
::
X
,
Smoother
,
Comm
>
;
return
std
::
make_unique
<
Solver
>
(
linOp
,
criterion
,
smootherArgs
,
comm
);
}
...
...
@@ -59,10 +58,9 @@ namespace AMDiS
template
<
class
Smoother
,
class
LinOp
,
class
Criterion
>
static
std
::
unique_ptr
<
PrecBase
>
create
(
std
::
string
prefix
,
LinOp
const
&
linOp
,
Criterion
const
&
criterion
,
SmootherArgs
<
Smoother
>
const
&
smootherArgs
,
create
(
std
::
string
prefix
,
LinOp
const
&
linOp
,
Criterion
const
&
criterion
,
[[
maybe_unused
]]
SmootherArgs
<
Smoother
>
const
&
smootherArgs
,
Dune
::
Amg
::
SequentialInformation
const
&
comm
)
{
DUNE_UNUSED_PARAMETER
(
smootherArgs
);
bool
symmetric
=
Parameters
::
get
<
bool
>
(
prefix
+
"->symmetric"
).
value_or
(
true
);
using
Solver
=
Dune
::
Amg
::
FastAMG
<
LinOp
,
typename
Traits
::
X
,
Dune
::
Amg
::
SequentialInformation
>
;
...
...
@@ -98,9 +96,8 @@ namespace AMDiS
template
<
class
Smoother
,
class
LinOp
,
class
Criterion
,
class
Comm
>
static
std
::
unique_ptr
<
PrecBase
>
create
(
std
::
string
prefix
,
LinOp
const
&
linOp
,
Criterion
const
&
criterion
,
SmootherArgs
<
Smoother
>
const
&
smootherArgs
,
Comm
const
&
comm
)
create
(
std
::
string
prefix
,
LinOp
const
&
linOp
,
Criterion
const
&
criterion
,
[[
maybe_unused
]]
SmootherArgs
<
Smoother
>
const
&
smootherArgs
,
Comm
const
&
comm
)
{
DUNE_UNUSED_PARAMETER
(
smootherArgs
);
std
::
string
solver
=
Parameters
::
get
<
std
::
string
>
(
prefix
+
"->krylov solver"
).
value_or
(
"default"
);
std
::
size_t
maxLevelKrylovSteps
=
3
;
...
...
@@ -332,9 +329,8 @@ namespace AMDiS
}
std
::
unique_ptr
<
Interface
>
createImpl1
(
SolverCategory
cat
,
M
const
&
mat
,
Dune
::
Amg
::
SequentialInformation
const
&
comm
)
const
createImpl1
(
[[
maybe_unused
]]
SolverCategory
cat
,
M
const
&
mat
,
Dune
::
Amg
::
SequentialInformation
const
&
comm
)
const
{
DUNE_UNUSED_PARAMETER
(
cat
);
assert
(
cat
==
SolverCategory
::
sequential
);
using
LinOp
=
Dune
::
MatrixAdapter
<
M
,
X
,
Y
>
;
LinOp
*
linOpPtr
=
new
LinOp
(
mat
);
...
...
amdis/linearalgebra/istl/PreconCreator.hpp
View file @
f47c56f1
...
...
@@ -61,9 +61,8 @@ namespace AMDiS
using
Super
::
Super
;
// inheriting constructor
std
::
unique_ptr
<
typename
Traits
::
Prec
>
create
(
typename
Traits
::
M
const
&
mat
,
typename
Traits
::
Comm
const
&
comm
)
const
override
create
(
typename
Traits
::
M
const
&
mat
,
[[
maybe_unused
]]
typename
Traits
::
Comm
const
&
comm
)
const
override
{
DUNE_UNUSED_PARAMETER
(
comm
);
return
std
::
make_unique
<
Precon
>
(
mat
,
this
->
iter_
,
this
->
w_
);
}
};
...
...
@@ -78,10 +77,8 @@ namespace AMDiS
using
Super
::
Super
;
// inheriting constructor
std
::
unique_ptr
<
typename
Traits
::
Prec
>
create
(
typename
Traits
::
M
const
&
mat
,
typename
Traits
::
Comm
const
&
comm
)
const
override
create
(
[[
maybe_unused
]]
typename
Traits
::
M
const
&
mat
,
[[
maybe_unused
]]
typename
Traits
::
Comm
const
&
comm
)
const
override
{
DUNE_UNUSED_PARAMETER
(
mat
);
DUNE_UNUSED_PARAMETER
(
comm
);
using
Precon
=
Dune
::
Richardson
<
X
,
Y
>
;
return
std
::
make_unique
<
Precon
>
(
this
->
w_
);
}
...
...
@@ -97,9 +94,8 @@ namespace AMDiS
using
Super
::
Super
;
// inheriting constructor
std
::
unique_ptr
<
typename
Traits
::
Prec
>
create
(
typename
Traits
::
M
const
&
mat
,
typename
Traits
::
Comm
const
&
comm
)
const
override
create
(
typename
Traits
::
M
const
&
mat
,
[[
maybe_unused
]]
typename
Traits
::
Comm
const
&
comm
)
const
override
{
DUNE_UNUSED_PARAMETER
(
comm
);
using
Precon
=
Dune
::
SeqILDL
<
M
,
X
,
Y
>
;
return
std
::
make_unique
<
Precon
>
(
mat
,
this
->
w_
);
}
...
...
amdis/linearalgebra/mtl/HyprePrecon.hpp
View file @
f47c56f1
...
...
@@ -123,7 +123,7 @@ namespace AMDiS
mtl
::
HypreParVector
x
(
in
);
// use b as initial guess
mtl
::
HypreParVector
b
(
in
);
DUNE_UNUSED
int
error
=
HYPRE_BoomerAMGSolve
(
solver_
,
matrix_
,
b
,
x
);
[[
maybe_unused
]]
int
error
=
HYPRE_BoomerAMGSolve
(
solver_
,
matrix_
,
b
,
x
);
assert
(
error
!=
0
);
// write output back to MTL vector
...
...
@@ -137,7 +137,7 @@ namespace AMDiS
mtl
::
HypreParVector
x
(
in
);
// use b as initial guess
mtl
::
HypreParVector
b
(
in
);
DUNE_UNUSED
int
error
=
HYPRE_BoomerAMGSolveT
(
solver_
,
matrix_
,
b
,
x
);
[[
maybe_unused
]]
int
error
=
HYPRE_BoomerAMGSolveT
(
solver_
,
matrix_
,
b
,
x
);
assert
(
error
!=
0
);
// write output back to MTL vector
...
...
amdis/linearalgebra/petsc/PetscRunner.hpp
View file @
f47c56f1
...
...
@@ -95,10 +95,9 @@ namespace AMDiS
}
/// Implements \ref RunnerInterface::solve()
int
solve
(
M
const
&
A
,
X
&
x
,
Y
const
&
b
,
SolverInfo
&
solverInfo
)
override
int
solve
(
[[
maybe_unused
]]
M
const
&
A
,
X
&
x
,
Y
const
&
b
,
SolverInfo
&
solverInfo
)
override
{
assert
(
initialized_
);
DUNE_UNUSED_PARAMETER
(
A
);
KSPSolve
(
ksp_
,
b
,
x
);
...
...
amdis/utility/UniqueBorderPartition.hpp
View file @
f47c56f1
...
...
@@ -86,9 +86,8 @@ namespace AMDiS
private:
template
<
class
MessageBuffer
,
class
Entity
,
int
cd
>
void
scatterImpl
(
MessageBuffer
&
buff
,
Entity
const
&
e
,
std
::
size_t
n
,
int_t
<
cd
>
)
void
scatterImpl
(
MessageBuffer
&
buff
,
Entity
const
&
e
,
[[
maybe_unused
]]
std
::
size_t
n
,
int_t
<
cd
>
)
{
DUNE_UNUSED_PARAMETER
(
n
);
// n == 1
assert
(
n
==
1
);
int
rank
=
0
;
...
...
@@ -101,9 +100,8 @@ namespace AMDiS
}
template
<
class
MessageBuffer
,
class
Entity
>
void
scatterImpl
(
MessageBuffer
&
buff
,
Entity
const
&
e
,
std
::
size_t
n
,
int_t
<
0
>
)
void
scatterImpl
(
MessageBuffer
&
buff
,
Entity
const
&
e
,
[[
maybe_unused
]]
std
::
size_t
n
,
int_t
<
0
>
)
{
DUNE_UNUSED_PARAMETER
(
n
);
// n == 1
assert
(
n
==
1
);
int
rank
=
0
;
...
...
@@ -221,9 +219,8 @@ namespace AMDiS
}
template
<
class
MessageBuffer
,
class
Entity
,
int
cd
>
void
scatterImpl
(
MessageBuffer
&
buff
,
Entity
const
&
e
,
std
::
size_t
n
,
int_t
<
cd
>
)
void
scatterImpl
(
MessageBuffer
&
buff
,
Entity
const
&
e
,
[[
maybe_unused
]]
std
::
size_t
n
,
int_t
<
cd
>
)
{
DUNE_UNUSED_PARAMETER
(
n
);
// n == 1
assert
(
n
==
1
);
int
rank
=
0
;
...
...
@@ -256,4 +253,3 @@ namespace AMDiS
};
}
// end namespace AMDiS
test/ExpressionsTest.cpp
View file @
f47c56f1
...
...
@@ -93,12 +93,12 @@ int main(int argc, char** argv)
auto
gv
=
u
.
basis
().
gridView
();
DUNE_UNUSED
auto
int1
=
integrate
(
op1
,
gv
,
5
);
DUNE_UNUSED
auto
int2
=
integrate
(
op2
,
gv
,
5
);
DUNE_UNUSED
auto
int3
=
integrate
(
op3
,
gv
);
DUNE_UNUSED
auto
int4
=
integrate
(
op4
,
gv
,
5
);
DUNE_UNUSED
auto
int5
=
integrate
(
op5
,
gv
,
5
);
DUNE_UNUSED
auto
int6
=
integrate
(
op6
,
gv
,
5
);
[[
maybe_unused
]]
auto
int1
=
integrate
(
op1
,
gv
,
5
);
[[
maybe_unused
]]
auto
int2
=
integrate
(
op2
,
gv
,
5
);
[[
maybe_unused
]]
auto
int3
=
integrate
(
op3
,
gv
);
[[
maybe_unused
]]
auto
int4
=
integrate
(
op4
,
gv
,
5
);
[[
maybe_unused
]]
auto
int5
=
integrate
(
op5
,
gv
,
5
);
[[
maybe_unused
]]
auto
int6
=
integrate
(
op6
,
gv
,
5
);
return
0
;
}
test/GlobalIdSetTest.cpp
View file @
f47c56f1
...
...
@@ -29,7 +29,7 @@ void checkBasisIds(const Basis& basis)
auto
id
=
idSet
.
id
(
i
);
cache
.
insert
(
id
);
DUNE_UNUSED
auto
pt
=
idSet
.
partitionType
(
i
);
[[
maybe_unused
]]
auto
pt
=
idSet
.
partitionType
(
i
);
}
idSet
.
unbind
();
...
...
test/NodeIndicesTest.cpp
View file @
f47c56f1
...
...
@@ -34,8 +34,7 @@ int main()
AMDIS_TEST_EQ
(
numNodeIndices
,
numDofs
);
std
::
size_t
num
=
0
;
for
(
std
::
size_t
dof
:
nodeIndices
(
localView
))
{
DUNE_UNUSED_PARAMETER
(
dof
);
for
([[
maybe_unused
]]
std
::
size_t
dof
:
nodeIndices
(
localView
))
{
num
++
;
}
AMDIS_TEST_EQ
(
num
,
numDofs
);
...
...
@@ -50,8 +49,7 @@ int main()
std
::
size_t
numVelNodeIndices
=
nodeIndexCount
(
localView
,
v_node
);
AMDIS_TEST_EQ
(
numVelNodeIndices
,
numVelDofs
);
num
=
0
;
for
(
std
::
size_t
dof
:
nodeIndices
(
localView
,
v_node
))
{
DUNE_UNUSED_PARAMETER
(
dof
);
for
([[
maybe_unused
]]
std
::
size_t
dof
:
nodeIndices
(
localView
,
v_node
))
{
num
++
;
}
AMDIS_TEST_EQ
(
num
,
numVelDofs
);
...
...
@@ -62,8 +60,7 @@ int main()
std
::
size_t
numPNodeIndices
=
nodeIndexCount
(
localView
,
p_node
);
AMDIS_TEST_EQ
(
numPNodeIndices
,
numPDofs
);
num
=
0
;
for
(
std
::
size_t
dof
:
nodeIndices
(
localView
,
p_node
))
{
DUNE_UNUSED_PARAMETER
(
dof
);
for
([[
maybe_unused
]]
std
::
size_t
dof
:
nodeIndices
(
localView
,
p_node
))
{
num
++
;
}
AMDIS_TEST_EQ
(
num
,
numPDofs
);
...
...
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