Fix issue #121; where #118 broke compilation with ENABLE_MPI=OFF (#122)

Author: wdeconinck

src/fiat/mpl/internal_deprecated/mpl_groups.F90

@@ -49,7 +49,6 @@ SUBROUTINE MPL_GROUPS_CREATE(KPROCW, KPROCV)
     MPI_CART_SUB => MPI_CART_SUB8
 #endif
 USE MPL_COMM_FREE_MOD, ONLY: MPL_COMM_FREE
-USE MPL_MPIF,          ONLY: MPI_COMM_NULL
 
 IMPLICIT NONE
 INTEGER(KIND=JPIM), INTENT(IN) :: KPROCW, KPROCV
@@ -58,7 +57,7 @@ SUBROUTINE MPL_GROUPS_CREATE(KPROCW, KPROCV)
 LOGICAL :: LTORUS(2), LDIMS(2), LREORDER
 
 LOGICAL,SAVE :: LGROUPSETUP=.FALSE.
-INTEGER(KIND=JPIM),SAVE :: ICOMM_PARENT=MPI_COMM_NULL
+INTEGER(KIND=JPIM),SAVE :: ICOMM_PARENT
 
 IF (LGROUPSETUP) THEN
   IF (MPL_COMM_OML(1) == ICOMM_PARENT) RETURN

src/fiat/mpl/internal_f08/mpi_f08_dummy_mod.F90

@@ -63,7 +63,7 @@ MODULE MPI_F08
 !! symbols defined in mpi_serial library, and picked up via a 'USE MPL_MPI' important statement
 !!==============================================================================================
 
-EXTERNAL :: MPI_COMM_SIZE, MPI_TYPE_SIZE, MPI_ALLREDUCE, MPI_COMM_CREATE, MPI_COMM_GROUP
+EXTERNAL :: MPI_COMM_SIZE, MPI_TYPE_SIZE, MPI_ALLREDUCE, MPI_COMM_CREATE, MPI_COMM_GROUP, MPI_COMM_FREE
 
 END MODULE MPI_F08
 

src/fiat/mpl/internal_f08/mpl_groups.F90

@@ -28,7 +28,7 @@ MODULE MPL_GROUPS
 
 USE EC_PARKIND  ,ONLY : JPIM
 
-USE MPL_MPI,         ONLY : MPI_COMM, MPI_GROUP, MPI_COMM_NULL
+USE MPL_MPI,         ONLY : MPI_COMM, MPI_GROUP
 USE MPL_DATA_MODULE, ONLY : MPL_COMM_OML
 USE MPL_MESSAGE_MOD, ONLY : MPL_MESSAGE
 
@@ -59,7 +59,6 @@ SUBROUTINE MPL_GROUPS_CREATE(KPROCW, KPROCV)
 #ifndef _CRAYFTN
 USE MPL_MPI,           ONLY: MPI_COMM_FREE
 #endif
-USE MPL_MPI,           ONLY : MPI_COMM_NULL
 
 IMPLICIT NONE
 INTEGER(KIND=JPIM), INTENT(IN) :: KPROCW, KPROCV
@@ -74,9 +73,8 @@ SUBROUTINE MPL_GROUPS_CREATE(KPROCW, KPROCV)
 TYPE(MPI_COMM)     :: MPL_LCOMM
 TYPE(MPI_COMM)     :: MPL_ALL_LEVS_COMM_INTERNAL, MPL_ALL_MS_COMM_INTERNAL
 #endif
-
 LOGICAL,SAVE :: LGROUPSETUP=.FALSE.
-INTEGER(KIND=JPIM),SAVE :: ICOMM_PARENT=MPI_COMM_NULL%MPI_VAL
+INTEGER(KIND=JPIM),SAVE :: ICOMM_PARENT
 
 IF (LGROUPSETUP) THEN
   IF (MPL_COMM_OML(1) == ICOMM_PARENT) RETURN