Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-istl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Core Modules
dune-istl
Commits
172566dc
Commit
172566dc
authored
13 years ago
by
Markus Blatt
Browse files
Options
Downloads
Patches
Plain Diff
Use enable trick for multitype stuff.
[[Imported from SVN: r1484]]
parent
2538d8c8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dune/istl/gsetc.hh
+10
-0
10 additions, 0 deletions
dune/istl/gsetc.hh
dune/istl/multitypeblockmatrix.hh
+5
-1
5 additions, 1 deletion
dune/istl/multitypeblockmatrix.hh
dune/istl/multitypeblockvector.hh
+6
-1
6 additions, 1 deletion
dune/istl/multitypeblockvector.hh
with
21 additions
and
2 deletions
dune/istl/gsetc.hh
+
10
−
0
View file @
172566dc
...
...
@@ -373,6 +373,7 @@ namespace Dune {
template
<
int
I
>
struct
algmeta_itsteps
{
#if HAVE_BOOST
#ifdef HAVE_BOOST_FUSION
template
<
typename
T11
,
typename
T12
,
typename
T13
,
typename
T14
,
...
...
@@ -389,6 +390,7 @@ namespace Dune {
boost
::
mpl
::
size
<
MultiTypeBlockMatrix
<
T11
,
T12
,
T13
,
T14
,
T15
,
T16
,
T17
,
T18
,
T19
>
>::
value
;
Dune
::
MultiTypeBlockMatrix_Solver
<
I
,
0
,
rowcount
>::
dbgs
(
A
,
x
,
b
,
w
);
}
#endif
#endif
template
<
class
M
,
class
X
,
class
Y
,
class
K
>
...
...
@@ -419,7 +421,9 @@ namespace Dune {
x
.
axpy
(
1
-
w
,
xold
);
}
#if HAVE_BOOST
#ifdef HAVE_BOOST_FUSION
template
<
typename
T11
,
typename
T12
,
typename
T13
,
typename
T14
,
typename
T15
,
typename
T16
,
typename
T17
,
typename
T18
,
typename
T19
,
typename
T21
,
typename
T22
,
typename
T23
,
...
...
@@ -434,6 +438,7 @@ namespace Dune {
boost
::
mpl
::
size
<
MultiTypeBlockMatrix
<
T11
,
T12
,
T13
,
T14
,
T15
,
T16
,
T17
,
T18
,
T19
>
>::
value
;
Dune
::
MultiTypeBlockMatrix_Solver
<
I
,
0
,
rowcount
>::
bsorf
(
A
,
x
,
b
,
w
);
}
#endif
#endif
template
<
class
M
,
class
X
,
class
Y
,
class
K
>
...
...
@@ -466,6 +471,7 @@ namespace Dune {
}
}
#if HAVE_BOOST
#ifdef HAVE_BOOST_FUSION
template
<
typename
T11
,
typename
T12
,
typename
T13
,
typename
T14
,
...
...
@@ -482,6 +488,7 @@ namespace Dune {
mpl
::
size
<
MultiTypeBlockMatrix
<
T11
,
T12
,
T13
,
T14
,
T15
,
T16
,
T17
,
T18
,
T19
>
>::
value
;
Dune
::
MultiTypeBlockMatrix_Solver
<
I
,
rowcount
-
1
,
rowcount
>::
bsorb
(
A
,
x
,
b
,
w
);
}
#endif
#endif
template
<
class
M
,
class
X
,
class
Y
,
class
K
>
...
...
@@ -514,7 +521,9 @@ namespace Dune {
}
}
#if HAVE_BOOST
#ifdef HAVE_BOOST_FUSION
template
<
typename
T11
,
typename
T12
,
typename
T13
,
typename
T14
,
typename
T15
,
typename
T16
,
typename
T17
,
typename
T18
,
typename
T19
,
typename
T21
,
typename
T22
,
typename
T23
,
...
...
@@ -529,6 +538,7 @@ namespace Dune {
boost
::
mpl
::
size
<
MultiTypeBlockMatrix
<
T11
,
T12
,
T13
,
T14
,
T15
,
T16
,
T17
,
T18
,
T19
>
>::
value
;
Dune
::
MultiTypeBlockMatrix_Solver
<
I
,
0
,
rowcount
>::
dbjac
(
A
,
x
,
b
,
w
);
}
#endif
#endif
template
<
class
M
,
class
X
,
class
Y
,
class
K
>
...
...
This diff is collapsed.
Click to expand it.
dune/istl/multitypeblockmatrix.hh
+
5
−
1
View file @
172566dc
...
...
@@ -8,6 +8,7 @@
#include
"istlexception.hh"
#if HAVE_BOOST
#ifdef HAVE_BOOST_FUSION
#include
<boost/fusion/sequence.hpp>
...
...
@@ -207,6 +208,9 @@ namespace Dune {
@brief A Matrix class to support different block types
This matrix class combines MultiTypeBlockVector elements as rows.
You must add BOOST_CPPFLAGS and BOOT_LDFLAGS to the CPPFLAGS and LDFLAGS during
compilation, respectively, to use this class
*/
template
<
typename
T1
,
typename
T2
,
typename
T3
,
typename
T4
,
typename
T5
,
typename
T6
,
typename
T7
,
typename
T8
,
typename
T9
>
...
...
@@ -459,5 +463,5 @@ namespace Dune {
}
// end namespace
#endif // HAVE_BOOST_FUSION
#endif // HAVE_BOOST
#endif
This diff is collapsed.
Click to expand it.
dune/istl/multitypeblockvector.hh
+
6
−
1
View file @
172566dc
...
...
@@ -3,6 +3,7 @@
#ifndef DUNE_MULTITYPEVECTOR_HH
#define DUNE_MULTITYPEVECTOR_HH
#if HAVE_BOOST
#ifdef HAVE_BOOST_FUSION
#include
<cmath>
...
...
@@ -228,6 +229,9 @@ namespace Dune {
@brief A Vector class to support different block types
This vector class combines elements of different types known at compile-time.
You must add BOOST_CPPFLAGS and BOOT_LDFLAGS to the CPPFLAGS and LDFLAGS during
compilation, respectively, to use this class
*/
template
<
typename
T1
,
typename
T2
,
typename
T3
,
typename
T4
,
typename
T5
,
typename
T6
,
typename
T7
,
typename
T8
,
typename
T9
>
...
...
@@ -306,6 +310,7 @@ namespace Dune {
}
// end namespace
#endif
#endif // end HAVE_BOOST_FUSION
#endif // end HAVE_BOOST
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment