Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-gfe
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
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
Sander, Oliver
dune-gfe
Commits
0aafd3f5
Commit
0aafd3f5
authored
5 years ago
by
Lisa Julia Nebel
Browse files
Options
Downloads
Patches
Plain Diff
Remove wrong template parameter (GradientRT) from usages of LocalFEStiffness in film-on-substrate
parent
ac6c5b40
No related branches found
No related tags found
1 merge request
!18
Remove wrong template parameter (GradientRT) from usages of LocalFEStiffness in film-on-substrate
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dune/gfe/sumcosseratenergy.hh
+3
-3
3 additions, 3 deletions
dune/gfe/sumcosseratenergy.hh
src/film-on-substrate.cc
+9
-11
9 additions, 11 deletions
src/film-on-substrate.cc
with
12 additions
and
14 deletions
dune/gfe/sumcosseratenergy.hh
+
3
−
3
View file @
0aafd3f5
...
...
@@ -8,7 +8,7 @@
namespace
Dune
{
namespace
GFE
{
template
<
class
Basis
,
class
TargetSpace
,
class
field_type
=
double
,
class
GradientRT
=
double
>
template
<
class
Basis
,
class
TargetSpace
,
class
field_type
=
double
>
class
SumCosseratEnergy
:
public
LocalGeodesicFEStiffness
<
Basis
,
TargetSpace
>
{
...
...
@@ -27,7 +27,7 @@ public:
* \param elasticEnergy The elastic energy
* \param cosseratEnergy The cosserat energy
*/
SumCosseratEnergy
(
std
::
shared_ptr
<
LocalFEStiffness
<
GridView
,
LocalFiniteElement
,
std
::
vector
<
Dune
::
FieldVector
<
field_type
,
dim
>
>
,
std
::
vector
<
GradientRT
>
>
>
elasticEnergy
,
SumCosseratEnergy
(
std
::
shared_ptr
<
LocalFEStiffness
<
GridView
,
LocalFiniteElement
,
std
::
vector
<
Dune
::
FieldVector
<
field_type
,
dim
>
>
>
>
elasticEnergy
,
std
::
shared_ptr
<
LocalGeodesicFEStiffness
<
Basis
,
TargetSpace
>>
cosseratEnergy
)
:
elasticEnergy_
(
elasticEnergy
),
...
...
@@ -49,7 +49,7 @@ public:
private
:
std
::
shared_ptr
<
LocalFEStiffness
<
GridView
,
LocalFiniteElement
,
std
::
vector
<
Dune
::
FieldVector
<
field_type
,
dim
>
>
,
std
::
vector
<
GradientRT
>
>
>
elasticEnergy_
;
std
::
shared_ptr
<
LocalFEStiffness
<
GridView
,
LocalFiniteElement
,
std
::
vector
<
Dune
::
FieldVector
<
field_type
,
dim
>
>
>
>
elasticEnergy_
;
std
::
shared_ptr
<
LocalGeodesicFEStiffness
<
Basis
,
TargetSpace
>
>
cosseratEnergy_
;
};
...
...
This diff is collapsed.
Click to expand it.
src/film-on-substrate.cc
+
9
−
11
View file @
0aafd3f5
...
...
@@ -61,7 +61,6 @@ const int order = 1;
//differentiation method
typedef
adouble
ValueType
;
typedef
adouble
GradientValueType
;
using
namespace
Dune
;
...
...
@@ -339,43 +338,42 @@ int main (int argc, char *argv[]) try
std
::
cout
<<
"Selected energy is: "
<<
parameterSet
.
get
<
std
::
string
>
(
"energy"
)
<<
std
::
endl
;
std
::
shared_ptr
<
LocalFEStiffness
<
GridView
,
FEBasis
::
LocalView
::
Tree
::
FiniteElement
,
std
::
vector
<
Dune
::
FieldVector
<
ValueType
,
dim
>>
,
std
::
vector
<
GradientValueType
>
>
>
elasticEnergy
;
std
::
vector
<
Dune
::
FieldVector
<
ValueType
,
dim
>>
>
>
elasticEnergy
;
if
(
parameterSet
.
get
<
std
::
string
>
(
"energy"
)
==
"stvenantkirchhoff"
)
elasticEnergy
=
std
::
make_shared
<
StVenantKirchhoffEnergy
<
GridView
,
FEBasis
::
LocalView
::
Tree
::
FiniteElement
,
ValueType
,
GradientValueType
>
>
(
materialParameters
);
ValueType
>
>
(
materialParameters
);
if
(
parameterSet
.
get
<
std
::
string
>
(
"energy"
)
==
"mooneyrivlin"
)
elasticEnergy
=
std
::
make_shared
<
MooneyRivlinEnergy
<
GridView
,
FEBasis
::
LocalView
::
Tree
::
FiniteElement
,
ValueType
,
GradientValueType
>
>
(
materialParameters
);
ValueType
>
>
(
materialParameters
);
if
(
parameterSet
.
get
<
std
::
string
>
(
"energy"
)
==
"neohooke"
)
elasticEnergy
=
std
::
make_shared
<
NeoHookeEnergy
<
GridView
,
FEBasis
::
LocalView
::
Tree
::
FiniteElement
,
ValueType
,
GradientValueType
>
>
(
materialParameters
);
ValueType
>
>
(
materialParameters
);
if
(
parameterSet
.
get
<
std
::
string
>
(
"energy"
)
==
"hencky"
)
elasticEnergy
=
std
::
make_shared
<
HenckyEnergy
<
GridView
,
FEBasis
::
LocalView
::
Tree
::
FiniteElement
,
ValueType
,
GradientValueType
>
>
(
materialParameters
);
ValueType
>
>
(
materialParameters
);
if
(
parameterSet
.
get
<
std
::
string
>
(
"energy"
)
==
"exphencky"
)
elasticEnergy
=
std
::
make_shared
<
ExpHenckyEnergy
<
GridView
,
FEBasis
::
LocalView
::
Tree
::
FiniteElement
,
ValueType
,
GradientValueType
>
>
(
materialParameters
);
ValueType
>
>
(
materialParameters
);
if
(
!
elasticEnergy
)
DUNE_THROW
(
Exception
,
"Error: Selected energy not available!"
);
auto
neumannEnergy
=
std
::
make_shared
<
NeumannEnergy
<
GridView
,
FEBasis
::
LocalView
::
Tree
::
FiniteElement
,
ValueType
,
GradientValueType
>
>
(
&
neumannBoundary
,
neumannFunction
.
get
());
ValueType
>
>
(
&
neumannBoundary
,
neumannFunction
.
get
());
auto
elasticAndNeumann
=
std
::
make_shared
<
SumEnergy
<
GridView
,
FEBasis
::
LocalView
::
Tree
::
FiniteElement
,
ValueType
,
GradientValueType
>>
(
elasticEnergy
,
neumannEnergy
);
ValueType
>>
(
elasticEnergy
,
neumannEnergy
);
using
LocalEnergyBase
=
LocalGeodesicFEStiffness
<
FEBasis
,
RigidBodyMotion
<
adouble
,
dim
>
>
;
...
...
@@ -390,7 +388,7 @@ int main (int argc, char *argv[]) try
surfaceCosseratEnergy
=
std
::
make_shared
<
SurfaceCosseratEnergy
<
FEBasis
,
RigidBodyMotion
<
adouble
,
dim
>
,
adouble
,
adouble
>>
(
materialParameters
,
std
::
move
(
vertexNormals
),
&
surfaceShellBoundary
);
std
::
shared_ptr
<
LocalEnergyBase
>
totalEnergy
;
totalEnergy
=
std
::
make_shared
<
GFE
::
SumCosseratEnergy
<
FEBasis
,
RigidBodyMotion
<
adouble
,
dim
>
,
adouble
,
adouble
>>
(
elasticAndNeumann
,
surfaceCosseratEnergy
);
totalEnergy
=
std
::
make_shared
<
GFE
::
SumCosseratEnergy
<
FEBasis
,
RigidBodyMotion
<
adouble
,
dim
>
,
adouble
>>
(
elasticAndNeumann
,
surfaceCosseratEnergy
);
LocalGeodesicFEADOLCStiffness
<
FEBasis
,
...
...
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