Changeset 1896 for trunk/LMDZ.TITAN/libf/phy_common/mod_phys_lmdz_omp_data.F90

Timestamp:

Jan 17, 2018, 4:20:00 PM (7 years ago)

Author:

jvatant

Message:

Merge EM modifs on phy_common and xios
from LMDZ.GENERIC to LMDZ.TITAN.
See logs from r1673, r1682 and r1760
--JVO

Location:

trunk/LMDZ.TITAN/libf/phy_common

Files:

• . (modified) (1 prop)
• mod_phys_lmdz_omp_data.F90 (modified) (7 diffs)

trunk/LMDZ.TITAN/libf/phy_common/mod_phys_lmdz_omp_data.F90

@@ -1 +1 @@
 !
-!$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
@@ -7 +7 @@
   INTEGER,SAVE :: omp_rank
   LOGICAL,SAVE :: is_omp_root
+  LOGICAL,SAVE :: is_omp_master  ! alias of 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
@@ -16 +18 @@
   INTEGER,SAVE :: klon_omp_begin
   INTEGER,SAVE :: klon_omp_end
-!$OMP  THREADPRIVATE(omp_rank,klon_omp,is_omp_root,klon_omp_begin,klon_omp_end)
+!$OMP  THREADPRIVATE(omp_rank,klon_omp,is_omp_root,is_omp_master,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 +47 @@
         omp_size=OMP_GET_NUM_THREADS()
 !$OMP END MASTER
+!$OMP BARRIER
         omp_rank=OMP_GET_THREAD_NUM()    
 #else    
@@ -56 +61 @@
    ELSE
      abort_message = 'ANORMAL : OMP_MASTER /= 0'
-     CALL abort_gcm (modname,abort_message,1)
+     CALL abort_physic (modname,abort_message,1)
    ENDIF
 !$OMP END MASTER
-
+   is_omp_master=is_omp_root
 
 !$OMP MASTER 
+
     ALLOCATE(klon_omp_para_nb(0:omp_size-1))
     ALLOCATE(klon_omp_para_begin(0:omp_size-1))
@@ -80 +86 @@
 !$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)
@@ -90 +107 @@
 
   SUBROUTINE Print_module_data
+  USE print_control_mod, ONLY: lunout
   IMPLICIT NONE
-  INCLUDE "iniprint.h"
 
 !$OMP CRITICAL