DONT MERGE: temp. revert

Author: stephankramer

femtools/Sparse_Tools_Petsc.F90

@@ -411,7 +411,7 @@ subroutine allocate_petsc_csr_matrix_from_nnz(matrix, rows, columns, &
       ! Create serial block matrix:
       call MatCreateBAIJ(MPI_COMM_SELF, element_size, &
          urows, ucols, urows, ucols, &
-         0, dnnz, 0, PETSC_NULL_INTEGER_ARRAY, matrix%M, ierr)
+         0, dnnz, 0, PETSC_NULL_INTEGER, matrix%M, ierr)
 
     elseif (use_element_blocks) then
 
@@ -429,7 +429,7 @@ subroutine allocate_petsc_csr_matrix_from_nnz(matrix, rows, columns, &
 
       ! Create serial matrix:
       call MatCreateAIJ(MPI_COMM_SELF, urows, ucols, urows, ucols, &
-         0, dnnz, 0, PETSC_NULL_INTEGER_ARRAY, matrix%M, ierr)
+         0, dnnz, 0, PETSC_NULL_INTEGER, matrix%M, ierr)
       call MatSetBlockSizes(matrix%M, lgroup_size(1), lgroup_size(2), ierr)
 
     else
@@ -735,20 +735,12 @@ function petsc_csr_entries(matrix) result (entries)
     integer :: entries
     type(petsc_csr_matrix), intent(in) :: matrix
 
-#if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR<23)
     double precision, dimension(MAT_INFO_SIZE):: matrixinfo
-#else
-    MatInfo :: matrixinfo
-#endif
     PetscErrorCode:: ierr
 
     ! get the necessary info about the matrix:
     call MatGetInfo(matrix%M, MAT_LOCAL, matrixinfo, ierr)
-#if (PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR<23)
     entries=matrixinfo(MAT_INFO_NZ_USED)
-#else
-    entries=int(matrixinfo%nz_used)
-#endif
 
   end function petsc_csr_entries
 
@@ -780,26 +772,6 @@ subroutine petsc_csr_addto(matrix, blocki, blockj, i, j, val)
 
   end subroutine petsc_csr_addto
 
-  subroutine fix_column_numbers(idxm, idxn)
-    ! for some rows that we are not assembling (indicated with negative index)
-    ! the column indices are not reliable, as they are outside any halo and thus
-    ! have not been filled in in the gnn2unn numbering (we don't know their universal petsc number)
-    ! this is fine because we're telling petsc to skip these entries (with a negative row index)
-    ! but the random column index may still trip some internal petsc checks
-    ! therefore here we set these to negative as well
-
-    PetscInt, dimension(:), intent(in) :: idxm  ! row numbers
-    PetscInt, dimension(:), intent(inout) :: idxn  ! column numbers
-    integer i
-
-    do i=1, size(idxm)
-      if (idxm(i)<0) then
-        idxn(i) = -1
-      end if
-    end do
-
-  end subroutine fix_column_numbers
-
   subroutine petsc_csr_vaddto(matrix, blocki, blockj, i, j, val)
     !!< Add multiple values to matrix(blocki, blockj, i,j)
     type(petsc_csr_matrix), intent(inout) :: matrix
@@ -813,7 +785,6 @@ subroutine petsc_csr_vaddto(matrix, blocki, blockj, i, j, val)
 
     idxm=matrix%row_numbering%gnn2unn(i,blocki)
     idxn=matrix%column_numbering%gnn2unn(j,blockj)
-    call fix_column_numbers(idxm, idxn)
 
     call MatSetValues(matrix%M, size(i), idxm, size(j), idxn, &
         real(reshape(val, (/ size(val) /)), kind=PetscScalar_kind), &
@@ -837,7 +808,6 @@ subroutine petsc_csr_block_addto(matrix, i, j, val)
 
     idxm=matrix%row_numbering%gnn2unn(i,:)
     idxn=matrix%column_numbering%gnn2unn(j,:)
-    call fix_column_numbers(idxm, idxn)
 
     call MatSetValues(matrix%M, size(idxm), idxm, size(idxn), idxn, &
                   real(reshape(val, (/ size(val) /)), kind=PetscScalar_kind), ADD_VALUES, ierr)
@@ -865,7 +835,6 @@ subroutine petsc_csr_blocks_addto(matrix, i, j, val)
       idxm=matrix%row_numbering%gnn2unn(i,blocki)
       do blockj=1, size(matrix%column_numbering%gnn2unn,2)
         idxn=matrix%column_numbering%gnn2unn(j,blockj)
-        call fix_column_numbers(idxm, idxn)
         ! unfortunately we need a copy here to pass contiguous memory
         value=reshape(val(blocki, blockj, :, :), (/ size(value) /))
         call MatSetValues(matrix%M, size(i), idxm, size(j), idxn, &
@@ -898,7 +867,6 @@ subroutine petsc_csr_blocks_addto_withmask(matrix, i, j, val, block_mask)
       do blockj=1, size(matrix%column_numbering%gnn2unn,2)
         if (block_mask(blocki,blockj)) then
           idxn=matrix%column_numbering%gnn2unn(j,blockj)
-          call fix_column_numbers(idxm, idxn)
           ! unfortunately we need a copy here to pass contiguous memory
           value=reshape(val(blocki, blockj, :, :), (/ size(value) /))
           call MatSetValues(matrix%M, size(i), idxm, size(j), idxn, &