Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-microstructure
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Klaus Böhnlein
dune-microstructure
Commits
f235807a
Commit
f235807a
authored
6 months ago
by
Klaus Böhnlein
Browse files
Options
Downloads
Patches
Plain Diff
remove sym-function as its already in dunge-gfe/linearalgebra
parent
48e0139a
No related branches found
No related tags found
1 merge request
!15
Move to new Hermite-basis from dune-functions.
Pipeline
#17198
failed
6 months ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dune/microstructure/bendingisometryaddons.hh
+20
-20
20 additions, 20 deletions
dune/microstructure/bendingisometryaddons.hh
dune/microstructure/energies/discretekirchhoffbendingenergyprestrained.hh
+1
-0
1 addition, 0 deletions
...ure/energies/discretekirchhoffbendingenergyprestrained.hh
with
21 additions
and
20 deletions
dune/microstructure/bendingisometryaddons.hh
+
20
−
20
View file @
f235807a
...
...
@@ -319,26 +319,26 @@ auto compare(LocalDiscreteKirchhoffFunction& kirchhoffFunction,
/**
* @brief Symmetric part of a matrix.
*
* @param M
* @return FieldMatrix<RT,2,2>
*/
template
<
class
RT
>
static
Dune
::
FieldMatrix
<
RT
,
2
,
2
>
sym
(
Dune
::
FieldMatrix
<
RT
,
2
,
2
>
M
)
{
// 1/2 (M^T + M)
Dune
::
FieldMatrix
<
RT
,
2
,
2
>
ret
(
0
);
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
ret
[
i
][
i
]
=
M
[
i
][
i
];
for
(
int
j
=
i
+
1
;
j
<
2
;
j
++
)
{
ret
[
i
][
j
]
=
0.5
*
(
M
[
i
][
j
]
+
M
[
j
][
i
]);
ret
[
j
][
i
]
=
ret
[
i
][
j
];
}
}
return
ret
;
}
//
/**
//
* @brief Symmetric part of a matrix.
//
*
//
* @param M
//
* @return FieldMatrix<RT,2,2>
//
*/
//
template<class RT>
//
static Dune::FieldMatrix<RT,2,2> sym (Dune::FieldMatrix<RT,2,2> M) { // 1/2 (M^T + M)
//
Dune::FieldMatrix<RT,2,2> ret(0);
//
for (int i=0; i<2; i++)
//
{
//
ret[i][i] = M[i][i];
//
for (int j=i+1; j<2; j++)
//
{
//
ret[i][j] = 0.5*(M[i][j] + M[j][i]);
//
ret[j][i] = ret[i][j];
//
}
//
}
//
return ret;
//
}
...
...
This diff is collapsed.
Click to expand it.
dune/microstructure/energies/discretekirchhoffbendingenergyprestrained.hh
+
1
−
0
View file @
f235807a
...
...
@@ -9,6 +9,7 @@
#include
<dune/gfe/assemblers/localenergy.hh>
#include
<dune/gfe/bendingisometryhelper.hh>
#include
<dune/gfe/tensor3.hh>
#include
<dune/gfe/linearalgebra.hh>
#include
<dune/localfunctions/lagrange/lagrangesimplex.hh>
...
...
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