*** Wartungsfenster jeden ersten Mittwoch vormittag im Monat ***

Skip to content
Snippets Groups Projects
Commit a13ab022 authored by Innerberger, Michael's avatar Innerberger, Michael
Browse files

Rename smoothers

parent a4f62214
No related branches found
No related tags found
No related merge requests found
......@@ -33,15 +33,15 @@ switch class
end
case {"", "additiveSchwarzLowOrder"}
if order == 1
preconditioner = OptimalMLAdditiveSchwarz(P1JacobiSmoother(fes, blf, P));
preconditioner = OptimalMLAdditiveSchwarz(P1JacobiCascade(fes, blf, P));
else
preconditioner = OptimalMLAdditiveSchwarz(JacobiLowOrderCascadeSmoother(fes, blf));
preconditioner = OptimalMLAdditiveSchwarz(JacobiLowOrderCascade(fes, blf));
end
case "additiveSchwarzHighOrder"
if order == 1
preconditioner = OptimalMLAdditiveSchwarz(P1JacobiSmoother(fes, blf, P));
preconditioner = OptimalMLAdditiveSchwarz(P1JacobiCascade(fes, blf, P));
else
preconditioner = OptimalMLAdditiveSchwarz(JacobiHighOrderCascadeSmoother(fes, blf, P));
preconditioner = OptimalMLAdditiveSchwarz(JacobiHighOrderCascade(fes, blf, P));
end
otherwise
error('No PCG variant %s!', variant)
......@@ -53,15 +53,15 @@ switch class
switch variant
case {"", "lowOrderVcycle"}
if order == 1
smoother = P1JacobiSmoother(fes, blf, P);
smoother = P1JacobiCascade(fes, blf, P);
else
smoother = JacobiLowOrderCascadeSmoother(fes, blf);
smoother = JacobiLowOrderCascade(fes, blf);
end
case "highOrderVcycle"
if order == 1
smoother = P1JacobiSmoother(fes, blf, P);
smoother = P1JacobiCascade(fes, blf, P);
else
smoother = JacobiHighOrderCascadeSmoother(fes, blf, P);
smoother = JacobiHighOrderCascade(fes, blf, P);
end
otherwise
error('No multigrid variant %s!', variant)
......
% JacobiHighOrderCascadeSmoother (subclass of MultilevelSmoother) multilevel
% JacobiHighOrderCascade (subclass of MultilevelSmoother) multilevel
% Jacobi smoother for higher order finite elements: smooth locally with
% patchwise stiffness matrix on changed patches on every level, except for
% coarsest level, where global p1-solving is done. Because of the lifting from
......@@ -11,7 +11,7 @@
% See also: MultilevelSmoother, OptimalVcycleMultigridSolver
classdef JacobiHighOrderCascadeSmoother < MultilevelSmoother
classdef JacobiHighOrderCascade < MultilevelSmoother
properties (Access=protected)
P
loFes
......@@ -24,7 +24,7 @@ classdef JacobiHighOrderCascadeSmoother < MultilevelSmoother
%% methods
methods (Access=public)
function obj = JacobiHighOrderCascadeSmoother(fes, blf, P)
function obj = JacobiHighOrderCascade(fes, blf, P)
obj = obj@MultilevelSmoother(fes, blf);
assert(fes.finiteElement.order > 1, ...
......
% JacobiLowOrderCascadeSmoother (subclass of MultilevelSmoother) multilevel
% JacobiLowOrderCascade (subclass of MultilevelSmoother) multilevel
% Jacobi smoother for higher order finite elements: smooth locally with
% diagonal of P1 stiffness matrix on changed patches on every level, except
% for finest level, where global patchwise higher order smoothing is done.
......@@ -9,7 +9,7 @@
% See also: MultilevelSmoother, OptimalVcycleMultigridSolver
classdef JacobiLowOrderCascadeSmoother < MultilevelSmoother
classdef JacobiLowOrderCascade < MultilevelSmoother
properties (Access=protected)
P
loFes
......@@ -23,7 +23,7 @@ classdef JacobiLowOrderCascadeSmoother < MultilevelSmoother
%% methods
methods (Access=public)
function obj = JacobiLowOrderCascadeSmoother(fes, blf)
function obj = JacobiLowOrderCascade(fes, blf)
obj = obj@MultilevelSmoother(fes, blf);
assert(fes.finiteElement.order > 1, ...
......
% P1JacobiSmoother (subclass of MultilevelSmoother) multilevel Jacobi smoother
% P1JacobiCascade (subclass of MultilevelSmoother) multilevel Jacobi smoother
% for lowest order finite elements: smooth with diagonal of stiffness matrix
% on changed patches on every level.
%
% See also: MultilevelSmoother, OptimalVcycleMultigridSolver
classdef P1JacobiSmoother < MultilevelSmoother
classdef P1JacobiCascade < MultilevelSmoother
properties (Access=protected)
P
inverseDiagonal
......@@ -21,7 +21,7 @@ classdef P1JacobiSmoother < MultilevelSmoother
%% methods
methods (Access=public)
function obj = P1JacobiSmoother(fes, blf, P)
function obj = P1JacobiCascade(fes, blf, P)
arguments
fes
blf
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment