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
2ae05147
Commit
2ae05147
authored
11 years ago
by
Elias Pipping
Committed by
Elias Pipping
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[Algorit] Use default for the bisection
parent
f0c38e31
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dune/tectonic/myblockproblem.hh
+2
-7
2 additions, 7 deletions
dune/tectonic/myblockproblem.hh
src/one-body-sample.parset
+0
-4
0 additions, 4 deletions
src/one-body-sample.parset
src/state/compute_state_dieterich_euler.cc
+1
-1
1 addition, 1 deletion
src/state/compute_state_dieterich_euler.cc
with
3 additions
and
12 deletions
dune/tectonic/myblockproblem.hh
+
2
−
7
View file @
2ae05147
...
...
@@ -61,12 +61,7 @@ template <class ConvexProblemTypeTEMPLATE> class MyBlockProblem {
MyBlockProblem
(
Dune
::
ParameterTree
const
&
parset
,
ConvexProblemType
const
&
problem
)
:
parset
(
parset
),
problem
(
problem
)
{
bisection
=
Bisection
(
0.0
,
// acceptError: Stop if the search interval has
// become smaller than this number
parset
.
get
<
double
>
(
"bisection.acceptFactor"
),
parset
.
get
<
double
>
(
"bisection.requiredResidual"
),
true
,
// fastQuadratic
0
);
// acceptance factor for inexact minimization
bisection
=
Bisection
();
}
std
::
string
getOutput
(
bool
header
=
false
)
const
{
...
...
@@ -113,7 +108,7 @@ template <class ConvexProblemTypeTEMPLATE> class MyBlockProblem {
return
0
;
int
bisectionsteps
=
0
;
Bisection
bisection
(
0.0
,
1.0
,
1e-12
,
true
,
0
);
// TODO
Bisection
bisection
;
return
bisection
.
minimize
(
psi
,
vnorm
,
0.0
,
bisectionsteps
)
/
vnorm
;
// TODO
}
...
...
This diff is collapsed.
Click to expand it.
src/one-body-sample.parset
+
0
−
4
View file @
2ae05147
...
...
@@ -45,10 +45,6 @@ post = 0
[
localsolver
]
steps
=
1
[
bisection
]
acceptFactor
=
1
.
0
requiredResidual
=
1
e
-
12
[
boundary
.
friction
]
mu0
=
0
.
6
mumin
=
0
.
0
...
...
This diff is collapsed.
Click to expand it.
src/state/compute_state_dieterich_euler.cc
+
1
−
1
View file @
2ae05147
...
...
@@ -16,7 +16,7 @@ double state_update_dieterich_euler_bisection(double tau, double VoL,
1.0
/
tau
,
old_state
/
tau
,
phi
,
start
,
direction
);
int
bisectionsteps
=
0
;
Bisection
const
bisection
(
0.0
,
1.0
,
1e-12
,
true
,
0
);
// TODO
Bisection
const
bisection
;
return
bisection
.
minimize
(
J
,
0.0
,
0.0
,
bisectionsteps
);
// TODO
}
...
...
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