Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-contact
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
agnumpde
dune-contact
Commits
5265ff52
Commit
5265ff52
authored
11 years ago
by
akbib
Committed by
akbib
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Methods level/leafView are now called level/leafGridView
[[Imported from SVN: r12637]]
parent
1f3c7451
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
nonlincontact.cc
+13
-13
13 additions, 13 deletions
nonlincontact.cc
with
13 additions
and
13 deletions
nonlincontact.cc
+
13
−
13
View file @
5265ff52
...
...
@@ -370,8 +370,8 @@ int main (int argc, char *argv[]) try
coarseDirichletValues
[
1
]
=
dirichletValues
[
1
][
0
];
array
<
LevelBoundaryPatch
,
2
>
coarseDirichletBoundary
;
coarseDirichletBoundary
[
0
].
setup
(
grid
[
0
].
levelView
(
0
));
coarseDirichletBoundary
[
1
].
setup
(
grid
[
1
].
levelView
(
0
));
coarseDirichletBoundary
[
0
].
setup
(
grid
[
0
].
level
Grid
View
(
0
));
coarseDirichletBoundary
[
1
].
setup
(
grid
[
1
].
level
Grid
View
(
0
));
readBoundaryPatch
<
GridType
>
(
coarseDirichletBoundary
[
0
],
path
+
dnFile0
);
readBoundaryPatch
<
GridType
>
(
coarseDirichletBoundary
[
1
],
path
+
dnFile1
);
...
...
@@ -514,10 +514,10 @@ int main (int argc, char *argv[]) try
array
<
Assembler
*
,
2
>
ogdenAssembler
;
P1Basis
p1BasisO
(
grid
[
0
].
leafView
());
P1Basis
p1BasisO
(
grid
[
0
].
leaf
Grid
View
());
ogdenAssembler
[
0
]
=
new
Assembler
(
p1BasisO
,
p1BasisO
);
P1Basis
p1BasisU
(
grid
[
1
].
leafView
());
P1Basis
p1BasisU
(
grid
[
1
].
leaf
Grid
View
());
ogdenAssembler
[
1
]
=
new
Assembler
(
p1BasisU
,
p1BasisU
);
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
...
...
@@ -597,8 +597,8 @@ int main (int argc, char *argv[]) try
// used by the MMG termination criterion
// //////////////////////////////////////////////////////////
// Assemble separate linear elasticity problems
P1Basis
p1Basis0
(
grid
[
0
].
leafView
());
P1Basis
p1Basis1
(
grid
[
1
].
leafView
());
P1Basis
p1Basis0
(
grid
[
0
].
leaf
Grid
View
());
P1Basis
p1Basis1
(
grid
[
1
].
leaf
Grid
View
());
OperatorAssembler
<
P1Basis
,
P1Basis
>
globalAssembler0
(
p1Basis0
,
p1Basis0
);
OperatorAssembler
<
P1Basis
,
P1Basis
>
globalAssembler1
(
p1Basis1
,
p1Basis1
);
...
...
@@ -633,12 +633,12 @@ int main (int argc, char *argv[]) try
// Output result
LeafAmiraMeshWriter
<
GridType
>
amiramesh0
;
amiramesh0
.
addLeafGrid
(
grid
[
0
],
true
);
amiramesh0
.
addVertexData
(
x
[
0
],
grid
[
0
].
leafView
());
amiramesh0
.
addVertexData
(
x
[
0
],
grid
[
0
].
leaf
Grid
View
());
amiramesh0
.
write
(
"0resultGrid"
);
LeafAmiraMeshWriter
<
GridType
>
amiramesh1
;
amiramesh1
.
addLeafGrid
(
grid
[
1
],
true
);
amiramesh1
.
addVertexData
(
x
[
1
],
grid
[
1
].
leafView
());
amiramesh1
.
addVertexData
(
x
[
1
],
grid
[
1
].
leaf
Grid
View
());
amiramesh1
.
write
(
"1resultGrid"
);
}
while
(
loadFactor
<
1
);
...
...
@@ -694,7 +694,7 @@ int main (int argc, char *argv[]) try
for
(
int
i
=
0
;
i
<
2
;
i
++
)
{
P1Basis
p1Basis
(
grid
[
i
].
leafView
());
P1Basis
p1Basis
(
grid
[
i
].
leaf
Grid
View
());
GridFunctionAdaptor
<
P1Basis
>
adaptor
(
p1Basis
,
true
,
true
);
grid
[
i
].
preAdapt
();
...
...
@@ -855,8 +855,8 @@ int main (int argc, char *argv[]) try
// used by the MMG termination criterion
// //////////////////////////////////////////////////////////
// Assemble separate linear elasticity problems
P1Basis
p1Basis0
(
grid
[
0
].
leafView
());
P1Basis
p1Basis1
(
grid
[
1
].
leafView
());
P1Basis
p1Basis0
(
grid
[
0
].
leaf
Grid
View
());
P1Basis
p1Basis1
(
grid
[
1
].
leaf
Grid
View
());
OperatorAssembler
<
P1Basis
,
P1Basis
>
globalAssembler0
(
p1Basis0
,
p1Basis0
);
OperatorAssembler
<
P1Basis
,
P1Basis
>
globalAssembler1
(
p1Basis1
,
p1Basis1
);
...
...
@@ -895,12 +895,12 @@ int main (int argc, char *argv[]) try
// ///////////////////////
LeafAmiraMeshWriter
<
GridType
>
amiramesh0
;
amiramesh0
.
addLeafGrid
(
grid
[
0
],
true
);
amiramesh0
.
addVertexData
(
x
[
0
],
grid
[
0
].
leafView
());
amiramesh0
.
addVertexData
(
x
[
0
],
grid
[
0
].
leaf
Grid
View
());
amiramesh0
.
write
(
"0resultGrid"
);
LeafAmiraMeshWriter
<
GridType
>
amiramesh1
;
amiramesh1
.
addLeafGrid
(
grid
[
1
],
true
);
amiramesh1
.
addVertexData
(
x
[
1
],
grid
[
1
].
leafView
());
amiramesh1
.
addVertexData
(
x
[
1
],
grid
[
1
].
leaf
Grid
View
());
amiramesh1
.
write
(
"1resultGrid"
);
}
...
...
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