Changeset 1682 for trunk/LMDZ.MARS/libf/dynphy_lonlat

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

Location:

trunk/LMDZ.MARS/libf/dynphy_lonlat

Files:

• inigeomphy_mod.F90 (modified) (3 diffs)
• mod_interface_dyn_phys.F90 (modified) (2 diffs)
• phymars/iniphysiq_mod.F90 (modified) (1 diff)

trunk/LMDZ.MARS/libf/dynphy_lonlat/inigeomphy_mod.F90

@@ -73 +73 @@
   REAL,ALLOCATABLE,SAVE :: boundslonfi(:,:)
   REAL,ALLOCATABLE,SAVE :: boundslatfi(:,:)
-!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi)
+  INTEGER,ALLOCATABLE,SAVE :: ind_cell_glo_fi(:)
+!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi,ind_cell_glo_fi)
 
   ! Initialize Physics distibution and parameters and interface with dynamics
@@ -201 +202 @@
   ALLOCATE(boundslonfi(klon_omp,4))
   ALLOCATE(boundslatfi(klon_omp,4))
-!  CALL initcomgeomphy
+  ALLOCATE(ind_cell_glo_fi(klon_omp))
+
 
   offset = klon_mpi_begin - 1
@@ -211 +213 @@
   boundslonfi(1:klon_omp,:) = boundslonfi_glo(offset+klon_omp_begin:offset+klon_omp_end,:)
   boundslatfi(1:klon_omp,:) = boundslatfi_glo(offset+klon_omp_begin:offset+klon_omp_end,:)
+  ind_cell_glo_fi(1:klon_omp)=(/ (i,i=offset+klon_omp_begin,offset+klon_omp_end) /)
 
   ! copy over local grid longitudes and latitudes
   CALL init_geometry(klon_omp,lonfi,latfi,boundslonfi,boundslatfi, &
-                     airefi,cufi,cvfi)
+                     airefi,ind_cell_glo_fi,cufi,cvfi)
 
   ! copy over preff , ap(), bp(), etc 

trunk/LMDZ.MARS/libf/dynphy_lonlat/mod_interface_dyn_phys.F90

@@ -22 +22 @@
     
     k=1
-    IF (is_north_pole) THEN
+    IF (is_north_pole_dyn) THEN
       index_i(k)=1
       index_j(k)=1
@@ -42 +42 @@
     ENDDO
     
-    IF (is_south_pole) THEN
+    IF (is_south_pole_dyn) THEN
       index_i(k)=1
       index_j(k)=jj_end

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/iniphysiq_mod.F90

@@ -66 +66 @@
 ! and do some initializations 
 
-! Initialize dimphy module
-call init_dimphy(klon_omp,nlayer)
+! Initialize dimphy module => Now done in physics_distribution_mod
+!call init_dimphy(klon_omp,nlayer)
 
 call phys_state_var_init(klon_omp,nlayer,nqtot,tname, &