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
5e77dece
Commit
5e77dece
authored
3 years ago
by
podlesny
Browse files
Options
Downloads
Patches
Plain Diff
add minTau as minimal time step threshold
parent
305d06ea
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dune/tectonic/time-stepping/adaptivetimestepper.cc
+8
-1
8 additions, 1 deletion
dune/tectonic/time-stepping/adaptivetimestepper.cc
dune/tectonic/time-stepping/adaptivetimestepper.hh
+2
-0
2 additions, 0 deletions
dune/tectonic/time-stepping/adaptivetimestepper.hh
with
10 additions
and
1 deletion
dune/tectonic/time-stepping/adaptivetimestepper.cc
+
8
−
1
View file @
5e77dece
...
@@ -43,9 +43,11 @@ AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::AdaptiveTime
...
@@ -43,9 +43,11 @@ AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::AdaptiveTime
Updaters
&
current
,
Updaters
&
current
,
double
relativeTime
,
double
relativeTime
,
double
relativeTau
,
double
relativeTau
,
double
minTau
,
std
::
function
<
bool
(
Updaters
&
,
Updaters
&
)
>
mustRefine
)
std
::
function
<
bool
(
Updaters
&
,
Updaters
&
)
>
mustRefine
)
:
relativeTime_
(
relativeTime
),
:
relativeTime_
(
relativeTime
),
relativeTau_
(
relativeTau
),
relativeTau_
(
relativeTau
),
minTau_
(
minTau
),
stepBase_
(
stepBase
),
stepBase_
(
stepBase
),
contactNetwork_
(
contactNetwork
),
contactNetwork_
(
contactNetwork
),
current_
(
current
),
current_
(
current
),
...
@@ -133,6 +135,11 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::refine(U
...
@@ -133,6 +135,11 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::refine(U
const
auto
&
currentNBodyAssembler
=
contactNetwork_
.
nBodyAssembler
();
const
auto
&
currentNBodyAssembler
=
contactNetwork_
.
nBodyAssembler
();
while
(
true
)
{
while
(
true
)
{
if
(
relativeTau_
/
2.0
<=
minTau_
)
{
std
::
cout
<<
"Sufficiently refined!"
<<
std
::
endl
;
break
;
}
setDeformation
(
current_
);
setDeformation
(
current_
);
//auto F1_linearSolver = makeLinearSolver();
//auto F1_linearSolver = makeLinearSolver();
auto
F1_Step
=
Step
(
stepBase_
,
current_
,
currentNBodyAssembler
,
relativeTime_
,
relativeTau_
/
2.0
,
iterationRegister_
);
auto
F1_Step
=
Step
(
stepBase_
,
current_
,
currentNBodyAssembler
,
relativeTime_
,
relativeTau_
/
2.0
,
iterationRegister_
);
...
@@ -236,7 +243,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::determin
...
@@ -236,7 +243,7 @@ int AdaptiveTimeStepper<Factory, ContactNetwork, Updaters, ErrorNorms>::determin
F1
=
F1_Step
.
get
();
F1
=
F1_Step
.
get
();
if
(
strategy
>-
1
)
{
if
(
strategy
>-
1
&&
relativeTau_
/
2.0
>
minTau_
)
{
setDeformation
(
F1
.
updaters
);
setDeformation
(
F1
.
updaters
);
//auto F2_linearSolver = makeLinearSolver();
//auto F2_linearSolver = makeLinearSolver();
auto
&&
nBodyAssembler
=
step
(
currentNBodyAssembler
);
auto
&&
nBodyAssembler
=
step
(
currentNBodyAssembler
);
...
...
This diff is collapsed.
Click to expand it.
dune/tectonic/time-stepping/adaptivetimestepper.hh
+
2
−
0
View file @
5e77dece
...
@@ -51,6 +51,7 @@ class AdaptiveTimeStepper {
...
@@ -51,6 +51,7 @@ class AdaptiveTimeStepper {
Updaters
&
current
,
Updaters
&
current
,
double
relativeTime
,
double
relativeTime
,
double
relativeTau
,
double
relativeTau
,
double
minTau
,
std
::
function
<
bool
(
Updaters
&
,
Updaters
&
)
>
mustRefine
);
std
::
function
<
bool
(
Updaters
&
,
Updaters
&
)
>
mustRefine
);
bool
reachedEnd
();
bool
reachedEnd
();
...
@@ -59,6 +60,7 @@ class AdaptiveTimeStepper {
...
@@ -59,6 +60,7 @@ class AdaptiveTimeStepper {
double
relativeTime_
;
double
relativeTime_
;
double
relativeTau_
;
double
relativeTau_
;
const
double
minTau_
;
private:
private:
void
setDeformation
(
const
Updaters
&
updaters
);
void
setDeformation
(
const
Updaters
&
updaters
);
...
...
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