Commit 255516c2 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Merge branch 'hotfix_mpi_defs' into 'master' 

Use PE_COMM_NULL instead of MPI_COMM_NULL

See merge request https://code.ornl.gov/futility/Futility/-/merge_requests/421
parents c647eb92 e2fc3fd7

src/MatrixTypes_Native.f90

+3 −3
Original line number Diff line number Diff line
@@ -521,9 +521,9 @@ SUBROUTINE init_DistributedBandedMatrixParam(matrix,Params) 
    ELSEIF(nnz <= 1) THEN

      CALL eMatrixType%raiseError('Incorrect input to '//modName//'::'//myName// &

          ' - Number of nonzero entries (nnz) must be greater than 0!')

    ELSEIF(commID == MPI_COMM_NULL) THEN

    ELSEIF(commID == PE_COMM_NULL) THEN

      CALL eMatrixType%raiseError('Incorrect input to '//modName//'::'//myName// &

          ' - MPI communicator cannot have the same value as MPI_COMM_NULL')

          ' - MPI communicator cannot have the same value as PE_COMM_NULL')

    ELSE

      CALL MPI_Comm_rank(commID,rank,mpierr)

      CALL MPI_Comm_size(commID,nproc,mpierr)
@@ -1070,7 +1070,7 @@ SUBROUTINE clear_DistributedBandedMatrixType(matrix) 
  matrix%isInit=.FALSE.

  matrix%isCreated=.FALSE.

  matrix%isAssembled=.FALSE.

  matrix%comm=MPI_COMM_NULL

  matrix%comm=PE_COMM_NULL

  matrix%n=0

  matrix%m=0

  matrix%nnz=0

src/PreconditionerTypes.f90

+1 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ SUBROUTINE clear_DistributedJacobi_PreCondType(thisPC) 
  IF(ASSOCIATED(thisPC%A)) NULLIFY(thisPC%A)

  CALL thisPC%invDiag%clear()

  thisPC%isInit = .FALSE.

  thisPC%comm = MPI_COMM_NULL

  thisPC%comm = PE_COMM_NULL



ENDSUBROUTINE clear_DistributedJacobi_PreCondType

#endif