From 7b7c798eaf91779abf078002226c14c0fb413097 Mon Sep 17 00:00:00 2001 From: deal Date: Mon, 16 Dec 2002 17:52:25 +0000 Subject: [PATCH] Add some more this-> git-svn-id: https://svn.dealii.org/trunk@6824 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/solver_bicgstab.h | 40 ++++++++++----------- deal.II/lac/include/lac/solver_richardson.h | 30 ++++++++-------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/deal.II/lac/include/lac/solver_bicgstab.h b/deal.II/lac/include/lac/solver_bicgstab.h index 2e1e93eb71..7fc9481557 100644 --- a/deal.II/lac/include/lac/solver_bicgstab.h +++ b/deal.II/lac/include/lac/solver_bicgstab.h @@ -271,7 +271,7 @@ SolverBicgstab::start(const MATRIX& A) Vp->reinit(*Vx); Vv->reinit(*Vx); *Vrbar = *Vr; - return control().check(step, res); + return this->control().check(step, res); } @@ -337,7 +337,7 @@ SolverBicgstab::iterate(const MATRIX& A, else res = r.l2_norm(); - state = control().check(step, res); + state = this->control().check(step, res); print_vectors(step, *Vx, r, y); } while (state == SolverControl::iterate); @@ -354,14 +354,14 @@ SolverBicgstab::solve(const MATRIX &A, const PRECONDITIONER& precondition) { deallog.push("Bicgstab"); - Vr = memory.alloc(); Vr->reinit(x); - Vrbar = memory.alloc(); Vrbar->reinit(x); - Vp = memory.alloc(); - Vy = memory.alloc(); Vy->reinit(x); - Vz = memory.alloc(); Vz->reinit(x); - Vs = memory.alloc(); Vs->reinit(x); - Vt = memory.alloc(); Vt->reinit(x); - Vv = memory.alloc(); + Vr = this->memory.alloc(); Vr->reinit(x); + Vrbar = this->memory.alloc(); Vrbar->reinit(x); + Vp = this->memory.alloc(); + Vy = this->memory.alloc(); Vy->reinit(x); + Vz = this->memory.alloc(); Vz->reinit(x); + Vs = this->memory.alloc(); Vs->reinit(x); + Vt = this->memory.alloc(); Vt->reinit(x); + Vv = this->memory.alloc(); Vx = &x; Vb = &b; @@ -380,22 +380,22 @@ SolverBicgstab::solve(const MATRIX &A, } while (state); - memory.free(Vr); - memory.free(Vrbar); - memory.free(Vp); - memory.free(Vy); - memory.free(Vz); - memory.free(Vs); - memory.free(Vt); - memory.free(Vv); + this->memory.free(Vr); + this->memory.free(Vrbar); + this->memory.free(Vp); + this->memory.free(Vy); + this->memory.free(Vz); + this->memory.free(Vs); + this->memory.free(Vt); + this->memory.free(Vv); deallog.pop(); // in case of failure: throw // exception if (control().last_check() != SolverControl::success) - throw SolverControl::NoConvergence (control().last_step(), - control().last_value()); + throw SolverControl::NoConvergence (this->control().last_step(), + this->control().last_value()); // otherwise exit as normal } diff --git a/deal.II/lac/include/lac/solver_richardson.h b/deal.II/lac/include/lac/solver_richardson.h index 954c1827b0..3f092e970d 100644 --- a/deal.II/lac/include/lac/solver_richardson.h +++ b/deal.II/lac/include/lac/solver_richardson.h @@ -191,8 +191,8 @@ SolverRichardson::solve (const MATRIX &A, SolverControl::State conv=SolverControl::iterate; // Memory allocation - Vr = memory.alloc(); VECTOR& r = *Vr; r.reinit(x); - Vd = memory.alloc(); VECTOR& d = *Vd; d.reinit(x); + Vr = this->memory.alloc(); VECTOR& r = *Vr; r.reinit(x); + Vd = this->memory.alloc(); VECTOR& d = *Vd; d.reinit(x); deallog.push("Richardson"); @@ -207,7 +207,7 @@ SolverRichardson::solve (const MATRIX &A, if (!additional_data.use_preconditioned_residual) { res = r.l2_norm(); - conv = control().check (iter, criterion()); + conv = this->control().check (iter, criterion()); if (conv != SolverControl::iterate) break; } @@ -216,7 +216,7 @@ SolverRichardson::solve (const MATRIX &A, if (additional_data.use_preconditioned_residual) { res = d.l2_norm(); - conv = control().check (iter, criterion()); + conv = this->control().check (iter, criterion()); if (conv != SolverControl::iterate) break; } @@ -225,16 +225,16 @@ SolverRichardson::solve (const MATRIX &A, } // Deallocate Memory - memory.free(Vr); - memory.free(Vd); + this->memory.free(Vr); + this->memory.free(Vd); deallog.pop(); // in case of failure: throw // exception - if (control().last_check() != SolverControl::success) - throw SolverControl::NoConvergence (control().last_step(), - control().last_value()); + if (this->control().last_check() != SolverControl::success) + throw SolverControl::NoConvergence (this->control().last_step(), + this->control().last_value()); // otherwise exit as normal } @@ -250,8 +250,8 @@ SolverRichardson::Tsolve (const MATRIX &A, SolverControl::State conv=SolverControl::iterate; // Memory allocation - Vr = memory.alloc(); VECTOR& r = *Vr; r.reinit(x); - Vd = memory.alloc(); VECTOR& d = *Vd; d.reinit(x); + Vr = this->memory.alloc(); VECTOR& r = *Vr; r.reinit(x); + Vd =this-> memory.alloc(); VECTOR& d = *Vd; d.reinit(x); deallog.push("RichardsonT"); @@ -264,7 +264,7 @@ SolverRichardson::Tsolve (const MATRIX &A, r.sadd(-1.,1.,b); res=r.l2_norm(); - conv = control().check (iter, criterion()); + conv = this->control().check (iter, criterion()); if (conv != SolverControl::iterate) break; @@ -280,9 +280,9 @@ SolverRichardson::Tsolve (const MATRIX &A, deallog.pop(); // in case of failure: throw // exception - if (control().last_check() != SolverControl::success) - throw SolverControl::NoConvergence (control().last_step(), - control().last_value()); + if (this->control().last_check() != SolverControl::success) + throw SolverControl::NoConvergence (this->control().last_step(), + this->control().last_value()); // otherwise exit as normal } -- 2.39.5