/[escript]/trunk/paso/src/SystemMatrix_mergeMainAndCouple.c
ViewVC logotype

Diff of /trunk/paso/src/SystemMatrix_mergeMainAndCouple.c

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

revision 3641 by gross, Fri May 13 06:09:49 2011 UTC revision 3642 by caltinay, Thu Oct 27 03:41:51 2011 UTC
# Line 21  Line 21 
21  /*  p_ptr: the pointer to a vector of locations that    */  /*  p_ptr: the pointer to a vector of locations that    */
22  /*         start a row.                 */  /*         start a row.                 */
23  /*  p_idx: the pointer to the column indices for each   */  /*  p_idx: the pointer to the column indices for each   */
24  /*         of the rows, and is ordered by rows.     */  /*         of the rows, ordered by rows.                */
25  /*  p_val: the pointer to the data corresponding        */  /*  p_val: the pointer to the data corresponding        */
26  /*         directly to the column entries in p_idx.     */  /*         directly to the column entries in p_idx.     */
27  /************************************************************/  /************************************************************/
# Line 47  void Paso_SystemMatrix_mergeMainAndCoupl Line 47  void Paso_SystemMatrix_mergeMainAndCoupl
47        if (A->type & (MATRIX_FORMAT_OFFSET1 + MATRIX_FORMAT_BLK1)) {        if (A->type & (MATRIX_FORMAT_OFFSET1 + MATRIX_FORMAT_BLK1)) {
48            Paso_SystemMatrix_mergeMainAndCouple_CSC_OFFSET1(A, p_ptr, p_idx, p_val);            Paso_SystemMatrix_mergeMainAndCouple_CSC_OFFSET1(A, p_ptr, p_idx, p_val);
49        } else {        } else {
50            Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_mergeMainAndCouple: CSC with index 0 or block size larger than 1 is not supported. ");            Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_mergeMainAndCouple: CSC with index 0 or block size larger than 1 is not supported.");
51        }        }
52    } else if (A->type & MATRIX_FORMAT_TRILINOS_CRS) {    } else if (A->type & MATRIX_FORMAT_TRILINOS_CRS) {
53        Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_mergeMainAndCouple: TRILINOS is not supported. ");        Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_mergeMainAndCouple: TRILINOS is not supported.");
54    } else {    } else {
55        Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_mergeMainAndCouple: CRS is not supported. ");        Esys_setError(SYSTEM_ERROR,"Paso_SystemMatrix_mergeMainAndCouple: CRS is not supported.");
56    }    }
   return;  
57  }  }
58    
59    
# Line 120  void Paso_SystemMatrix_mergeMainAndCoupl Line 119  void Paso_SystemMatrix_mergeMainAndCoupl
119    coupler= Paso_Coupler_alloc(A->col_coupler->connector, 1);    coupler= Paso_Coupler_alloc(A->col_coupler->connector, 1);
120    Paso_Coupler_startCollect(coupler, rows);    Paso_Coupler_startCollect(coupler, rows);
121    
122    /* initalization, including allocate arrays "ptr", "index" and "val" */    /* initialization, including allocate arrays "ptr", "index" and "val" */
123    main_ptr=A->mainBlock->pattern->ptr;    main_ptr=A->mainBlock->pattern->ptr;
124    main_idx=A->mainBlock->pattern->index;    main_idx=A->mainBlock->pattern->index;
125    main_val=A->mainBlock->val;    main_val=A->mainBlock->val;
# Line 167  void Paso_SystemMatrix_mergeMainAndCoupl Line 166  void Paso_SystemMatrix_mergeMainAndCoupl
166    
167    TMPMEMFREE(rows);    TMPMEMFREE(rows);
168    Paso_Coupler_free(coupler);    Paso_Coupler_free(coupler);
   return;  
169  }  }
170    
171    
# Line 186  void Paso_SystemMatrix_mergeMainAndCoupl Line 184  void Paso_SystemMatrix_mergeMainAndCoupl
184    index_t *couple_global=NULL;    index_t *couple_global=NULL;
185    Paso_Coupler* coupler=A->col_coupler;    Paso_Coupler* coupler=A->col_coupler;
186  */  */
   
   return;  
187  }  }
188    

Legend:
Removed from v.3641  
changed lines
  Added in v.3642

  ViewVC Help
Powered by ViewVC 1.1.26