Changeset 901 for codes/icosagcm/trunk/src/parallel

Timestamp:

06/13/19 16:45:42 (5 years ago)

Author:

adurocher

Message:

trunk : Fixed compilation with --std=f2008 with gfortran

Added dynamico_abort() to replace non standard ABORT() intrinsic
Other modifications to respect the fortran standard

Location:

codes/icosagcm/trunk/src/parallel

Files:

• mpi_mod.F90 (modified) (2 diffs)
• transfert_mpi.f90 (modified) (5 diffs)
• transfert_omp.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/parallel/mpi_mod.F90

@@ -2 +2 @@
 
 #ifdef CPP_USING_MPI
-  INCLUDE 'mpif.h'
+  !INCLUDE 'mpif.h'
+  use mpi
 #else
   INTEGER :: MPI_COMM_WORLD
@@ -86 +87 @@
  SUBROUTINE MPI_GATHER
  END
+ 
+ SUBROUTINE MPI_ABORT(comm, err, ierr)
+   INTEGER :: comm, err, ierr
+   STOP err
+ END
 #endif

codes/icosagcm/trunk/src/parallel/transfert_mpi.f90

@@ -1121 +1121 @@
 
   SUBROUTINE send_message_mpi(field,message)
+  USE abort_mod
   USE profiling_mod
   USE field_mod
@@ -1159 +1160 @@
        PRINT *, 'send_message_mpi : message ' // TRIM(message%name) // &
             ' is still open, no call to wait_message_mpi after last send_message_mpi'
-       CALL ABORT
+       CALL dynamico_abort( "send_message_mpi : message still open" )
     END IF
     message%open=.TRUE. ! will be set to .FALSE. by wait_message_mpi
@@ -2130 +2131 @@
     USE mpipara
     IMPLICIT NONE
-    
+    INTEGER,INTENT(IN) :: nb
     INTEGER,DIMENSION(nb),INTENT(INOUT) :: Var
-    INTEGER,INTENT(IN) :: nb
-
+    
     IF (.NOT. using_mpi) RETURN
 
@@ -2147 +2147 @@
     USE mpipara
     IMPLICIT NONE
-    
+    INTEGER,INTENT(IN) :: nb
     REAL,DIMENSION(nb),INTENT(INOUT) :: Var
-    INTEGER,INTENT(IN) :: nb
 
     IF (.NOT. using_mpi) RETURN
@@ -2164 +2163 @@
     USE mpipara
     IMPLICIT NONE
-    
+    INTEGER,INTENT(IN) :: nb
     LOGICAL,DIMENSION(nb),INTENT(INOUT) :: Var
-    INTEGER,INTENT(IN) :: nb
 
     IF (.NOT. using_mpi) RETURN

codes/icosagcm/trunk/src/parallel/transfert_omp.f90

@@ -827 +827 @@
   SUBROUTINE bcast_omp_igen(Var,Nb,Buff)
   IMPLICIT NONE
-    
+    INTEGER,INTENT(IN) :: Nb
     INTEGER,DIMENSION(Nb),INTENT(INOUT) :: Var
-    INTEGER,DIMENSION(Nb),INTENT(INOUT) :: Buff
-    INTEGER,INTENT(IN) :: Nb
+    INTEGER,DIMENSION(Nb),INTENT(INOUT) :: Buff 
 
     INTEGER :: i
@@ -851 +850 @@
   SUBROUTINE bcast_omp_rgen(Var,Nb,Buff)
   IMPLICIT NONE
-    
+    INTEGER,INTENT(IN) :: Nb
     REAL,DIMENSION(Nb),INTENT(INOUT) :: Var
-    REAL,DIMENSION(Nb),INTENT(INOUT) :: Buff
-    INTEGER,INTENT(IN) :: Nb
+    REAL,DIMENSION(Nb),INTENT(INOUT) :: Buff 
 
     INTEGER :: i
@@ -874 +872 @@
   SUBROUTINE bcast_omp_lgen(Var,Nb,Buff)
   IMPLICIT NONE
-    
+    INTEGER,INTENT(IN) :: Nb
     LOGICAL,DIMENSION(Nb),INTENT(INOUT) :: Var
     LOGICAL,DIMENSION(Nb),INTENT(INOUT) :: Buff
-    INTEGER,INTENT(IN) :: Nb
-  
+
     INTEGER :: i