Hong Zhang avatar Hong Zhang committed c2c58d7 Merge

Merge branch 'barry/fix-PetscObjectPrintClassNamePrefixType' into next

Comments (0)

Files changed (8)

src/mat/examples/tests/ex136.c

   */
   ierr = MatCreate(PETSC_COMM_WORLD,&A);CHKERRQ(ierr);
   ierr = MatSetType(A,type);CHKERRQ(ierr);
+  ierr = MatSetFromOptions(A);CHKERRQ(ierr);
   ierr = MatLoad(A,fd);CHKERRQ(ierr);
   ierr = PetscViewerDestroy(&fd);CHKERRQ(ierr);
 
   ierr = PetscViewerBinaryOpen(PETSC_COMM_WORLD,"fileoutput",FILE_MODE_READ,&fd);CHKERRQ(ierr);
   ierr = MatCreate(PETSC_COMM_WORLD,&B);CHKERRQ(ierr);
   ierr = MatSetType(B,type);CHKERRQ(ierr);
+  ierr = MatSetFromOptions(B);CHKERRQ(ierr);
   ierr = MatLoad(B,fd);CHKERRQ(ierr);
   ierr = PetscViewerDestroy(&fd);CHKERRQ(ierr);
 

src/mat/examples/tests/makefile

 	   ${RM} -f ex136_1.tmp
 runex136_2:
 	-@${MPIEXEC} -n 5 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info -aij > ex136_2.tmp 2>&1; \
-	   ${DIFF} output/ex136_2.out ex136_2.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
+	   ${DIFF} output/ex136_2.out ex136_2.tmp || echo ${PWD} "\nPossible problem with ex136_2, diffs above \n========================================="; \
 	   ${RM} -f ex136_2.tmp
 runex136_3:
 	-@${MPIEXEC} -n 7 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info -aij > ex136_3.tmp 2>&1; \
-	   ${DIFF} output/ex136_3.out ex136_3.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
+	   ${DIFF} output/ex136_3.out ex136_3.tmp || echo ${PWD} "\nPossible problem with ex136_3, diffs above \n========================================="; \
 	   ${RM} -f ex136_3.tmp
 runex136_4:
 	-@${MPIEXEC} -n 3 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info  > ex136_4.tmp 2>&1; \
-	   ${DIFF} output/ex136_4.out ex136_4.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
+	   ${DIFF} output/ex136_4.out ex136_4.tmp || echo ${PWD} "\nPossible problem with ex136_4, diffs above \n========================================="; \
 	   ${RM} -f ex136_4.tmp
 runex136_5:
 	-@${MPIEXEC} -n 5 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info > ex136_5.tmp 2>&1; \
-	   ${DIFF} output/ex136_5.out ex136_5.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
+	   ${DIFF} output/ex136_5.out ex136_5.tmp || echo ${PWD} "\nPossible problem with ex136_5, diffs above \n========================================="; \
 	   ${RM} -f ex136_5.tmp
 runex136_6:
 	-@${MPIEXEC} -n 7 ./ex136 -f  ${DATAFILESPATH}/matrices/cfd.2.100 -mat_view ascii::ascii_info > ex136_6.tmp 2>&1; \
-	   ${DIFF} output/ex136_6.out ex136_6.tmp || echo ${PWD} "\nPossible problem with ex136, diffs above \n========================================="; \
+	   ${DIFF} output/ex136_6.out ex136_6.tmp || echo ${PWD} "\nPossible problem with ex136_6, diffs above \n========================================="; \
 	   ${RM} -f ex136_6.tmp
 runex137:
 	-@${MPIEXEC} -n 2 ./ex137  > ex137_1.tmp 2>&1; \

src/mat/examples/tests/output/ex136_1.out

-Mat Object:
+Mat Object: 3 MPI processes
   type: mpiaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
     using I-node (on process 0) routines: found 8192 nodes, limit used is 5
-Mat Object:
+Mat Object: 3 MPI processes
   type: mpiaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
     using I-node (on process 0) routines: found 8192 nodes, limit used is 5
 Matrices are equal
-WARNING! There are options you set that were not used!
-WARNING! could be spelling mistake, etc!
-Option left: name:-matload_block_size value: 5

src/mat/examples/tests/output/ex136_2.out

-Mat Object:
+Mat Object: 5 MPI processes
   type: mpiaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
     using I-node (on process 0) routines: found 4916 nodes, limit used is 5
-Mat Object:
+Mat Object: 5 MPI processes
   type: mpiaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
     using I-node (on process 0) routines: found 4916 nodes, limit used is 5
 Matrices are equal
-WARNING! There are options you set that were not used!
-WARNING! could be spelling mistake, etc!
-Option left: name:-matload_block_size value: 5

src/mat/examples/tests/output/ex136_3.out

-Mat Object:
+Mat Object: 7 MPI processes
   type: mpiaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
     using I-node (on process 0) routines: found 3511 nodes, limit used is 5
-Mat Object:
+Mat Object: 7 MPI processes
   type: mpiaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
     using I-node (on process 0) routines: found 3511 nodes, limit used is 5
 Matrices are equal
-WARNING! There are options you set that were not used!
-WARNING! could be spelling mistake, etc!
-Option left: name:-matload_block_size value: 5

src/mat/examples/tests/output/ex136_4.out

-Mat Object:
+Mat Object: 3 MPI processes
   type: mpibaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
       block size is 5
-Mat Object:
+Mat Object: 3 MPI processes
   type: mpibaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
       block size is 5

src/mat/examples/tests/output/ex136_5.out

-Mat Object:
+Mat Object: 5 MPI processes
   type: mpibaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
       block size is 5
-Mat Object:
+Mat Object: 5 MPI processes
   type: mpibaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
       block size is 5

src/mat/examples/tests/output/ex136_6.out

-Mat Object:
+Mat Object: 7 MPI processes
   type: mpibaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
       block size is 5
-Mat Object:
+Mat Object: 7 MPI processes
   type: mpibaij
-  rows=122880, cols=122880
+  rows=122880, cols=122880, bs=5
   total: nonzeros=4134400, allocated nonzeros=4134400
   total number of mallocs used during MatSetValues calls =0
       block size is 5
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.