← Back to branch summary

~ubuntu-branches/ubuntu/wily/deal.ii/wily-proposed

« back to all changes in this revision

Viewing changes to deal.II/include/multigrid/mg_coarse.h

  • Committer: Bazaar Package Importer
  • Author(s): Adam C. Powell, IV, Adam C. Powell, IV, Denis Barbier
  • Date: 2010-07-29 13:47:01 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100729134701-qk60t2om7u7oklkb
Tags: 6.3.1-1
http://bugs.debian.org/562332
[ Adam C. Powell, IV ]
* Changed to source format 3.0 (quilt).
* Changed maintainer to debian-science with Adam Powell as uploader.
* Added source lintian overrides about Adam Powell's name.
* Added Vcs info on git repository.
* Bumped Standards-Version.
* Changed stamp-patch to patch target and fixed its application criterion.
* Moved make_dependencies and expand_instantiations to a versioned directory
  to avoid shlib package conflicts.

[ Denis Barbier ]
* New upstream release (closes: #562332).
  + Added libtbb support.
  + Forward-ported all patches.
* Updates for new PETSc version, including workaround for different versions
  of petsc and slepc.
* Add debian/watch.
* Update to debhelper 7.
* Added pdebuild patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
deal.II/include/multigrid/mg_coarse.h
1
1
//---------------------------------------------------------------------------
2
 
//    $Id: mg_coarse.h 15008 2007-08-21 21:28:55Z kanschat $
 
2
//    $Id: mg_coarse.h 20588 2010-02-13 04:35:56Z bangerth $
3
3
//    Version: $Name$
4
4
//
5
 
//    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 by the deal.II authors
 
5
//    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by the deal.II authors
6
6
//
7
7
//    This file is subject to QPL and may not be  distributed
8
8
//    without copyright and license information. Please refer
97
97
                                     /**
98
98
                                      * Reference to the solver.
99
99
                                      */
100
 
    SmartPointer<SOLVER> solver;
 
100
    SmartPointer<SOLVER,MGCoarseGridLACIteration<SOLVER,VECTOR> > solver;
101
101
    
102
102
                                     /**
103
103
                                      * Reference to the matrix.
128
128
 *
129
129
 * @author Guido Kanschat, 2003
130
130
 */
131
 
template<typename number, class VECTOR>
 
131
template<typename number = double, class VECTOR = Vector<number> >
132
132
class MGCoarseGridHouseholder : public MGCoarseGridBase<VECTOR>
133
133
{
134
134
  public: