Commits

Jed Brown  committed e297cea Merge

Merge branch 'knepley/plex'

* knepley/plex:
Mat: Fixes for test output, now Builder is clean on regression in src/mat
Vec: Fixes for test output, now Builder is clean on regression in src/vec
Sys ex19: Make test relocatable

  • Participants
  • Parent commits 714b443, 1fd6e28

Comments (0)

Files changed (10)

File src/mat/examples/tests/output/ex114_2.out

 row 2:
 row 3:
 row 4: (4, 4)  (5, -5) 
-
 Matrix type: mpiaij
 Row Maximum Absolute Values:
 Vector Object: 2 MPI processes

File src/mat/examples/tests/output/ex114_3.out

 row 2:
 row 3:
 row 4: (4, 4)  (5, -5) 
-
 Matrix type: mpibaij
 Row Maximum Absolute Values:
 Vector Object: 2 MPI processes

File src/mat/examples/tests/output/ex93_1.out

 row 0: (0, 1)  (1, 1) 
 row 1: (1, 1)  (2, 1) 
 row 2: (2, 1) 
-
 Matrix Object:(C_) 1 MPI processes
   type: seqaij
 row 0: (0, 1)  (1, 1) 
 row 1: (0, 1)  (1, 2)  (2, 1) 
 row 2: (1, 1)  (2, 2) 
-
 Matrix Object:(D_) 1 MPI processes
   type: seqaij
 row 0: (0, 1)  (1, 2)  (2, 1) 
 row 1: (0, 1)  (1, 3)  (2, 3) 
 row 2: (1, 1)  (2, 3) 
-
 Matrix Object:(D_) 1 MPI processes
   type: seqaij
 row 0: (0, 1)  (1, 2)  (2, 1) 
 row 1: (0, 1)  (1, 3)  (2, 3) 
 row 2: (1, 1)  (2, 3) 
-
 Matrix Object:(C=BtAB_) 1 MPI processes
   type: seqaij
 row 0: (0, 1)  (1, 2)  (2, 1) 
 row 1: (0, 1)  (1, 3)  (2, 3) 
 row 2: (1, 1)  (2, 3) 
-
 Matrix Object:(D=BtAB_) 1 MPI processes
   type: seqaij
 row 0: (0, 1)  (1, 2)  (2, 1) 
 row 1: (0, 1)  (1, 3)  (2, 3) 
 row 2: (1, 1)  (2, 3) 
-
 Matrix Object:(D=A*A^T_) 1 MPI processes
   type: seqaij
 row 0: (0, 2)  (1, 1) 
 row 1: (0, 1)  (1, 2)  (2, 1) 
 row 2: (1, 1)  (2, 1) 
-
 Matrix Object:(D=A*B=A*A^T_) 1 MPI processes
   type: seqaij
 row 0: (0, 2)  (1, 1) 
 row 1: (0, 1)  (1, 2)  (2, 1) 
 row 2: (1, 1)  (2, 1) 
-

File src/mat/examples/tests/output/ex93_2.out

 row 0: (0, 1)  (1, 1) 
 row 1: (1, 1)  (2, 1) 
 row 2: (2, 1) 
-
 Matrix Object: 1 MPI processes
   type: mpiaij
 row 0: (0, 1)  (1, 1) 
 row 1: (0, 1)  (1, 2)  (2, 1) 
 row 2: (1, 1)  (2, 2) 
-
 Matrix Object: 1 MPI processes
   type: mpiaij
 row 0: (0, 1)  (1, 2)  (2, 1) 
 row 1: (0, 1)  (1, 3)  (2, 3) 
 row 2: (1, 1)  (2, 3) 
-
 Matrix Object: 1 MPI processes
   type: mpiaij
 row 0: (0, 1)  (1, 2)  (2, 1) 
 row 1: (0, 1)  (1, 3)  (2, 3) 
 row 2: (1, 1)  (2, 3) 
-
 Matrix Object: 1 MPI processes
   type: mpiaij
 row 0: (0, 1)  (1, 2)  (2, 1) 
 row 1: (0, 1)  (1, 3)  (2, 3) 
 row 2: (1, 1)  (2, 3) 
-
 Matrix Object: 1 MPI processes
   type: mpiaij
 row 0: (0, 1)  (1, 2)  (2, 1) 
 row 1: (0, 1)  (1, 3)  (2, 3) 
 row 2: (1, 1)  (2, 3) 
-

File src/sys/examples/tests/ex19.c

   PetscBool      flg;
   PetscInt       option1;
 
-  PetscInitialize(&argc,&argv,"ex19options",help);
+  PetscInitialize(&argc,&argv,"${PETSC_DIR}/src/sys/examples/tests/ex19options",help);
   ierr = PetscOptionsGetInt(0,"-option1",&option1,&flg);CHKERRQ(ierr);
   ierr = PetscOptionsGetString(0,"-option2",option2,20,&flg);CHKERRQ(ierr);
   ierr = PetscPrintf(PETSC_COMM_WORLD,"%s\n",option2);CHKERRQ(ierr);

File src/vec/is/ao/examples/tests/output/ex1_1.out

   4    4      4    4
 [0] 2,1,9,7 PetscToApplication 2 1 -1 -1
 [0] 0,3,4 ApplicationToPetsc 0 3 4
-
 Test AOCreateMemoryScalable: 
 Number of elements in ordering 5
 PETSc->App  App->PETSc
   2    2      2    2
   3    3      3    3
   4    4      4    4
-
 Test AOCreateMemoryScalable with ispetsc=NULL:
 Number of elements in ordering 5
 PETSc->App  App->PETSc
   2    2      2    2
   3    3      3    3
   4    4      4    4
-
 Test general API: 
 [0] 2,1,9,7 PetscToApplication 2 1 -1 -1
 [0] 0,3,4 ApplicationToPetsc 0 3 4

File src/vec/is/ao/examples/tests/output/ex1_2.out

 [0] 0,3,4 ApplicationToPetsc 0 6 2
 [1] 2,1,9,7 PetscToApplication 4 2 9 5
 [1] 0,3,4 ApplicationToPetsc 0 6 2
-
 Test AOCreateMemoryScalable: 
 Number of elements in ordering 10
 PETSc->App  App->PETSc
   7    5      7    8
   8    7      8    4
   9    9      9    9
-
 Test AOCreateMemoryScalable with ispetsc=NULL:
 Number of elements in ordering 10
 PETSc->App  App->PETSc
   7    5      7    8
   8    7      8    4
   9    9      9    9
-
 Test general API: 
 [0] 2,1,9,7 PetscToApplication 4 2 9 5
 [0] 0,3,4 ApplicationToPetsc 0 6 2

File src/vec/is/ao/examples/tests/output/ex1_3.out

 [1] 0,3,4 ApplicationToPetsc 0 1 6
 [2] 2,1,9,7 PetscToApplication 6 3 13 7
 [2] 0,3,4 ApplicationToPetsc 0 1 6
-
 Test AOCreateMemoryScalable: 
 Number of elements in ordering 15
 PETSc->App  App->PETSc
  12    8     12    4
  13   11     13    9
  14   14     14   14
-
 Test AOCreateMemoryScalable with ispetsc=NULL:
 Number of elements in ordering 15
 PETSc->App  App->PETSc
  12    8     12    4
  13   11     13    9
  14   14     14   14
-
 Test general API: 
 [0] 2,1,9,7 PetscToApplication 6 3 13 7
 [0] 0,3,4 ApplicationToPetsc 0 1 6

File src/vec/vec/examples/tests/output/ex37_1.out

 
-
 ============== test_view ==============
 (max-b) = 7.200320 : index = 3 
 (min-b) = 0.100223 : index = 5 
         7.20032
         0.61794
         0.100223
-
-
 ============== test_axpy_dot_max ==============
 VecAXPY 
 (1) y1 = 

File src/vec/vec/examples/tests/output/ex37_2.out

 
-
 ============== test_view ==============
 (max-b) = 7.200320 : index = 3 
 (min-b) = 0.100223 : index = 5 
         0.61794
         Process [1]
         0.100223
-
-
 ============== test_axpy_dot_max ==============
 VecAXPY 
 (1) y1 =