Index: trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_mpi_data.F90 =================================================================== --- trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_mpi_data.F90 (revision 1543) +++ trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_mpi_data.F90 (revision 1572) @@ -1,4 +1,4 @@ ! -!$Header$ +!$Id$ ! MODULE mod_phys_lmdz_mpi_data @@ -41,6 +41,6 @@ - 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,13 +109,13 @@ 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,6 +217,6 @@ 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_dyn =', is_north_pole_dyn + WRITE(lunout,*) 'is_south_pole_dyn =', is_south_pole_dyn WRITE(lunout,*) 'COMM_LMDZ_PHY =', COMM_LMDZ_PHY Index: trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_mpi_transfert.F90 =================================================================== --- trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_mpi_transfert.F90 (revision 1543) +++ trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_mpi_transfert.F90 (revision 1572) @@ -1,4 +1,4 @@ ! -!$Header$ +!$Id$ ! MODULE mod_phys_lmdz_mpi_transfert @@ -1693,5 +1693,5 @@ offset=ii_begin - IF (is_north_pole) Offset=nbp_lon + IF (is_north_pole_dyn) Offset=nbp_lon @@ -1703,5 +1703,5 @@ - IF (is_north_pole) THEN + IF (is_north_pole_dyn) THEN DO i=1,dimsize DO ij=1,nbp_lon @@ -1711,5 +1711,5 @@ 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,5 +1737,5 @@ offset=ii_begin - IF (is_north_pole) Offset=nbp_lon + IF (is_north_pole_dyn) Offset=nbp_lon @@ -1747,5 +1747,5 @@ - IF (is_north_pole) THEN + IF (is_north_pole_dyn) THEN DO i=1,dimsize DO ij=1,nbp_lon @@ -1755,5 +1755,5 @@ 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,5 +1782,5 @@ offset=ii_begin - IF (is_north_pole) Offset=nbp_lon + IF (is_north_pole_dyn) Offset=nbp_lon @@ -1792,5 +1792,5 @@ - IF (is_north_pole) THEN + IF (is_north_pole_dyn) THEN DO i=1,dimsize DO ij=1,nbp_lon @@ -1800,5 +1800,5 @@ 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,5 +1824,5 @@ offset=ii_begin - IF (is_north_pole) offset=nbp_lon + IF (is_north_pole_dyn) offset=nbp_lon DO i=1,dimsize @@ -1832,5 +1832,5 @@ ENDDO - IF (is_north_pole) THEN + IF (is_north_pole_dyn) THEN DO i=1,dimsize VarOut(1,i)=VarIn(1,i) @@ -1854,5 +1854,5 @@ offset=ii_begin - IF (is_north_pole) offset=nbp_lon + IF (is_north_pole_dyn) offset=nbp_lon DO i=1,dimsize @@ -1862,5 +1862,5 @@ ENDDO - IF (is_north_pole) THEN + IF (is_north_pole_dyn) THEN DO i=1,dimsize VarOut(1,i)=VarIn(1,i) @@ -1883,5 +1883,5 @@ offset=ii_begin - IF (is_north_pole) offset=nbp_lon + IF (is_north_pole_dyn) offset=nbp_lon DO i=1,dimsize @@ -1891,5 +1891,5 @@ ENDDO - IF (is_north_pole) THEN + IF (is_north_pole_dyn) THEN DO i=1,dimsize VarOut(1,i)=VarIn(1,i) Index: trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_omp_data.F90 =================================================================== --- trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_omp_data.F90 (revision 1543) +++ trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_omp_data.F90 (revision 1572) @@ -1,4 +1,4 @@ ! -!$Id: mod_phys_lmdz_omp_data.F90 2326 2015-07-10 12:24:29Z emillour $ +!$Id: mod_phys_lmdz_omp_data.F90 2429 2016-01-27 12:43:09Z fairhead $ ! MODULE mod_phys_lmdz_omp_data @@ -8,4 +8,5 @@ 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,9 +18,11 @@ 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,4 +46,5 @@ omp_size=OMP_GET_NUM_THREADS() !$OMP END MASTER +!$OMP BARRIER omp_rank=OMP_GET_THREAD_NUM() #else @@ -62,4 +66,5 @@ !$OMP MASTER + ALLOCATE(klon_omp_para_nb(0:omp_size-1)) ALLOCATE(klon_omp_para_begin(0:omp_size-1)) @@ -80,4 +85,15 @@ !$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) Index: trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_para.F90 =================================================================== --- trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_para.F90 (revision 1543) +++ trunk/LMDZ.COMMON/libf/phy_common/mod_phys_lmdz_para.F90 (revision 1572) @@ -1,4 +1,4 @@ ! -!$Header$ +! $Id: mod_phys_lmdz_para.F90 2429 2016-01-27 12:43:09Z fairhead $ ! MODULE mod_phys_lmdz_para @@ -11,4 +11,5 @@ LOGICAL,SAVE :: is_parallel LOGICAL,SAVE :: is_master + !$OMP THREADPRIVATE(klon_loc,is_master) @@ -41,4 +42,6 @@ is_parallel=.FALSE. ENDIF + + END SUBROUTINE Init_phys_lmdz_para