]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add some more this->
authordeal <deal@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 16 Dec 2002 17:52:25 +0000 (17:52 +0000)
committerdeal <deal@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 16 Dec 2002 17:52:25 +0000 (17:52 +0000)
git-svn-id: https://svn.dealii.org/trunk@6824 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/solver_bicgstab.h
deal.II/lac/include/lac/solver_richardson.h

index 2e1e93eb710f88945ac4ae1923f7791aaf2fe209..7fc94815576eb7021306874729db15cac8779b2b 100644 (file)
@@ -271,7 +271,7 @@ SolverBicgstab<VECTOR>::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<VECTOR>::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<VECTOR>::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<VECTOR>::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
 }
 
index 954c1827b0921469c6e0395d08ea618ca6c6cb0f..3f092e970db43b2666b44655fcfe1ac7e9cb2f38 100644 (file)
@@ -191,8 +191,8 @@ SolverRichardson<VECTOR>::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<VECTOR>::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<VECTOR>::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<VECTOR>::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<VECTOR>::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<VECTOR>::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<VECTOR>::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
 }
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.