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
77dc60fe
Commit
77dc60fe
authored
7 years ago
by
podlesny
Browse files
Options
Downloads
Patches
Plain Diff
.
parent
3f238e86
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/spatial-solving/solverfactory.cc
+5
-5
5 additions, 5 deletions
src/spatial-solving/solverfactory.cc
src/spatial-solving/solverfactory.hh
+4
-4
4 additions, 4 deletions
src/spatial-solving/solverfactory.hh
with
9 additions
and
9 deletions
src/spatial-solving/solverfactory.cc
+
5
−
5
View file @
77dc60fe
...
@@ -21,13 +21,13 @@ SolverFactory<dim, BlockProblem, DeformedGrid>::SolverFactory(
...
@@ -21,13 +21,13 @@ SolverFactory<dim, BlockProblem, DeformedGrid>::SolverFactory(
parset
.
get
<
double
>
(
"linear.tolerance"
),
&
baseEnergyNorm
,
parset
.
get
<
double
>
(
"linear.tolerance"
),
&
baseEnergyNorm
,
Solver
::
QUIET
),
Solver
::
QUIET
),
transferOperators
(
grid
.
maxLevel
()),
transferOperators
(
grid
.
maxLevel
()),
multigridStep
(
multigridStep
(
std
::
make_shared
<
Step
>
(
linearIterationStep
,
nonlinearSmoother
))
{
std
::
make_shared
<
Step
>
(
linearIterationStep
,
nonlinearSmoother
))
{
// linear iteration step
// linear iteration step
linearIterationStep
.
setMGType
(
parset
.
get
<
int
>
(
"linear.cycle"
),
linearIterationStep
.
setMGType
(
parset
.
get
<
int
>
(
"linear.cycle"
),
parset
.
get
<
int
>
(
"linear.pre"
),
parset
.
get
<
int
>
(
"linear.pre"
),
parset
.
get
<
int
>
(
"linear.post"
));
parset
.
get
<
int
>
(
"linear.post"
));
linearIterationStep
.
basesolver_
=
&
linearBaseSolver
;
//
linearIterationStep.basesolver_ = &linearBaseSolver;
linearIterationStep
.
setSmoother
(
&
linearPresmoother
,
&
linearPostsmoother
);
linearIterationStep
.
setSmoother
(
&
linearPresmoother
,
&
linearPostsmoother
);
// transfer operators
// transfer operators
...
@@ -38,9 +38,9 @@ SolverFactory<dim, BlockProblem, DeformedGrid>::SolverFactory(
...
@@ -38,9 +38,9 @@ SolverFactory<dim, BlockProblem, DeformedGrid>::SolverFactory(
linearIterationStep
.
setTransferOperators
(
transferOperators
);
linearIterationStep
.
setTransferOperators
(
transferOperators
);
// tnnmg iteration step
// tnnmg iteration step
multigridStep
->
setSmoothingSteps
(
parset
.
get
<
int
>
(
"main.pre"
),
/*
multigridStep->setSmoothingSteps(parset.get<int>("main.pre"),
parset.get<int>("main.multi"),
parset.get<int>("main.multi"),
parset
.
get
<
int
>
(
"main.post"
));
parset.get<int>("main.post"));
*/
multigridStep
->
ignoreNodes_
=
&
ignoreNodes
;
multigridStep
->
ignoreNodes_
=
&
ignoreNodes
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/spatial-solving/solverfactory.hh
+
4
−
4
View file @
77dc60fe
...
@@ -10,9 +10,9 @@
...
@@ -10,9 +10,9 @@
#include
<dune/solvers/solvers/loopsolver.hh>
#include
<dune/solvers/solvers/loopsolver.hh>
#include
<dune/solvers/transferoperators/compressedmultigridtransfer.hh>
#include
<dune/solvers/transferoperators/compressedmultigridtransfer.hh>
#include
<dune/tnnmg/iterationsteps/genericnonlineargs.hh>
#include
<dune/tnnmg/iterationsteps/genericnonlineargs.hh>
#include
<dune/tnnmg/iterationsteps/tnnmgstep.hh>
//
#include <dune/tnnmg/iterationsteps/tnnmgstep.hh>
#define USE_OLD_TNNMG
#define USE_OLD_TNNMG
//needed for old bisection.hh in tnnmg
template
<
size_t
dim
,
class
BlockProblemTEMPLATE
,
class
DeformedGridTEMPLATE
>
template
<
size_t
dim
,
class
BlockProblemTEMPLATE
,
class
DeformedGridTEMPLATE
>
class
SolverFactory
{
class
SolverFactory
{
...
@@ -28,8 +28,8 @@ class SolverFactory {
...
@@ -28,8 +28,8 @@ class SolverFactory {
using
NonlinearSmoother
=
GenericNonlinearGS
<
BlockProblem
>
;
using
NonlinearSmoother
=
GenericNonlinearGS
<
BlockProblem
>
;
public:
public:
using
Step
=
using
Step
=
NonlinearSmoother
;
TruncatedNonsmoothNewtonMultigrid
<
BlockProblem
,
NonlinearSmoother
>
;
//
TruncatedNonsmoothNewtonMultigrid<BlockProblem, NonlinearSmoother>;
SolverFactory
(
Dune
::
ParameterTree
const
&
parset
,
const
DeformedGrid
&
grid
,
SolverFactory
(
Dune
::
ParameterTree
const
&
parset
,
const
DeformedGrid
&
grid
,
Dune
::
BitSetVector
<
dim
>
const
&
ignoreNodes
);
Dune
::
BitSetVector
<
dim
>
const
&
ignoreNodes
);
...
...
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