Commits

Peter Brune committed 2151b98 Merge

Merge branch 'prbrune/matcoloring-fixminpacklf'

Comments (0)

Files changed (2)

src/mat/color/impls/minpack/color.c

     PetscFunctionBegin;
     mc->dist                = 2;
     mc->data                = NULL;
-    mc->ops->apply          = MatColoringApply_SL;
+    mc->ops->apply          = MatColoringApply_LF;
     mc->ops->view           = NULL;
     mc->ops->destroy        = NULL;
     mc->ops->setfromoptions = NULL;
   PetscBool       flg1,flg2;
 
   PetscFunctionBegin;
-  if (mc->dist != 2) SETERRQ(PETSC_COMM_SELF,PETSC_ERR_SUP,"LF may only do distance 2 coloring");
+  if (mc->dist != 2) SETERRQ(PETSC_COMM_SELF,PETSC_ERR_SUP,"IDO may only do distance 2 coloring");
   /* this is ugly way to get blocksize but cannot call MatGetBlockSize() because AIJ can have bs > 1 */
   ierr = PetscObjectTypeCompare((PetscObject)mat,MATSEQBAIJ,&flg1);CHKERRQ(ierr);
   ierr = PetscObjectTypeCompare((PetscObject)mat,MATMPIBAIJ,&flg2);CHKERRQ(ierr);

src/mat/color/interface/matcoloring.c

     ierr = MatColoringView(mc,viewer);CHKERRQ(ierr);
     ierr = MatGetSize(mc->mat,NULL,&nc);CHKERRQ(ierr);
     ierr = ISColoringGetIS(*coloring,&ncolors,NULL);CHKERRQ(ierr);
-    ierr = PetscPrintf(PetscObjectComm((PetscObject)mc),"  Number of colors %d\n",ncolors);CHKERRQ(ierr);
-    ierr = PetscPrintf(PetscObjectComm((PetscObject)mc),"  Number of total columns %d\n",nc);CHKERRQ(ierr);
+    ierr = PetscViewerASCIIPrintf(viewer,"  Number of colors %d\n",ncolors);CHKERRQ(ierr);
+    ierr = PetscViewerASCIIPrintf(viewer,"  Number of total columns %d\n",nc);CHKERRQ(ierr);
     if (nc <= 1000) {ierr = ISColoringView(*coloring,viewer);CHKERRQ(ierr);}
     ierr = PetscViewerPopFormat(viewer);CHKERRQ(ierr);
     ierr = PetscViewerDestroy(&viewer);CHKERRQ(ierr);