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
afb56554
Commit
afb56554
authored
6 years ago
by
Jonathan Youett
Browse files
Options
Downloads
Patches
Plain Diff
Minor cleanup
parent
adb5aff6
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
dune/contact/solvers/filtermultigridsolver.cc
+5
-5
5 additions, 5 deletions
dune/contact/solvers/filtermultigridsolver.cc
with
5 additions
and
5 deletions
dune/contact/solvers/filtermultigridsolver.cc
+
5
−
5
View file @
afb56554
...
@@ -78,8 +78,8 @@ void FilterMultigridContactSolver<ProblemType>::solve()
...
@@ -78,8 +78,8 @@ void FilterMultigridContactSolver<ProblemType>::solve()
int
it
(
0
);
int
it
(
0
);
// Loop until desired tolerance or maximum number of iterations is reached
// Loop until desired tolerance or maximum number of iterations is reached
for
(;
it
<
this
->
maxIterations_
and
(
error
>
this
->
tolerance_
or
std
::
isnan
(
error
))
and
for
(;
it
<
this
->
maxIterations_
and
(
error
>
this
->
tolerance_
or
std
::
isnan
(
error
))
and
(
crit
>
critTol_
)
;
it
++
)
{
(
crit
>
critTol_
)
;
++
it
)
{
Dune
::
Timer
iterationTimer
;
Dune
::
Timer
iterationTimer
;
...
@@ -94,7 +94,7 @@ void FilterMultigridContactSolver<ProblemType>::solve()
...
@@ -94,7 +94,7 @@ void FilterMultigridContactSolver<ProblemType>::solve()
std
::
cout
<<
"Trust--region radius: "
<<
trustRegion
<<
"
\n
"
;
std
::
cout
<<
"Trust--region radius: "
<<
trustRegion
<<
"
\n
"
;
// Measure norm of the old iterate
// Measure norm of the old iterate
field_type
oldNorm
(
0
)
;
field_type
oldNorm
{
0
}
;
for
(
size_t
i
=
0
;
i
<
iterates
.
size
();
i
++
)
for
(
size_t
i
=
0
;
i
<
iterates
.
size
();
i
++
)
oldNorm
+=
(
*
errorNorms_
[
i
])(
iterates
[
i
]);
oldNorm
+=
(
*
errorNorms_
[
i
])(
iterates
[
i
]);
...
@@ -207,8 +207,8 @@ void FilterMultigridContactSolver<ProblemType>::solve()
...
@@ -207,8 +207,8 @@ void FilterMultigridContactSolver<ProblemType>::solve()
newInfeasibility
=
std
::
max
(
newInfeasibility
,
std
::
fabs
(
dirichletValues_
[
i
][
j
]
-
correction_
[
i
][
j
]));
newInfeasibility
=
std
::
max
(
newInfeasibility
,
std
::
fabs
(
dirichletValues_
[
i
][
j
]
-
correction_
[
i
][
j
]));
if
(
this
->
verbosity_
==
Solver
::
FULL
)
if
(
this
->
verbosity_
==
Solver
::
FULL
)
std
::
cout
<<
"New energy of potential iterate "
<<
newEnergy
<<
std
::
cout
<<
"New energy of potential iterate "
<<
newEnergy
<<
" and infeasibility "
<<
newInfeasibility
<<
std
::
endl
;
" and infeasibility "
<<
newInfeasibility
<<
std
::
endl
;
field_type
infNorm
=
this
->
correction_
.
infinity_norm
();
field_type
infNorm
=
this
->
correction_
.
infinity_norm
();
if
(
!
std
::
isfinite
(
newEnergy
))
{
if
(
!
std
::
isfinite
(
newEnergy
))
{
...
...
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