~njansson/dolfin/hpc

« back to all changes in this revision

Viewing changes to dolfin/la/uBlasMatrix.h

  • Committer: Garth N. Wells
  • Date: 2008-05-18 16:18:26 UTC
  • mfrom: (2668.2.1 trunk)
  • mto: (2668.7.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2670.
  • Revision ID: gnw20@cam.ac.uk-20080518161826-rb28aps5hkd304zh
merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
// Modified by Martin Sandve Alnes, 2008.
8
8
//
9
9
// First added:  2006-07-05
10
 
// Last changed: 2008-05-15
 
10
// Last changed: 2008-05-18
11
11
 
12
12
#ifndef __UBLAS_MATRIX_H
13
13
#define __UBLAS_MATRIX_H
21
21
#include "LinearAlgebraFactory.h"
22
22
#include "SparsityPattern.h"
23
23
#include "ublas.h"
 
24
#include "uBlasFactory.h"
24
25
#include "uBlasVector.h"
25
26
#include "uBlasLUSolver.h"
26
27
#include "GenericMatrix.h"
28
29
namespace dolfin
29
30
{
30
31
 
 
32
  // Forward declarations
31
33
  class uBlasVector;
 
34
  template< class T> class uBlasFactory;
 
35
 
32
36
  namespace ublas = boost::numeric::ublas;
33
37
 
34
38
  /// This class provides a simple matrix class based on uBLAS.
125
129
    //--- Special functions ---
126
130
 
127
131
    /// Return linear algebra backend factory
128
 
    virtual LinearAlgebraFactory& factory() const;
 
132
    virtual LinearAlgebraFactory& factory() const
 
133
    { return uBlasFactory<Mat>::instance(); }
129
134
 
130
135
    //--- Special uBLAS functions ---
131
136