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
29c3c685
Commit
29c3c685
authored
Nov 24, 2020
by
Praetorius, Simon
Browse files
fix merge bug
parent
de1b84d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
amdis/BiLinearForm.inc.hpp
View file @
29c3c685
...
...
@@ -74,7 +74,7 @@ assemble()
this
->
init
();
for
(
auto
const
&
element
:
elements
(
this
->
rowBasis
().
gridView
(),
typename
Traits
::
PartitionSet
{}))
{
rowLocalView
.
bind
(
element
);
if
(
this
->
rowBasis
()
==
this
->
colBasis
()
)
if
(
this
->
rowBasis
_
==
this
->
colBasis
_
)
this
->
assemble
(
rowLocalView
,
rowLocalView
);
else
{
colLocalView
.
bind
(
element
);
...
...
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