Changeset 1682 for trunk/LMDZ.GENERIC/libf/phy_common/geometry_mod.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.GENERIC/libf/phy_common/geometry_mod.F90 (modified) (5 diffs)

trunk/LMDZ.GENERIC/libf/phy_common/geometry_mod.F90

@@ -30 +30 @@
 !$OMP THREADPRIVATE(cell_area)
 
+  INTEGER,SAVE,ALLOCATABLE :: ind_cell_glo(:)      ! global index of a local cell
+!$OMP THREADPRIVATE(ind_cell_glo)
 
 CONTAINS
@@ -35 +37 @@
   SUBROUTINE init_geometry(klon,longitude_,latitude_, &
                            boundslon_,boundslat_, &
-                           cell_area_,dx_,dy_)
+                           cell_area_,ind_cell_glo_,dx_,dy_)
   USE mod_grid_phy_lmdz, ONLY: nvertex
   USE nrtype, ONLY : PI
@@ -45 +47 @@
     REAL,INTENT(IN) :: boundslat_(klon,nvertex)
     REAL,INTENT(IN) :: cell_area_(klon)
+    INTEGER,OPTIONAL,INTENT(IN) :: ind_cell_glo_(klon)
     REAL,OPTIONAL,INTENT(IN) :: dx_(klon)
     REAL,OPTIONAL,INTENT(IN) :: dy_(klon)
@@ -55 +58 @@
     ALLOCATE(boundslat(klon,nvertex))
     ALLOCATE(cell_area(klon))
+    IF (PRESENT(ind_cell_glo_)) ALLOCATE(ind_cell_glo(klon))
     IF (PRESENT(dx_)) ALLOCATE(dx(klon))
     IF (PRESENT(dy_))ALLOCATE(dy(klon))
@@ -65 +69 @@
     boundslat(:,:) = boundslat_(:,:)
     cell_area(:) = cell_area_(:)
+    IF (PRESENT(ind_cell_glo_)) ind_cell_glo(:) = ind_cell_glo_(:)
     IF (PRESENT(dx_)) dx(:) = dx_(:)
     IF (PRESENT(dy_)) dy(:) = dy_(:)