/[escript]/branches/symbolic_from_3470/paso/src/SystemMatrix.c
ViewVC logotype

Diff of /branches/symbolic_from_3470/paso/src/SystemMatrix.c

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

revision 3867 by caltinay, Tue Jan 31 04:55:05 2012 UTC revision 3868 by caltinay, Thu Mar 15 06:07:08 2012 UTC
# Line 77  Paso_SystemMatrix* Paso_SystemMatrix_all Line 77  Paso_SystemMatrix* Paso_SystemMatrix_all
77       out->remote_coupleBlock=NULL;       out->remote_coupleBlock=NULL;
78       out->is_balanced=FALSE;       out->is_balanced=FALSE;
79       out->balance_vector=NULL;       out->balance_vector=NULL;
80         out->global_id=NULL;
81       out->solver_package=PASO_PASO;         out->solver_package=PASO_PASO;  
82       out->solver_p=NULL;         out->solver_p=NULL;  
83       out->trilinos_data=NULL;       out->trilinos_data=NULL;
# Line 123  Paso_SystemMatrix* Paso_SystemMatrix_all Line 124  Paso_SystemMatrix* Paso_SystemMatrix_all
124           }           }
125       }       }
126       if (Esys_noError()) {       if (Esys_noError()) {
127          out->block_size=out->row_block_size*out->col_block_size;      if (type & MATRIX_FORMAT_DIAGONAL_BLOCK) {
128          out->block_size=MIN(out->row_block_size,out->col_block_size);
129        } else {
130              out->block_size=out->row_block_size*out->col_block_size;
131        }
132          out->col_coupler=Paso_Coupler_alloc(out->pattern->col_connector,out->col_block_size);          out->col_coupler=Paso_Coupler_alloc(out->pattern->col_connector,out->col_block_size);
133          out->row_coupler=Paso_Coupler_alloc(out->pattern->row_connector,out->row_block_size);          out->row_coupler=Paso_Coupler_alloc(out->pattern->row_connector,out->row_block_size);
134          /* this should be bypassed if trilinos is used */          /* this should be bypassed if trilinos is used */
# Line 185  void Paso_SystemMatrix_free(Paso_SystemM Line 190  void Paso_SystemMatrix_free(Paso_SystemM
190      Paso_SparseMatrix_free(in->remote_coupleBlock);      Paso_SparseMatrix_free(in->remote_coupleBlock);
191            
192      MEMFREE(in->balance_vector);      MEMFREE(in->balance_vector);
193            if (in->global_id) MEMFREE(in->global_id);
194          #ifdef TRILINOS          #ifdef TRILINOS
195          Paso_TRILINOS_free(in->trilinos_data);          Paso_TRILINOS_free(in->trilinos_data);
196          #endif          #endif

Legend:
Removed from v.3867  
changed lines
  Added in v.3868

  ViewVC Help
Powered by ViewVC 1.1.26