/[escript]/trunk/escript/src/AbstractSystemMatrix.cpp
ViewVC logotype

Diff of /trunk/escript/src/AbstractSystemMatrix.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 480 by jgs, Wed Feb 1 05:15:12 2006 UTC revision 1796 by jfenwick, Wed Sep 17 01:45:46 2008 UTC
# Line 1  Line 1 
1  // $Id$  
2  /*  /* $Id$ */
3   ******************************************************************************  
4   *                                                                            *  /*******************************************************
5   *       COPYRIGHT  ACcESS 2004 -  All Rights Reserved                        *   *
6   *                                                                            *   *           Copyright 2003-2007 by ACceSS MNRF
7   * This software is the property of ACcESS. No part of this code              *   *       Copyright 2007 by University of Queensland
8   * may be copied in any form or by any means without the expressed written    *   *
9   * consent of ACcESS.  Copying, use or modification of this software          *   *                http://esscc.uq.edu.au
10   * by any unauthorised person is illegal unless that person has a software    *   *        Primary Business: Queensland, Australia
11   * license agreement with ACcESS.                                             *   *  Licensed under the Open Software License version 3.0
12   *                                                                            *   *     http://www.opensource.org/licenses/osl-3.0.php
13   ******************************************************************************   *
14  */   *******************************************************/
15    
16  #include "AbstractSystemMatrix.h"  #include "AbstractSystemMatrix.h"
17  #include "DataException.h"  #include "DataException.h"
 #include "DataArrayView.h"  
18  #include "Data.h"  #include "Data.h"
19    #include "DataTypes.h"
20    
21  namespace escript {  namespace escript {
22    
# Line 61  Data AbstractSystemMatrix::vectorMultipl Line 61  Data AbstractSystemMatrix::vectorMultipl
61            throw SystemMatrixException("Error - Matrix is empty.");            throw SystemMatrixException("Error - Matrix is empty.");
62       if (right.getDataPointSize()!=getColumnBlockSize())       if (right.getDataPointSize()!=getColumnBlockSize())
63            throw SystemMatrixException("Error - column block size and input data size do not match.");            throw SystemMatrixException("Error - column block size and input data size do not match.");
64       DataArrayView::ShapeType shape;       DataTypes::ShapeType shape;
65       if (getRowBlockSize()>1) shape.push_back(getRowBlockSize());       if (getRowBlockSize()>1) shape.push_back(getRowBlockSize());
66    
67       Data out=Data(0.,shape,getRowFunctionSpace(),true);       Data out=Data(0.,shape,getRowFunctionSpace(),true);
# Line 83  Data AbstractSystemMatrix::solve(Data& i Line 83  Data AbstractSystemMatrix::solve(Data& i
83            throw SystemMatrixException("Error - row function space and function space of right hand side do not match.");            throw SystemMatrixException("Error - row function space and function space of right hand side do not match.");
84       if (in.getDataPointSize()!=getRowBlockSize())       if (in.getDataPointSize()!=getRowBlockSize())
85            throw SystemMatrixException("Error - row block size and right hand side size do not match.");            throw SystemMatrixException("Error - row block size and right hand side size do not match.");
86       DataArrayView::ShapeType shape;       DataTypes::ShapeType shape;
87       if (getRowBlockSize()>1) shape.push_back(getColumnBlockSize());       if (getRowBlockSize()>1) shape.push_back(getColumnBlockSize());
88       Data out=Data(0.,shape,getColumnFunctionSpace(),true);       Data out=Data(0.,shape,getColumnFunctionSpace(),true);
89       setToSolution(out,in,options);       setToSolution(out,in,options);

Legend:
Removed from v.480  
changed lines
  Added in v.1796

  ViewVC Help
Powered by ViewVC 1.1.26