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

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

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

revision 1311 by dhawcroft, Thu Mar 23 05:37:00 2006 UTC revision 1312 by ksteube, Mon Sep 24 06:18:44 2007 UTC
# Line 1  Line 1 
 /* $Id: SCSL_direct.c 405 2005-12-22 23:05:31Z gross $ */  
1    
2    /* $Id$ */
3    
4  /*  /*******************************************************
5  ********************************************************************************   *
6  *               Copyright   2006 by ACcESS MNRF                                *   *           Copyright 2003-2007 by ACceSS MNRF
7  *                                                                              *   *       Copyright 2007 by University of Queensland
8  *                 http://www.access.edu.au                                     *   *
9  *           Primary Business: Queensland, Australia                            *   *                http://esscc.uq.edu.au
10  *     Licensed under the Open Software License version 3.0             *   *        Primary Business: Queensland, Australia
11  *        http://www.opensource.org/licenses/osl-3.0.php                        *   *  Licensed under the Open Software License version 3.0
12  ********************************************************************************   *     http://www.opensource.org/licenses/osl-3.0.php
13  */   *
14     *******************************************************/
15    
16  /**************************************************************/  /**************************************************************/
17    
# Line 108  void Paso_SCSL_direct(Paso_SystemMatrix* Line 109  void Paso_SCSL_direct(Paso_SystemMatrix*
109            time0=Paso_timer();            time0=Paso_timer();
110            if (TokenSym[token]) {            if (TokenSym[token]) {
111                 /* DPSLDLT_Ordering(token,reordering_method); (does not work)*/                 /* DPSLDLT_Ordering(token,reordering_method); (does not work)*/
112                 DPSLDLT_Preprocess(token,A->num_rows,A->pattern->ptr,A->pattern->index,&non_zeros,&ops);                 DPSLDLT_Preprocess(token,A->mainBlock->numRows,A->mainBlock->pattern->ptr,A->mainBlock->pattern->index,&non_zeros,&ops);
113                 DPSLDLT_Factor(token,A->num_rows,A->pattern->ptr,A->pattern->index,A->val);                 DPSLDLT_Factor(token,A->mainBlock->numRows,A->mainBlock->pattern->ptr,A->mainBlock->pattern->index,A->mainBlock->val);
114                 if (options->verbose) printf("timing SCSL: Cholevsky factorization: %.4e sec (token = %d)\n",Paso_timer()-time0,token);                 if (options->verbose) printf("timing SCSL: Cholevsky factorization: %.4e sec (token = %d)\n",Paso_timer()-time0,token);
115            } else {            } else {
116                 /* DPSLDU_Ordering(token,reordering_method);(does not work)*/                 /* DPSLDU_Ordering(token,reordering_method);(does not work)*/
117                 DPSLDU_Preprocess(token,A->num_rows,A->pattern->ptr,A->pattern->index,&non_zeros,&ops);                 DPSLDU_Preprocess(token,A->mainBlock->numRows,A->mainBlock->pattern->ptr,A->mainBlock->pattern->index,&non_zeros,&ops);
118                 DPSLDU_Factor(token,A->num_rows,A->pattern->ptr,A->pattern->index,A->val);                 DPSLDU_Factor(token,A->mainBlock->numRows,A->mainBlock->pattern->ptr,A->mainBlock->pattern->index,A->mainBlock->val);
119                 if (options->verbose) printf("timing SCSL: LDU factorization: %.4e sec (token = %d)\n",Paso_timer()-time0,token);                 if (options->verbose) printf("timing SCSL: LDU factorization: %.4e sec (token = %d)\n",Paso_timer()-time0,token);
120            }            }
121         }         }

Legend:
Removed from v.1311  
changed lines
  Added in v.1312

  ViewVC Help
Powered by ViewVC 1.1.26