Changeset 245 for codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/mod_phys_lmdz_mpi_data.F90

Timestamp:

07/22/14 16:00:02 (10 years ago)

Author:

ymipsl

Message:

• One call for initialize physics from dynamico

• mpi_root renamed into mpi_master due to conflict with an existaing symbol from the mpi library

==> mpi_root => mpi_master, is_mpi_root => is_mpi_master, is_omp_root => is_omp_master

YM

File:

• codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/mod_phys_lmdz_mpi_data.F90 (modified) (8 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/mod_phys_lmdz_mpi_data.F90

@@ -3 +3 @@
 !
 MODULE mod_phys_lmdz_mpi_data
-  USE mod_const_mpi, only: MPI_REAL_LMDZ, COMM_LMDZ
-  
+  
+  INTEGER,SAVE :: MPI_REAL_LMDZ
   INTEGER,SAVE :: ii_begin
   INTEGER,SAVE :: ii_end
@@ -40 +40 @@
   INTEGER,SAVE :: mpi_rank
   INTEGER,SAVE :: mpi_size
-  INTEGER,SAVE :: mpi_root
-  LOGICAL,SAVE :: is_mpi_root
+  INTEGER,SAVE :: mpi_master
+  LOGICAL,SAVE :: is_mpi_master
   LOGICAL,SAVE :: is_using_mpi
-!!$OMP THREADPRIVATE(mpi_rank,mpi_size,mpi_root,is_mpi_root,is_using_mpi)
+!!$OMP THREADPRIVATE(mpi_rank,mpi_size,mpi_master,is_mpi_master,is_using_mpi)
   
   
@@ -53 +53 @@
 CONTAINS
   
-  SUBROUTINE Init_phys_lmdz_mpi_data(iim,jjp1,nb_proc,distrib)
-  USE mod_const_mpi, ONLY : COMM_LMDZ
+  SUBROUTINE Init_phys_lmdz_mpi_data(iim,jjp1,comm_lmdz, nb_proc,distrib)
   IMPLICIT NONE
     INTEGER,INTENT(in) :: iim
     INTEGER,INTENT(in) :: jjp1
+    INTEGER,INTENT(in) :: comm_lmdz
     INTEGER,INTENT(in) :: nb_proc
     INTEGER,INTENT(in) :: distrib(0:nb_proc-1)
@@ -66 +66 @@
     
 #ifdef CPP_MPI
+    INCLUDE 'mpif.h'
     is_using_mpi=.TRUE.
 #else
@@ -78 +79 @@
     endif
     
-    COMM_LMDZ_PHY=COMM_LMDZ
+    COMM_LMDZ_PHY=comm_lmdz
 
     IF (is_using_mpi) THEN    
 #ifdef CPP_MPI
+      MPI_REAL_LMDZ = MPI_REAL8 
       CALL MPI_COMM_SIZE(COMM_LMDZ_PHY,mpi_size,ierr)    
       CALL MPI_COMM_RANK(COMM_LMDZ_PHY,mpi_rank,ierr)
@@ -91 +93 @@
     
     IF (mpi_rank == 0) THEN
-      mpi_root = 0
-      is_mpi_root = .true.
+      mpi_master = 0
+      is_mpi_master = .true.
     ENDIF
     
@@ -198 +200 @@
     WRITE(*,*) 'jj_para_nb =', jj_para_nb
     WRITE(*,*) 'jj_para_begin =', jj_para_begin
-    WRITE(*,*) 'jj_para_end =', jj_para_end
+    WRITE(*,*) 'jj_para_end =', jj_para_end 
     WRITE(*,*) 'ii_para_begin =', ii_para_begin
     WRITE(*,*) 'ii_para_end =', ii_para_end
@@ -209 +211 @@
     WRITE(*,*) 'mpi_rank =', mpi_rank
     WRITE(*,*) 'mpi_size =', mpi_size
-    WRITE(*,*) 'mpi_root =', mpi_root
-    WRITE(*,*) 'is_mpi_root =', is_mpi_root
+    WRITE(*,*) 'mpi_master =', mpi_master
+    WRITE(*,*) 'is_mpi_master =', is_mpi_master
     WRITE(*,*) 'is_north_pole =', is_north_pole
     WRITE(*,*) 'is_south_pole =', is_south_pole