Commits

BarryFSmith committed 9ba1a84 Merge

commit after merge

Hg-commit: 2cefbdbb44a82f36914d89a21becb93afeba79ff

  • Participants
  • Parent commits 8020b6b, 1ffe713

Comments (0)

Files changed (2)

File config/PETSc/packages/Prometheus.py

     args += 'RANLIB         = '+self.setCompilers.RANLIB+'\n'
     args += 'AR             = '+self.setCompilers.AR+'\n'
     args += 'ARFLAGS        = '+self.setCompilers.AR_FLAGS+'\n'
+    args += 'PROM_LIB       = libprometheus.'+ self.setCompilers.AR_LIB_SUFFIX+'\n'
+    args += 'FEI_LIB        = libpromfei.'+ self.setCompilers.AR_LIB_SUFFIX+'\n'
+
 
     self.framework.pushLanguage('C++')
     args += 'CXX            = '+self.framework.getCompiler()

File src/mat/impls/aij/seq/aijfact.c

   PetscInt           nzi,*bj,**bj_ptr,**bjlvl_ptr; 
   PetscFreeSpaceList free_space=PETSC_NULL,current_space=PETSC_NULL; 
   PetscFreeSpaceList free_space_lvl=PETSC_NULL,current_space_lvl=PETSC_NULL; 
-  PetscTruth         olddatastruct=PETSC_FALSE;
   
   PetscFunctionBegin;
   /* Uncomment the old data struct part only while testing new data structure for MatSolve() */
+  /*
+  PetscTruth         olddatastruct=PETSC_FALSE;
   ierr = PetscOptionsGetTruth(PETSC_NULL,"-ilu_old",&olddatastruct,PETSC_NULL);CHKERRQ(ierr);
   if(olddatastruct){
     ierr = MatILUFactorSymbolic_SeqAIJ_inplace(fact,A,isrow,iscol,info);CHKERRQ(ierr);
     PetscFunctionReturn(0);
   }
+  */
   
   levels = (PetscInt)info->levels;
   ierr   = ISIdentity(isrow,&row_identity);CHKERRQ(ierr);
   if (!levels && row_identity && col_identity) { 
     /* special case: ilu(0) with natural ordering */
     ierr = MatILUFactorSymbolic_SeqAIJ_ilu0(fact,A,isrow,iscol,info);CHKERRQ(ierr);
-    ierr = Mat_CheckInode_FactorLU(fact,PETSC_FALSE);CHKERRQ(ierr);
+    if (a->inode.size) {
+      fact->ops->lufactornumeric  = MatLUFactorNumeric_SeqAIJ_Inode;
+    }
     PetscFunctionReturn(0);
   }