/[escript]/trunk/finley/test/SystemMatrixAdapter/SystemMatrixAdapterTestCase.cpp
ViewVC logotype

Diff of /trunk/finley/test/SystemMatrixAdapter/SystemMatrixAdapterTestCase.cpp

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

revision 97 by jgs, Tue Dec 14 05:39:33 2004 UTC revision 100 by jgs, Wed Dec 15 03:48:48 2004 UTC
# Line 1  Line 1 
 // $Id$  
1  /*  /*
2   *****************************************************************************   *****************************************************************************
3   *                                                                           *   *                                                                           *
# Line 12  Line 11 
11   *                                                                           *   *                                                                           *
12   *****************************************************************************   *****************************************************************************
13  */  */
 #include "finley/CPPAdapter/MeshAdapter.h"  
 #include "finley/CPPAdapter/MeshAdapterFactory.h"  
 #include "escript/Data/AbstractContinuousDomain.h"  
14  #include "finley/CPPAdapter/SystemMatrixAdapter.h"  #include "finley/CPPAdapter/SystemMatrixAdapter.h"
15  #include "finley/CPPAdapter/FinleyAdapterException.h"  #include "finley/CPPAdapter/FinleyAdapterException.h"
16  #include "finley/CPPAdapter/FinleyError.h"  #include "finley/CPPAdapter/FinleyError.h"
# Line 30  using namespace finley; Line 26  using namespace finley;
26    
27  static Finley_Mesh *mesh;  static Finley_Mesh *mesh;
28  static Finley_SystemMatrix *system_matrix;  static Finley_SystemMatrix *system_matrix;
 static Finley_SystemMatrixPattern *matrix_pattern;  
29    
30  static Finley_SystemMatrixType type;  static Finley_SystemMatrixType type;
31    
# Line 51  void SystemMatrixAdapterTestCase::setUp( Line 46  void SystemMatrixAdapterTestCase::setUp(
46    
47    mesh = Finley_Mesh_alloc("foo", 2, 1);    mesh = Finley_Mesh_alloc("foo", 2, 1);
48    
49    type = CSR;    type = UNKNOWN;
50    
51    symmetric = 0;    symmetric = 0;
52    
# Line 61  void SystemMatrixAdapterTestCase::setUp( Line 56  void SystemMatrixAdapterTestCase::setUp(
56    reduce_row_order = 0;    reduce_row_order = 0;
57    reduce_col_order = 0;    reduce_col_order = 0;
58    
59    matrix_pattern = Finley_getPattern(mesh, reduce_row_order, reduce_col_order);    system_matrix = Finley_SystemMatrix_alloc(mesh, type, symmetric, row_blocksize, reduce_row_order, column_blocksize, reduce_col_order);
   system_matrix = Finley_SystemMatrix_alloc(type,matrix_pattern,row_blocksize, column_blocksize);  
60    
61  }  }
62    

Legend:
Removed from v.97  
changed lines
  Added in v.100

  ViewVC Help
Powered by ViewVC 1.1.26