Skip to content
Snippets Groups Projects
Commit 87a580c5 authored by Christian Engwer's avatar Christian Engwer
Browse files

avoid _A and _L to make dune BSD compatible

use rpc/rpc.h instead of rpc/xdr.h

[[Imported from SVN: r107]]
parent a9b195b4
Branches
Tags
No related merge requests found
......@@ -115,29 +115,29 @@ namespace Dune {
typedef typename X::field_type field_type;
//! constructor: just store a reference to a matrix
MatrixAdapter (const M& A) : _A(A) {}
MatrixAdapter (const M& A) : _A_(A) {}
//! apply operator to x: \f$ y = A(x) \f$
virtual void apply (const X& x, Y& y) const
{
y = 0;
_A.umv(x,y);
_A_.umv(x,y);
}
//! apply operator to x, scale and add: \f$ y = y + \alpha A(x) \f$
virtual void applyscaleadd (field_type alpha, const X& x, Y& y) const
{
_A.usmv(alpha,x,y);
_A_.usmv(alpha,x,y);
}
//! get matrix via *
virtual const M& getmat () const
{
return _A;
return _A_;
}
private:
const M& _A;
const M& _A_;
};
/** @} end documentation */
......
......@@ -119,7 +119,7 @@ namespace Dune {
//! constructor gets all parameters to operate the prec.
SeqSSOR (const M& A, int n, field_type w)
: _A(A), _n(n), _w(w)
: _A_(A), _n(n), _w(w)
{ }
//! prepare: nothing to do here
......@@ -130,8 +130,8 @@ namespace Dune {
{
for (int i=0; i<_n; i++)
{
bsorf(_A,v,d,_w);
bsorb(_A,v,d,_w);
bsorf(_A_,v,d,_w);
bsorb(_A_,v,d,_w);
}
}
......@@ -152,7 +152,7 @@ namespace Dune {
virtual void post (X& x) {}
private:
const M& _A; // my matrix to operate on
const M& _A_; // my matrix to operate on
int _n; // number of iterations
field_type _w; // relaxation factor
};
......@@ -172,7 +172,7 @@ namespace Dune {
//! constructor gets all parameters to operate the prec.
SeqSOR (const M& A, int n, field_type w)
: _A(A), _n(n), _w(w)
: _A_(A), _n(n), _w(w)
{ }
//! prepare: nothing to do here
......@@ -183,7 +183,7 @@ namespace Dune {
{
for (int i=0; i<_n; i++)
{
bsorf(_A,v,d,_w);
bsorf(_A_,v,d,_w);
}
}
......@@ -204,7 +204,7 @@ namespace Dune {
virtual void post (X& x) {}
private:
const M& _A; // my matrix to operate on
const M& _A_; // my matrix to operate on
int _n; // number of iterations
field_type _w; // relaxation factor
};
......@@ -224,7 +224,7 @@ namespace Dune {
//! constructor gets all parameters to operate the prec.
SeqGS (const M& A, int n, field_type w)
: _A(A), _n(n), _w(w)
: _A_(A), _n(n), _w(w)
{ }
//! prepare: nothing to do here
......@@ -235,7 +235,7 @@ namespace Dune {
{
for (int i=0; i<_n; i++)
{
dbgs(_A,v,d,_w);
dbgs(_A_,v,d,_w);
}
}
......@@ -256,7 +256,7 @@ namespace Dune {
virtual void post (X& x) {}
private:
const M& _A; // my matrix to operate on
const M& _A_; // my matrix to operate on
int _n; // number of iterations
field_type _w; // relaxation factor
};
......@@ -276,7 +276,7 @@ namespace Dune {
//! constructor gets all parameters to operate the prec.
SeqJac (const M& A, int n, field_type w)
: _A(A), _n(n), _w(w)
: _A_(A), _n(n), _w(w)
{ }
//! prepare: nothing to do here
......@@ -287,7 +287,7 @@ namespace Dune {
{
for (int i=0; i<_n; i++)
{
dbjac(_A,v,d,_w);
dbjac(_A_,v,d,_w);
}
}
......@@ -308,7 +308,7 @@ namespace Dune {
virtual void post (X& x) {}
private:
const M& _A; // my matrix to operate on
const M& _A_; // my matrix to operate on
int _n; // number of iterations
field_type _w; // relaxation factor
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment