Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-tectonic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
podlesny
dune-tectonic
Commits
af4b7fb3
Commit
af4b7fb3
authored
11 years ago
by
Elias Pipping
Browse files
Options
Downloads
Patches
Plain Diff
[Cleanup] Assemble a GlobalRuinaNonlinearity
parent
093c3102
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/assemblers.cc
+1
-3
1 addition, 3 deletions
src/assemblers.cc
src/assemblers.hh
+2
-2
2 additions, 2 deletions
src/assemblers.hh
with
3 additions
and
5 deletions
src/assemblers.cc
+
1
−
3
View file @
af4b7fb3
...
@@ -15,8 +15,6 @@
...
@@ -15,8 +15,6 @@
#include
<dune/fufem/assemblers/localassemblers/viscosityassembler.hh>
#include
<dune/fufem/assemblers/localassemblers/viscosityassembler.hh>
#include
<dune/fufem/assemblers/localassemblers/vonmisesstressassembler.hh>
#include
<dune/fufem/assemblers/localassemblers/vonmisesstressassembler.hh>
#include
<dune/tectonic/globalruinanonlinearity.hh>
#include
"assemblers.hh"
#include
"assemblers.hh"
template
<
class
GridView
,
int
dimension
>
template
<
class
GridView
,
int
dimension
>
...
@@ -95,7 +93,7 @@ void MyAssembler<GridView, dimension>::assembleNeumann(
...
@@ -95,7 +93,7 @@ void MyAssembler<GridView, dimension>::assembleNeumann(
template
<
class
GridView
,
int
dimension
>
template
<
class
GridView
,
int
dimension
>
auto
MyAssembler
<
GridView
,
dimension
>::
assembleFrictionNonlinearity
(
auto
MyAssembler
<
GridView
,
dimension
>::
assembleFrictionNonlinearity
(
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
FrictionData
const
&
fd
)
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
FrictionData
const
&
fd
)
->
std
::
shared_ptr
<
GlobalNonlinearity
<
Matrix
,
Vector
>>
{
->
std
::
shared_ptr
<
Global
Ruina
Nonlinearity
<
Matrix
,
Vector
>>
{
// Lump negative normal stress (kludge)
// Lump negative normal stress (kludge)
ScalarVector
weights
;
ScalarVector
weights
;
{
{
...
...
This diff is collapsed.
Click to expand it.
src/assemblers.hh
+
2
−
2
View file @
af4b7fb3
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
#pragma clang diagnostic pop
#pragma clang diagnostic pop
#include
<dune/fufem/functionspacebases/p1nodalbasis.hh>
#include
<dune/fufem/functionspacebases/p1nodalbasis.hh>
#include
<dune/tectonic/globalnonlinearity.hh>
#include
<dune/tectonic/global
ruina
nonlinearity.hh>
template
<
class
GridView
,
int
dimension
>
class
MyAssembler
{
template
<
class
GridView
,
int
dimension
>
class
MyAssembler
{
public:
public:
...
@@ -62,7 +62,7 @@ template <class GridView, int dimension> class MyAssembler {
...
@@ -62,7 +62,7 @@ template <class GridView, int dimension> class MyAssembler {
Dune
::
VirtualFunction
<
double
,
double
>
const
&
neumann
,
Dune
::
VirtualFunction
<
double
,
double
>
const
&
neumann
,
double
relativeTime
);
double
relativeTime
);
std
::
shared_ptr
<
GlobalNonlinearity
<
Matrix
,
Vector
>>
std
::
shared_ptr
<
Global
Ruina
Nonlinearity
<
Matrix
,
Vector
>>
assembleFrictionNonlinearity
(
assembleFrictionNonlinearity
(
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
BoundaryPatch
<
GridView
>
const
&
frictionalBoundary
,
FrictionData
const
&
fd
);
FrictionData
const
&
fd
);
...
...
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