/[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 1811 by ksteube, Thu Sep 25 23:11:13 2008 UTC
# Line 1  Line 1 
1  // $Id$  
2  /*  /*******************************************************
3   ******************************************************************************  *
4   *                                                                            *  * Copyright (c) 2003-2008 by University of Queensland
5   *       COPYRIGHT  ACcESS 2004 -  All Rights Reserved                        *  * Earth Systems Science Computational Center (ESSCC)
6   *                                                                            *  * http://www.uq.edu.au/esscc
7   * This software is the property of ACcESS. No part of this code              *  *
8   * may be copied in any form or by any means without the expressed written    *  * Primary Business: Queensland, Australia
9   * consent of ACcESS.  Copying, use or modification of this software          *  * Licensed under the Open Software License version 3.0
10   * by any unauthorised person is illegal unless that person has a software    *  * http://www.opensource.org/licenses/osl-3.0.php
11   * license agreement with ACcESS.                                             *  *
12   *                                                                            *  *******************************************************/
13   ******************************************************************************  
 */  
14    
15  #include "AbstractSystemMatrix.h"  #include "AbstractSystemMatrix.h"
16  #include "DataException.h"  #include "DataException.h"
 #include "DataArrayView.h"  
17  #include "Data.h"  #include "Data.h"
18    #include "DataTypes.h"
19    
20  namespace escript {  namespace escript {
21    
# Line 61  Data AbstractSystemMatrix::vectorMultipl Line 60  Data AbstractSystemMatrix::vectorMultipl
60            throw SystemMatrixException("Error - Matrix is empty.");            throw SystemMatrixException("Error - Matrix is empty.");
61       if (right.getDataPointSize()!=getColumnBlockSize())       if (right.getDataPointSize()!=getColumnBlockSize())
62            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.");
63       DataArrayView::ShapeType shape;       DataTypes::ShapeType shape;
64       if (getRowBlockSize()>1) shape.push_back(getRowBlockSize());       if (getRowBlockSize()>1) shape.push_back(getRowBlockSize());
65    
66       Data out=Data(0.,shape,getRowFunctionSpace(),true);       Data out=Data(0.,shape,getRowFunctionSpace(),true);
# Line 83  Data AbstractSystemMatrix::solve(Data& i Line 82  Data AbstractSystemMatrix::solve(Data& i
82            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.");
83       if (in.getDataPointSize()!=getRowBlockSize())       if (in.getDataPointSize()!=getRowBlockSize())
84            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.");
85       DataArrayView::ShapeType shape;       DataTypes::ShapeType shape;
86       if (getRowBlockSize()>1) shape.push_back(getColumnBlockSize());       if (getRowBlockSize()>1) shape.push_back(getColumnBlockSize());
87       Data out=Data(0.,shape,getColumnFunctionSpace(),true);       Data out=Data(0.,shape,getColumnFunctionSpace(),true);
88       setToSolution(out,in,options);       setToSolution(out,in,options);

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

  ViewVC Help
Powered by ViewVC 1.1.26