Commit e2fc3fd7 authored by aarograh's avatar aarograh Committed by Henderson, Shane
Browse files

Use PE_COMM_NULL instead of MPI_COMM_NULL 

Squash branch 'hotfix_mpi_defs' into 'master'

* Use PE_COMM_NULL instead of MPI_COMM_NULL

<!-- Replace this a detailed description of changes -->

<!-- Include a link to VERA development issues if appropriate, or delete this line -->

**Developer Checklist:**
- [x] Have you done a self-review after creating the merge request?
- [x] Have you filled in the Merge Request information (title, description) thoroughly?
- [x] Have you updated the relevant tickets (if this MR is linked to any VERA-dev tickets)?
- [x] Have you addressed all suggested feedback and commented on it to let the reviewer know? (Do not resolve discussions that the reviewer started)

**Reviewer Checklist:**
- [x] Have you confirmed all discussions were adequately addressed and resolved them all?
- [x] Does it conform to formatting guidelines?
- [x] Are there adequate and clear comments?
- [x] Is the design clean and sensible?
- [x] Are the changes optimal/efficient?
- [x] Were sufficient DBC checks added?
- [x] Are there unit tests? (if necessary)
- [x] Is the MR description clear, including a link to the VERA-Dev issue if appropriate?

**PSM Checklist**
- [x] Have you confirmed that all discussions were addressed, or that follow-on issues have been created for them?
- [x] Have you confirmed sufficient testing was conducted?
- [x] Does this impact other repositories?
- [x] Does the MR have an adequate description?
- [ ] If the MR has multiple commits, did you set the MR to squash merge?

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

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