Merge pull request #7117 from ggouaillardet/topic/f08_bind_c_constants_revamp_misc_fixes
fortran/use-mpi-f08: misc fixes
Этот коммит содержится в:
Коммит
631a43581f
@ -3,7 +3,7 @@
|
|||||||
! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
|
! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved.
|
||||||
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
|
! Copyright (c) 2009-2012 Los Alamos National Security, LLC.
|
||||||
! All rights reserved.
|
! All rights reserved.
|
||||||
! Copyright (c) 2017-2018 Research Organization for Information Science
|
! Copyright (c) 2017-2019 Research Organization for Information Science
|
||||||
! and Technology (RIST). All rights reserved.
|
! and Technology (RIST). All rights reserved.
|
||||||
!
|
!
|
||||||
! $COPYRIGHT$
|
! $COPYRIGHT$
|
||||||
@ -25,9 +25,6 @@
|
|||||||
! Whether we have PRIVATE or not
|
! Whether we have PRIVATE or not
|
||||||
#define OMPI_FORTRAN_HAVE_PRIVATE @OMPI_FORTRAN_HAVE_PRIVATE@
|
#define OMPI_FORTRAN_HAVE_PRIVATE @OMPI_FORTRAN_HAVE_PRIVATE@
|
||||||
|
|
||||||
! Whether we have PROTECTED or not
|
|
||||||
#define OMPI_FORTRAN_HAVE_PROTECTED @OMPI_FORTRAN_HAVE_PROTECTED@
|
|
||||||
|
|
||||||
! Whether we have ABSTRACT or not
|
! Whether we have ABSTRACT or not
|
||||||
#define OMPI_FORTRAN_HAVE_ABSTRACT @OMPI_FORTRAN_HAVE_ABSTRACT@
|
#define OMPI_FORTRAN_HAVE_ABSTRACT @OMPI_FORTRAN_HAVE_ABSTRACT@
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ module mpi_f08_types
|
|||||||
!
|
!
|
||||||
|
|
||||||
type(MPI_Comm), parameter :: MPI_COMM_NULL = MPI_Comm(OMPI_MPI_COMM_NULL)
|
type(MPI_Comm), parameter :: MPI_COMM_NULL = MPI_Comm(OMPI_MPI_COMM_NULL)
|
||||||
type(MPI_Datatype), parameter :: MPI_DATATYPE_NULL = MPI_Datatype(OMPI_MPI_COMM_NULL)
|
type(MPI_Datatype), parameter :: MPI_DATATYPE_NULL = MPI_Datatype(OMPI_MPI_DATATYPE_NULL)
|
||||||
type(MPI_Errhandler), parameter:: MPI_ERRHANDLER_NULL = MPI_Errhandler(OMPI_MPI_ERRHANDLER_NULL)
|
type(MPI_Errhandler), parameter:: MPI_ERRHANDLER_NULL = MPI_Errhandler(OMPI_MPI_ERRHANDLER_NULL)
|
||||||
type(MPI_Group), parameter :: MPI_GROUP_NULL = MPI_Group(OMPI_MPI_GROUP_NULL)
|
type(MPI_Group), parameter :: MPI_GROUP_NULL = MPI_Group(OMPI_MPI_GROUP_NULL)
|
||||||
type(MPI_Info), parameter :: MPI_INFO_NULL = MPI_Info(OMPI_MPI_INFO_NULL)
|
type(MPI_Info), parameter :: MPI_INFO_NULL = MPI_Info(OMPI_MPI_INFO_NULL)
|
||||||
@ -182,7 +182,7 @@ module mpi_f08_types
|
|||||||
type(MPI_Datatype), parameter :: MPI_COMPLEX8 = MPI_Datatype(OMPI_MPI_COMPLEX8)
|
type(MPI_Datatype), parameter :: MPI_COMPLEX8 = MPI_Datatype(OMPI_MPI_COMPLEX8)
|
||||||
type(MPI_Datatype), parameter :: MPI_COMPLEX16 = MPI_Datatype(OMPI_MPI_COMPLEX16)
|
type(MPI_Datatype), parameter :: MPI_COMPLEX16 = MPI_Datatype(OMPI_MPI_COMPLEX16)
|
||||||
type(MPI_Datatype), parameter :: MPI_COMPLEX32 = MPI_Datatype(OMPI_MPI_COMPLEX32)
|
type(MPI_Datatype), parameter :: MPI_COMPLEX32 = MPI_Datatype(OMPI_MPI_COMPLEX32)
|
||||||
type(MPI_Datatype), parameter :: MPI_DOUBLE_COMPLEX = MPI_Datatype(OMPI_MPI_COMPLEX)
|
type(MPI_Datatype), parameter :: MPI_DOUBLE_COMPLEX = MPI_Datatype(OMPI_MPI_DOUBLE_COMPLEX)
|
||||||
type(MPI_Datatype), parameter :: MPI_FLOAT_INT = MPI_Datatype(OMPI_MPI_FLOAT_INT)
|
type(MPI_Datatype), parameter :: MPI_FLOAT_INT = MPI_Datatype(OMPI_MPI_FLOAT_INT)
|
||||||
type(MPI_Datatype), parameter :: MPI_DOUBLE_INT = MPI_Datatype(OMPI_MPI_DOUBLE_INT)
|
type(MPI_Datatype), parameter :: MPI_DOUBLE_INT = MPI_Datatype(OMPI_MPI_DOUBLE_INT)
|
||||||
type(MPI_Datatype), parameter :: MPI_2REAL = MPI_Datatype(OMPI_MPI_2REAL)
|
type(MPI_Datatype), parameter :: MPI_2REAL = MPI_Datatype(OMPI_MPI_2REAL)
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user