Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
amdis
amdis-core
Commits
442888a5
Commit
442888a5
authored
Apr 29, 2016
by
Praetorius, Simon
Browse files
remove clang build from gitlab-ci
parent
395f1b3c
Changes
6
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
442888a5
...
...
@@ -9,4 +9,5 @@
*.tarh
# ignore build directories
build*/
\ No newline at end of file
build*/
install*/
\ No newline at end of file
.gitlab-ci.yml
View file @
442888a5
...
...
@@ -3,12 +3,12 @@ cache:
paths
:
-
install/
dune:git--clang:
image
:
duneci/dune-fufem:git
script
:
-
./contrib/ci-setup
-
dunecontrol --opts=/duneci/opts.clang --current all
-
dunecontrol --current make test
#
dune:git--clang:
#
image: duneci/dune-fufem:git
#
script:
#
- ./contrib/ci-setup
#
- dunecontrol --opts=/duneci/opts.clang --current all
#
- dunecontrol --current make test
dune:git--gcc:
image
:
duneci/dune-fufem:git
...
...
dune/amdis/ProblemStat.hpp
View file @
442888a5
...
...
@@ -50,7 +50,7 @@ namespace AMDiS
static
constexpr
int
dow
=
Traits
::
dimworld
;
/// Number of problem components
static
constexpr
in
t
nComponents
=
Traits
::
nComponents
;
static
constexpr
size_
t
nComponents
=
Traits
::
nComponents
;
template
<
size_t
I
>
...
...
@@ -77,7 +77,7 @@ namespace AMDiS
:
name
(
name
)
{
Parameters
::
get
(
name
+
"->names"
,
componentNames
);
for
(
in
t
i
=
componentNames
.
size
();
i
<
nComponents
;
++
i
)
for
(
size_
t
i
=
componentNames
.
size
();
i
<
nComponents
;
++
i
)
componentNames
.
push_back
(
"solution["
+
std
::
to_string
(
i
)
+
"]"
);
}
...
...
dune/amdis/linear_algebra/mtl/DOFVector.hpp
View file @
442888a5
...
...
@@ -121,7 +121,7 @@ namespace AMDiS
private:
/// The finite element space / basis associated with the data vector
FeSpace
const
&
feSpace
;
FeSpace
const
&
feSpace
;
/// The name of the DOFVector (used in file-writing)
std
::
string
name
;
...
...
dune/amdis/linear_algebra/mtl/SystemMatrix.hpp
View file @
442888a5
...
...
@@ -138,8 +138,8 @@ namespace AMDiS
/// Return the (R,C)'th underlaying base matrix
template
<
size_t
R
,
size_t
C
>
auto
&
getMatrix
(
const
index_
<
R
>
_r
=
index_
<
R
>
()
,
const
index_
<
C
>
_c
=
index_
<
C
>
()
)
auto
&
getMatrix
(
const
index_
<
R
>
_r
=
{}
,
const
index_
<
C
>
_c
=
{}
)
{
static_assert
(
R
<
N
()
&&
C
<
M
(),
"Indices out of range [0,N)x[0,M)"
);
return
matrix
(
_r
,
_c
);
...
...
@@ -147,8 +147,8 @@ namespace AMDiS
/// Return the (R,C)'th underlaying base matrix
template
<
size_t
R
,
size_t
C
>
auto
const
&
getMatrix
(
const
index_
<
R
>
_r
=
index_
<
R
>
()
,
const
index_
<
C
>
_c
=
index_
<
C
>
()
)
const
auto
const
&
getMatrix
(
const
index_
<
R
>
_r
=
{}
,
const
index_
<
C
>
_c
=
{}
)
const
{
static_assert
(
R
<
N
()
&&
C
<
M
(),
"Indices out of range [0,N)x[0,M)"
);
return
matrix
(
_r
,
_c
);
...
...
@@ -160,7 +160,7 @@ namespace AMDiS
/// Return the I'th row finite element space
template
<
size_t
I
=
0
>
auto
&
getRowFeSpace
(
const
index_
<
I
>
=
index_
<
I
>
()
)
const
auto
&
getRowFeSpace
(
const
index_
<
I
>
=
{}
)
const
{
static_assert
(
I
<
N
(),
"Index out of range [0,N)"
);
return
std
::
get
<
I
>
(
feSpaces
);
...
...
@@ -168,7 +168,7 @@ namespace AMDiS
/// Return the I'th column finite element space
template
<
size_t
I
=
0
>
auto
const
&
getColFeSpace
(
const
index_
<
I
>
=
index_
<
I
>
()
)
const
auto
const
&
getColFeSpace
(
const
index_
<
I
>
=
{}
)
const
{
static_assert
(
I
<
M
(),
"Index out of range [0,M)"
);
return
std
::
get
<
I
>
(
feSpaces
);
...
...
@@ -176,8 +176,8 @@ namespace AMDiS
/// Return the (R,C)'th DOFMatrix
template
<
size_t
R
=
0
,
size_t
C
=
0
>
auto
&
operator
()(
const
index_
<
R
>
=
index_
<
R
>
()
,
const
index_
<
C
>
=
index_
<
C
>
()
)
auto
&
operator
()(
const
index_
<
R
>
=
{}
,
const
index_
<
C
>
=
{}
)
{
static_assert
(
R
<
N
()
&&
C
<
M
(),
"Indices out of range [0,N)x[0,M)"
);
return
std
::
get
<
C
>
(
std
::
get
<
R
>
(
dofmatrices
));
...
...
@@ -185,8 +185,8 @@ namespace AMDiS
/// Return the (R,C)'th DOFMatrix
template
<
size_t
R
=
0
,
size_t
C
=
0
>
auto
const
&
operator
()(
const
index_
<
R
>
=
index_
<
R
>
()
,
const
index_
<
C
>
=
index_
<
C
>
()
)
const
auto
const
&
operator
()(
const
index_
<
R
>
=
{}
,
const
index_
<
C
>
=
{}
)
const
{
static_assert
(
R
<
N
()
&&
C
<
M
(),
"Indices out of range [0,N)x[0,M)"
);
return
std
::
get
<
C
>
(
std
::
get
<
R
>
(
dofmatrices
));
...
...
dune/amdis/linear_algebra/mtl/SystemVector.hpp
View file @
442888a5
...
...
@@ -109,7 +109,7 @@ namespace AMDiS
/// Return a shared pointer to the I'th underlaying base vector
template
<
size_t
I
>
auto
&
getVector
(
const
index_
<
I
>
=
index_
<
I
>
()
)
auto
&
getVector
(
const
index_
<
I
>
=
{}
)
{
static_assert
(
I
<
size
(),
"Index out of range [0,SIZE)"
);
return
vector
[
I
];
...
...
@@ -117,7 +117,7 @@ namespace AMDiS
/// Return a shared pointer to the I'th underlaying base vector
template
<
size_t
I
>
auto
const
&
getVector
(
const
index_
<
I
>
=
index_
<
I
>
()
)
const
auto
const
&
getVector
(
const
index_
<
I
>
=
{}
)
const
{
static_assert
(
I
<
size
(),
"Index out of range [0,SIZE)"
);
return
vector
[
I
];
...
...
@@ -129,7 +129,7 @@ namespace AMDiS
/// Return the I'th finite element space
template
<
size_t
I
=
0
>
auto
const
&
getFeSpace
(
const
index_
<
I
>
=
index_
<
I
>
()
)
const
auto
const
&
getFeSpace
(
const
index_
<
I
>
=
{}
)
const
{
static_assert
(
I
<
size
(),
"Index out of range [0,SIZE)"
);
return
std
::
get
<
I
>
(
feSpaces
);
...
...
@@ -159,7 +159,7 @@ namespace AMDiS
/// Return the I'th DOFVector
template
<
size_t
I
>
auto
&
getDOFVector
(
const
index_
<
I
>
=
index_
<
I
>
()
)
auto
&
getDOFVector
(
const
index_
<
I
>
=
{}
)
{
static_assert
(
I
<
size
(),
"Index out of range [0,SIZE)"
);
return
std
::
get
<
I
>
(
dofvectors
);
...
...
@@ -167,7 +167,7 @@ namespace AMDiS
/// Return the I'th DOFVector
template
<
size_t
I
>
auto
const
&
getDOFVector
(
const
index_
<
I
>
=
index_
<
I
>
()
)
const
auto
const
&
getDOFVector
(
const
index_
<
I
>
=
{}
)
const
{
static_assert
(
I
<
size
(),
"Index out of range [0,SIZE)"
);
return
std
::
get
<
I
>
(
dofvectors
);
...
...
@@ -175,7 +175,7 @@ namespace AMDiS
/// Resize the I'th \ref vector to the sizes of the I'th \ref feSpaces.
template
<
size_t
I
=
0
>
void
compress
(
const
index_
<
I
>
=
index_
<
I
>
()
)
void
compress
(
const
index_
<
I
>
=
{}
)
{
std
::
get
<
I
>
(
dofvectors
).
compress
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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