Commits

Jed Brown committed 9d39f69

Mat: add MATOP_ values for missing functions

  • Participants
  • Parent commits cfb785c

Comments (0)

Files changed (3)

File include/finclude/petscmat.h

       PetscEnum MATOP_SETUP_PREALLOCATION
       PetscEnum MATOP_ILUFACTOR_SYMBOLIC
       PetscEnum MATOP_ICCFACTOR_SYMBOLIC
-      PetscEnum MATOP_GET_ARRAY
-      PetscEnum MATOP_RESTORE_ARRAY
+!     PetscEnum MATOP_PLACEHOLDER_32
+!     PetscEnum MATOP_PLACEHOLDER_33
       PetscEnum MATOP_DUPLICATE
       PetscEnum MATOP_FORWARD_SOLVE
       PetscEnum MATOP_BACKWARD_SOLVE
       PetscEnum MATOP_SCALE
       PetscEnum MATOP_SHIFT
       PetscEnum MATOP_DIAGONAL_SET
-      PetscEnum MATOP_ILUDT_FACTOR
-      PetscEnum MATOP_SET_BLOCK_SIZE
+      PetscEnum MATOP_ZERO_ROWS_COLUMNS
+      PetscEnum MATOP_SET_RANDOM
       PetscEnum MATOP_GET_ROW_IJ
       PetscEnum MATOP_RESTORE_ROW_IJ
       PetscEnum MATOP_GET_COLUMN_IJ
       PetscEnum MATOP_GET_ROW_MIN_ABS
       PetscEnum MATOP_CONVERT
       PetscEnum MATOP_SET_COLORING
-      PetscEnum MATOP_PLACEHOLDER
+!     PetscEnum MATOP_PLACEHOLDER_73
       PetscEnum MATOP_SET_VALUES_ADIFOR
       PetscEnum MATOP_FD_COLORING_APPLY
       PetscEnum MATOP_SET_FROM_OPTIONS
       PetscEnum MATOP_MULT_CONSTRAINED
       PetscEnum MATOP_MULT_TRANSPOSE_CONSTRAIN
-      PetscEnum MATOP_PERMUTE_SPARSIFY
+      PetscEnum MATOP_FIND_ZERO_DIAGONALS
       PetscEnum MATOP_MULT_MULTIPLE
       PetscEnum MATOP_SOLVE_MULTIPLE
       PetscEnum MATOP_GET_INERTIA
       PetscEnum MATOP_IS_SYMMETRIC
       PetscEnum MATOP_IS_HERMITIAN
       PetscEnum MATOP_IS_STRUCTURALLY_SYMMETRIC
-      PetscEnum MATOP_DUMMY
+      PetscEnum MATOP_SET_VALUES_BLOCKEDLOCAL
       PetscEnum MATOP_GET_VECS
       PetscEnum MATOP_MAT_MULT
       PetscEnum MATOP_MAT_MULT_SYMBOLIC
       PetscEnum MATOP_MAT_TRANSPOSE_MULT
       PetscEnum MATOP_MAT_TRANSPOSE_MULT_SYMBO
       PetscEnum MATOP_MAT_TRANSPOSE_MULT_NUMER
-      PetscEnum MATOP_PTAP_SYMBOLIC_SEQAIJ
-      PetscEnum MATOP_PTAP_NUMERIC_SEQAIJ
-      PetscEnum MATOP_PTAP_SYMBOLIC_MPIAIJ
-      PetscEnum MATOP_PTAP_NUMERIC_MPIAIJ
+!     PetscEnum MATOP_PLACEHOLDER_98
+!     PetscEnum MATOP_PLACEHOLDER_99
+!     PetscEnum MATOP_PLACEHOLDER_100
+!     PetscEnum MATOP_PLACEHOLDER_101
       PetscEnum MATOP_CONJUGATE
-      PetscEnum MATOP_SET_SIZES
+!     PetscEnum MATOP_PLACEHOLDER_103
       PetscEnum MATOP_SET_VALUES_ROW
       PetscEnum MATOP_REAL_PART
       PetscEnum MATOP_IMAGINARY_PART
       PetscEnum MATOP_MULT_HERMITIAN_TRANSPOSE
       PetscEnum MATOP_MULT_HERMITIAN_TRANS_ADD
       PetscEnum MATOP_GET_MULTI_PROC_BLOCK
+      PetscEnum MATOP_FIND_NONZERO_ROWS
       PetscEnum MATOP_GET_COLUMN_NORMS
+      PetscEnum MATOP_INVERT_BLOCK_DIAGONAL
+!     PetscEnum MATOP_PLACEHOLDER_127
       PetscEnum MATOP_GET_SUB_MATRICES_PARALLE
       PetscEnum MATOP_SET_VALUES_BATCH
+      PetscEnum MATOP_TRANSPOSE_MAT_MULT
+      PetscEnum MATOP_TRANSPOSE_MAT_MULT_SYMBO
+      PetscEnum MATOP_TRANSPOSE_MAT_MULT_NUMER
+      PetscEnum MATOP_TRANSPOSE_COLORING_CREAT
+      PetscEnum MATOP_TRANS_COLORING_APPLY_SPT
+      PetscEnum MATOP_TRANS_COLORING_APPLY_DEN
+      PetscEnum MATOP_RART
+      PetscEnum MATOP_RART_SYMBOLIC
+      PetscEnum MATOP_RART_NUMERIC
       PetscEnum MATOP_SET_BLOCK_SIZES
       PetscEnum MATOP_AYPX
 
       parameter(MATOP_SETUP_PREALLOCATION=29)
       parameter(MATOP_ILUFACTOR_SYMBOLIC=30)
       parameter(MATOP_ICCFACTOR_SYMBOLIC=31)
-      parameter(MATOP_GET_ARRAY=32)
-      parameter(MATOP_RESTORE_ARRAY=33)
+!     parameter(MATOP_PLACEHOLDER_32=32)
+!     parameter(MATOP_PLACEHOLDER_33=33)
       parameter(MATOP_DUPLICATE=34)
       parameter(MATOP_FORWARD_SOLVE=35)
       parameter(MATOP_BACKWARD_SOLVE=36)
       parameter(MATOP_SCALE=45)
       parameter(MATOP_SHIFT=46)
       parameter(MATOP_DIAGONAL_SET=47)
-      parameter(MATOP_ILUDT_FACTOR=48)
-      parameter(MATOP_SET_BLOCK_SIZE=49)
+      parameter(MATOP_ZERO_ROWS_COLUMNS=48)
+      parameter(MATOP_SET_RANDOM=49)
       parameter(MATOP_GET_ROW_IJ=50)
       parameter(MATOP_RESTORE_ROW_IJ=51)
       parameter(MATOP_GET_COLUMN_IJ=52)
       parameter(MATOP_GET_ROW_MIN_ABS=70)
       parameter(MATOP_CONVERT=71)
       parameter(MATOP_SET_COLORING=72)
-      parameter(MATOP_PLACEHOLDER=73)
+!     parameter(MATOP_PLACEHOLDER_73=73)
       parameter(MATOP_SET_VALUES_ADIFOR=74)
       parameter(MATOP_FD_COLORING_APPLY=75)
       parameter(MATOP_SET_FROM_OPTIONS=76)
       parameter(MATOP_MULT_CONSTRAINED=77)
       parameter(MATOP_MULT_TRANSPOSE_CONSTRAIN=78)
-      parameter(MATOP_PERMUTE_SPARSIFY=79)
+      parameter(MATOP_FIND_ZERO_DIAGONALS=79)
       parameter(MATOP_MULT_MULTIPLE=80)
       parameter(MATOP_SOLVE_MULTIPLE=81)
       parameter(MATOP_GET_INERTIA=82)
       parameter(MATOP_IS_SYMMETRIC=84)
       parameter(MATOP_IS_HERMITIAN=85)
       parameter(MATOP_IS_STRUCTURALLY_SYMMETRIC=86)
-      parameter(MATOP_DUMMY=87)
+      parameter(MATOP_SET_VALUES_BLOCKEDLOCAL=87)
       parameter(MATOP_GET_VECS=88)
       parameter(MATOP_MAT_MULT=89)
       parameter(MATOP_MAT_MULT_SYMBOLIC=90)
       parameter(MATOP_MAT_TRANSPOSE_MULT=95)
       parameter(MATOP_MAT_TRANSPOSE_MULT_SYMBO=96)
       parameter(MATOP_MAT_TRANSPOSE_MULT_NUMER=97)
-      parameter(MATOP_PTAP_SYMBOLIC_SEQAIJ=98)
-      parameter(MATOP_PTAP_NUMERIC_SEQAIJ=99)
-      parameter(MATOP_PTAP_SYMBOLIC_MPIAIJ=100)
-      parameter(MATOP_PTAP_NUMERIC_MPIAIJ=101)
+!     parameter(MATOP_PLACEHOLDER_98=98)
+!     parameter(MATOP_PLACEHOLDER_99=99)
+!     parameter(MATOP_PLACEHOLDER_100=100)
+!     parameter(MATOP_PLACEHOLDER_101=101)
       parameter(MATOP_CONJUGATE=102)
-      parameter(MATOP_SET_SIZES=103)
+!     parameter(MATOP_PLACEHOLDER_103=103)
       parameter(MATOP_SET_VALUES_ROW=104)
       parameter(MATOP_REAL_PART=105)
       parameter(MATOP_IMAGINARY_PART=106)
       parameter(MATOP_MULT_HERMITIAN_TRANSPOSE=121)
       parameter(MATOP_MULT_HERMITIAN_TRANS_ADD=122)
       parameter(MATOP_GET_MULTI_PROC_BLOCK=123)
+      parameter(MATOP_FIND_NONZERO_ROWS=124)
       parameter(MATOP_GET_COLUMN_NORMS=125)
+      parameter(MATOP_INVERT_BLOCK_DIAGONAL=126)
+!     parameter(MATOP_PLACEHOLDER_127=127)
       parameter(MATOP_GET_SUB_MATRICES_PARALLE=128)
       parameter(MATOP_SET_VALUES_BATCH=129)
+      parameter(MATOP_TRANSPOSE_MAT_MULT=130)
+      parameter(MATOP_TRANSPOSE_MAT_MULT_SYMBO=131)
+      parameter(MATOP_TRANSPOSE_MAT_MULT_NUMER=132)
+      parameter(MATOP_TRANSPOSE_COLORING_CREAT=133)
+      parameter(MATOP_TRANS_COLORING_APPLY_SPT=134)
+      parameter(MATOP_TRANS_COLORING_APPLY_DEN=135)
+      parameter(MATOP_RART=136)
+      parameter(MATOP_RART_SYMBOLIC=137)
+      parameter(MATOP_RART_NUMERIC=138)
       parameter(MATOP_SET_BLOCK_SIZES=139)
       parameter(MATOP_AYPX=140)
 !

File include/petsc-private/matimpl.h

   PetscErrorCode (*setup)(Mat);
   PetscErrorCode (*ilufactorsymbolic)(Mat,Mat,IS,IS,const MatFactorInfo*);
   PetscErrorCode (*iccfactorsymbolic)(Mat,Mat,IS,const MatFactorInfo*);
-  PetscErrorCode (*dummy29)(Mat);
-  PetscErrorCode (*dummy210)(Mat);
+  PetscErrorCode (*placeholder_32)(Mat);
+  PetscErrorCode (*placeholder_33)(Mat);
   /*34*/
   PetscErrorCode (*duplicate)(Mat,MatDuplicateOption,Mat*);
   PetscErrorCode (*forwardsolve)(Mat,Vec,Vec);
   PetscErrorCode (*getrowminabs)(Mat,Vec,PetscInt[]);
   PetscErrorCode (*convert)(Mat, MatType,MatReuse,Mat*);
   PetscErrorCode (*setcoloring)(Mat,ISColoring);
-  PetscErrorCode (*dummy3)(Mat,void*);
+  PetscErrorCode (*placeholder_73)(Mat,void*);
   /*74*/
   PetscErrorCode (*setvaluesadifor)(Mat,PetscInt,void*);
   PetscErrorCode (*fdcoloringapply)(Mat,MatFDColoring,Vec,MatStructure*,void*);
   PetscErrorCode (*mattransposemult)(Mat,Mat,MatReuse,PetscReal,Mat*);
   PetscErrorCode (*mattransposemultsymbolic)(Mat,Mat,PetscReal,Mat*);
   PetscErrorCode (*mattransposemultnumeric)(Mat,Mat,Mat);
-  PetscErrorCode (*dummy98)(Mat);
+  PetscErrorCode (*placeholder_98)(Mat);
   /*99*/
-  PetscErrorCode (*dummy99)(Mat);
-  PetscErrorCode (*dummy100)(Mat);
-  PetscErrorCode (*dummy101)(Mat);
+  PetscErrorCode (*placeholder_99)(Mat);
+  PetscErrorCode (*placeholder_100)(Mat);
+  PetscErrorCode (*placeholder_101)(Mat);
   PetscErrorCode (*conjugate)(Mat);                              /* complex conjugate */
-  PetscErrorCode (*dummy5)(void);
+  PetscErrorCode (*placeholder_103)(void);
   /*104*/
   PetscErrorCode (*setvaluesrow)(Mat,PetscInt,const PetscScalar[]);
   PetscErrorCode (*realpart)(Mat);
   PetscErrorCode (*findnonzerorows)(Mat,IS*);
   PetscErrorCode (*getcolumnnorms)(Mat,NormType,PetscReal*);
   PetscErrorCode (*invertblockdiagonal)(Mat,const PetscScalar**);
-  PetscErrorCode (*dummy4)(Mat,Vec,Vec,Vec);
+  PetscErrorCode (*placeholder_127)(Mat,Vec,Vec,Vec);
   PetscErrorCode (*getsubmatricesparallel)(Mat,PetscInt,const IS[], const IS[], MatReuse, Mat**);
   /*129*/
   PetscErrorCode (*setvaluesbatch)(Mat,PetscInt,PetscInt,PetscInt*,const PetscScalar*);

File include/petscmat.h

                MATOP_SETUP_PREALLOCATION=29,
                MATOP_ILUFACTOR_SYMBOLIC=30,
                MATOP_ICCFACTOR_SYMBOLIC=31,
-               MATOP_GET_ARRAY=32,
-               MATOP_RESTORE_ARRAY=33,
+               /* MATOP_PLACEHOLDER_32=32, */
+               /* MATOP_PLACEHOLDER_33=33, */
                MATOP_DUPLICATE=34,
                MATOP_FORWARD_SOLVE=35,
                MATOP_BACKWARD_SOLVE=36,
                MATOP_SCALE=45,
                MATOP_SHIFT=46,
                MATOP_DIAGONAL_SET=47,
-               MATOP_ILUDT_FACTOR=48,
-               MATOP_SET_BLOCK_SIZE=49,
+               MATOP_ZERO_ROWS_COLUMNS=48,
+               MATOP_SET_RANDOM=49,
                MATOP_GET_ROW_IJ=50,
                MATOP_RESTORE_ROW_IJ=51,
                MATOP_GET_COLUMN_IJ=52,
                MATOP_GET_ROW_MIN_ABS=70,
                MATOP_CONVERT=71,
                MATOP_SET_COLORING=72,
-               MATOP_PLACEHOLDER=73,
+               /* MATOP_PLACEHOLDER_73=73, */
                MATOP_SET_VALUES_ADIFOR=74,
                MATOP_FD_COLORING_APPLY=75,
                MATOP_SET_FROM_OPTIONS=76,
                MATOP_MULT_CONSTRAINED=77,
                MATOP_MULT_TRANSPOSE_CONSTRAIN=78,
-               MATOP_PERMUTE_SPARSIFY=79,
+               MATOP_FIND_ZERO_DIAGONALS=79,
                MATOP_MULT_MULTIPLE=80,
                MATOP_SOLVE_MULTIPLE=81,
                MATOP_GET_INERTIA=82,
                MATOP_MAT_TRANSPOSE_MULT=95,
                MATOP_MAT_TRANSPOSE_MULT_SYMBO=96,
                MATOP_MAT_TRANSPOSE_MULT_NUMER=97,
-               MATOP_DUMMY98=98,
-               MATOP_DUMMY99=99,
-               MATOP_DUMMY100=100,
-               MATOP_DUMMY101=101,
+               /* MATOP_PLACEHOLDER_98=98, */
+               /* MATOP_PLACEHOLDER_99=99, */
+               /* MATOP_PLACEHOLDER_100=100, */
+               /* MATOP_PLACEHOLDER_101=101, */
                MATOP_CONJUGATE=102,
-               MATOP_SET_SIZES=103,
+               /* MATOP_PLACEHOLDER_103=103, */
                MATOP_SET_VALUES_ROW=104,
                MATOP_REAL_PART=105,
                MATOP_IMAGINARY_PART=106,
                MATOP_MULT_HERMITIAN_TRANSPOSE=121,
                MATOP_MULT_HERMITIAN_TRANS_ADD=122,
                MATOP_GET_MULTI_PROC_BLOCK=123,
+               MATOP_FIND_NONZERO_ROWS=124,
                MATOP_GET_COLUMN_NORMS=125,
+               MATOP_INVERT_BLOCK_DIAGONAL=126,
+               /* MATOP_PLACEHOLDER_127=127, */
                MATOP_GET_SUB_MATRICES_PARALLE=128,
                MATOP_SET_VALUES_BATCH=129,
                MATOP_TRANSPOSE_MAT_MULT=130,