Changeset 2435 for LMDZ5/branches/testing/libf/phy_common

Timestamp:

Jan 28, 2016, 5:02:13 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2396:2434 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phy_common/mod_phys_lmdz_mpi_data.F90 (modified) (4 diffs, 1 prop)
• libf/phy_common/mod_phys_lmdz_mpi_transfert.F90 (modified) (16 diffs, 1 prop)
• libf/phy_common/mod_phys_lmdz_omp_data.F90 (modified) (5 diffs)
• libf/phy_common/mod_phys_lmdz_para.F90 (modified) (3 diffs, 1 prop)

LMDZ5/branches/testing/libf/phy_common/mod_phys_lmdz_mpi_data.F90

@@ -1 +1 @@
 !
-!$Header$
+!$Id$
 !
 MODULE mod_phys_lmdz_mpi_data
@@ -41 +41 @@
   
   
-  LOGICAL,SAVE :: is_north_pole
-  LOGICAL,SAVE :: is_south_pole
+!  LOGICAL,SAVE :: is_north_pole
+!  LOGICAL,SAVE :: is_south_pole
+  LOGICAL,SAVE :: is_north_pole_dyn
+  LOGICAL,SAVE :: is_south_pole_dyn
   INTEGER,SAVE :: COMM_LMDZ_PHY
   INTEGER,SAVE :: MPI_REAL_LMDZ   ! MPI_REAL8
@@ -109 +111 @@
     
     IF (mpi_rank == 0) THEN 
-      is_north_pole = .TRUE.
-    ELSE
-      is_north_pole = .FALSE.
+      is_north_pole_dyn = .TRUE.
+    ELSE
+      is_north_pole_dyn = .FALSE.
     ENDIF
     
     IF (mpi_rank == mpi_size-1) THEN
-      is_south_pole = .TRUE.
-    ELSE
-      is_south_pole = .FALSE.
+      is_south_pole_dyn = .TRUE.
+    ELSE
+      is_south_pole_dyn = .FALSE.
     ENDIF
     
@@ -217 +219 @@
     WRITE(lunout,*) 'mpi_master =', mpi_master
     WRITE(lunout,*) 'is_mpi_root =', is_mpi_root
-    WRITE(lunout,*) 'is_north_pole =', is_north_pole
-    WRITE(lunout,*) 'is_south_pole =', is_south_pole
+    WRITE(lunout,*) 'is_north_pole =', is_north_pole_dyn
+    WRITE(lunout,*) 'is_south_pole =', is_south_pole_dyn
     WRITE(lunout,*) 'COMM_LMDZ_PHY =', COMM_LMDZ_PHY
   

LMDZ5/branches/testing/libf/phy_common/mod_phys_lmdz_mpi_transfert.F90

@@ -1 +1 @@
 !
-!$Header$
+!$Id$
 !
 MODULE mod_phys_lmdz_mpi_transfert
@@ -1693 +1693 @@
     
     offset=ii_begin
-    IF (is_north_pole) Offset=nbp_lon
+    IF (is_north_pole_dyn) Offset=nbp_lon
     
     
@@ -1703 +1703 @@
     
     
-    IF (is_north_pole) THEN 
+    IF (is_north_pole_dyn) THEN 
       DO i=1,dimsize
         DO ij=1,nbp_lon
@@ -1711 +1711 @@
     ENDIF
     
-    IF (is_south_pole) THEN 
+    IF (is_south_pole_dyn) THEN 
       DO i=1,dimsize
         DO ij=nbp_lon*(jj_nb-1)+1,nbp_lon*jj_nb
@@ -1737 +1737 @@
     
     offset=ii_begin
-    IF (is_north_pole) Offset=nbp_lon
+    IF (is_north_pole_dyn) Offset=nbp_lon
     
     
@@ -1747 +1747 @@
     
     
-    IF (is_north_pole) THEN 
+    IF (is_north_pole_dyn) THEN 
       DO i=1,dimsize
         DO ij=1,nbp_lon
@@ -1755 +1755 @@
     ENDIF
     
-    IF (is_south_pole) THEN 
+    IF (is_south_pole_dyn) THEN 
       DO i=1,dimsize
         DO ij=nbp_lon*(jj_nb-1)+1,nbp_lon*jj_nb
@@ -1782 +1782 @@
     
     offset=ii_begin
-    IF (is_north_pole) Offset=nbp_lon
+    IF (is_north_pole_dyn) Offset=nbp_lon
     
     
@@ -1792 +1792 @@
     
     
-    IF (is_north_pole) THEN 
+    IF (is_north_pole_dyn) THEN 
       DO i=1,dimsize
         DO ij=1,nbp_lon
@@ -1800 +1800 @@
     ENDIF
     
-    IF (is_south_pole) THEN 
+    IF (is_south_pole_dyn) THEN 
       DO i=1,dimsize
         DO ij=nbp_lon*(jj_nb-1)+1,nbp_lon*jj_nb
@@ -1824 +1824 @@
 
     offset=ii_begin
-    IF (is_north_pole) offset=nbp_lon
+    IF (is_north_pole_dyn) offset=nbp_lon
 
     DO i=1,dimsize
@@ -1832 +1832 @@
     ENDDO
 
-    IF (is_north_pole) THEN 
+    IF (is_north_pole_dyn) THEN 
       DO i=1,dimsize
         VarOut(1,i)=VarIn(1,i)
@@ -1854 +1854 @@
 
     offset=ii_begin
-    IF (is_north_pole) offset=nbp_lon
+    IF (is_north_pole_dyn) offset=nbp_lon
 
     DO i=1,dimsize
@@ -1862 +1862 @@
     ENDDO
 
-    IF (is_north_pole) THEN 
+    IF (is_north_pole_dyn) THEN 
       DO i=1,dimsize
          VarOut(1,i)=VarIn(1,i)
@@ -1883 +1883 @@
 
     offset=ii_begin
-    IF (is_north_pole) offset=nbp_lon
+    IF (is_north_pole_dyn) offset=nbp_lon
 
     DO i=1,dimsize
@@ -1891 +1891 @@
     ENDDO
 
-    IF (is_north_pole) THEN 
+    IF (is_north_pole_dyn) THEN 
       DO i=1,dimsize
         VarOut(1,i)=VarIn(1,i)

LMDZ5/branches/testing/libf/phy_common/mod_phys_lmdz_omp_data.F90

@@ -8 +8 @@
   LOGICAL,SAVE :: is_omp_root
   LOGICAL,SAVE :: is_using_omp
+  LOGICAL,SAVE :: is_north_pole_phy, is_south_pole_phy
   
   INTEGER,SAVE,DIMENSION(:),ALLOCATABLE :: klon_omp_para_nb
@@ -17 +18 @@
   INTEGER,SAVE :: klon_omp_end
 !$OMP  THREADPRIVATE(omp_rank,klon_omp,is_omp_root,klon_omp_begin,klon_omp_end)
+!$OMP  THREADPRIVATE(is_north_pole_phy, is_south_pole_phy)
 
 CONTAINS
   
   SUBROUTINE Init_phys_lmdz_omp_data(klon_mpi)
-    USE dimphy
+    USE dimphy 
+    USE mod_phys_lmdz_mpi_data, ONLY : is_north_pole_dyn, is_south_pole_dyn
     IMPLICIT NONE
     INTEGER, INTENT(in) :: klon_mpi
@@ -43 +46 @@
         omp_size=OMP_GET_NUM_THREADS()
 !$OMP END MASTER
+!$OMP BARRIER
         omp_rank=OMP_GET_THREAD_NUM()    
 #else    
@@ -62 +66 @@
 
 !$OMP MASTER 
+
     ALLOCATE(klon_omp_para_nb(0:omp_size-1))
     ALLOCATE(klon_omp_para_begin(0:omp_size-1))
@@ -80 +85 @@
 !$OMP END MASTER
 !$OMP BARRIER
+
+   if ((is_north_pole_dyn) .AND. (omp_rank == 0 )) then
+      is_north_pole_phy = .TRUE.
+    else
+      is_north_pole_phy = .FALSE.
+    endif
+    if ((is_south_pole_dyn) .AND. (omp_rank == omp_size-1)) then
+      is_south_pole_phy = .TRUE.
+    else
+      is_south_pole_phy = .FALSE.
+    endif
    
     klon_omp=klon_omp_para_nb(omp_rank)

LMDZ5/branches/testing/libf/phy_common/mod_phys_lmdz_para.F90

@@ -1 +1 @@
 !
-!$Header$
+! $Id$
 !
 MODULE mod_phys_lmdz_para
@@ -11 +11 @@
   LOGICAL,SAVE :: is_parallel
   LOGICAL,SAVE :: is_master
+
   
 !$OMP THREADPRIVATE(klon_loc,is_master)
@@ -41 +42 @@
        is_parallel=.FALSE.
      ENDIF
+
+
       
   END SUBROUTINE Init_phys_lmdz_para