Changeset 1682 for trunk/LMDZ.MARS/libf/phy_common/mod_phys_lmdz_omp_data.F90

Timestamp:

Mar 31, 2017, 11:31:38 AM (8 years ago)

Author:

emillour

Message:

All GCMs: set things up to enable pluging physics with dynamico

• dyn3d
• gcm.F90 : move I/O initialization (dates) to be done before physics

initialization

• dyn3dpar
• gcm.F : move I/O initialization (dates) to be done before physics

initialization

• dynphy_lonlat:
• inigeomphy_mod.F90 : add ind_cell_glo computation and transfer

to init_geometry

• phy_common:
• geometry_mod.F90 : add ind_cell_glo module variable to store global

column index

• print_control_mod.F90 : make initialization occur via init_print_control_mod

to avoid circular module dependencies

• init_print_control_mod.F90 : added to initialize print_control_mod module

variables

• mod_phys_lmdz_mpi_data.F90 : use print_control_mod (rather than iniprint.h)
• mod_phys_lmdz_para.F90 : use print_control_mod (rather than iniprint.h)
• mod_phys_lmdz_omp_data.F90 : add is_omp_master (alias of is_omp_root) module

variable and use print_control_mod (rather than
iniprint.h)

• physics_distribution_mod.F90 : add call to init_dimphy in

init_physics_distribution

• xios_writefield.F90 : generic routine to output field with XIOS (for debug)

• misc:
• handle_err_m.F90 : call abort_physic, rather than abort_gcm
• wxios.F90 : updates to enable unstructured grids

set module variable g_ctx_name to "LMDZ"
wxios_init(): remove call to wxios_context_init
wxios_context_init(): call xios_context_initialize with COMM_LMDZ_PHY
add routine wxios_set_context() to get handle and set context to XIOS
wxios_domain_param(): change arguments and generate the domain in-place
add wxios_domain_param_unstructured(): generate domain for unstructured case

NB: access is via "domain group" (whereas it is via "domain" in

wxios_domain_param)

• dynphy_lonlat/phy[std|mars|venus|titan]:
• iniphysiq_mod.F90 : Remove call to init_dimphy (which is now done in

phy_common/physics_distribution_mod.F90)

EM

File:

• trunk/LMDZ.MARS/libf/phy_common/mod_phys_lmdz_omp_data.F90 (modified) (7 diffs)

trunk/LMDZ.MARS/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'
-     !-- abort_gcm only in the dynamics
-     !CALL abort_gcm (modname,abort_message,1)
-     print *,modname,abort_message
-     STOP
+     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))
@@ -83 +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)
@@ -93 +107 @@
 
   SUBROUTINE Print_module_data
+  USE print_control_mod, ONLY: lunout
   IMPLICIT NONE
-  INCLUDE "iniprint.h"
 
 !$OMP CRITICAL