Changeset 3413 for LMDZ6/branches/DYNAMICO-conv/libf/misc

Timestamp:

Nov 12, 2018, 1:52:29 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Inclusion of Yann's latest (summer/fall 2018) modifications for
convergence of DYNAMICO/LMDZ physics
YM/LF

File:

• LMDZ6/branches/DYNAMICO-conv/libf/misc/wxios.F90 (modified) (6 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/misc/wxios.F90

@@ -152 +152 @@
 !$OMP MASTER
         !Initialisation du contexte:
+        !!CALL xios_context_initialize(g_ctx_name, g_comm)
         CALL xios_context_initialize(g_ctx_name, COMM_LMDZ_PHY)
         CALL xios_get_handle(g_ctx_name, xios_ctx)    !Récupération
@@ -301 +302 @@
         CALL xios_set_domain_attr_hdl(dom, nj_glo=nbp_lat, jbegin=jj_begin-1, nj=jj_nb, data_dim=2)
         CALL xios_set_domain_attr_hdl(dom, lonvalue_1d=io_lon(1:nbp_lon), latvalue_1d=io_lat(jj_begin:jj_end))
+        CALL xios_set_domain_attr("dom_out", domain_ref=dom_id)
 
         IF (.NOT.is_sequential) THEN
@@ -332 +334 @@
         USE mod_phys_lmdz_para 
         USE nrtype, ONLY : PI
+        USE ioipsl_getin_p_mod, ONLY : getin_p
         IMPLICIT NONE
         CHARACTER(len=*),INTENT(IN) :: dom_id ! domain identifier
@@ -339 +342 @@
         REAL :: boundslat_mpi(klon_mpi,nvertex)
         INTEGER :: ind_cell_glo_mpi(klon_mpi)
-        TYPE(xios_domaingroup) :: dom
-
+        TYPE(xios_domain) :: dom
+        LOGICAL :: remap_output
 
         CALL gather_omp(longitude*180/PI,lon_mpi)
@@ -348 +351 @@
         CALL gather_omp(ind_cell_glo,ind_cell_glo_mpi)
         
+        remap_output=.TRUE.
+        CALL getin_p("remap_output",remap_output)
 
 !$OMP MASTER
-        CALL xios_get_domaingroup_handle(dom_id, dom)
+        CALL xios_get_domain_handle(dom_id, dom)
         
         !On parametrise le domaine:
@@ -357 +362 @@
                            bounds_lon_1d=TRANSPOSE(boundslon_mpi), bounds_lat_1d=TRANSPOSE(boundslat_mpi) )
         CALL xios_set_attr(dom, i_index=ind_cell_glo_mpi(:)-1)
+        IF (remap_output) THEN
+          CALL xios_set_domain_attr("dom_out", domain_ref="dom_regular")
+          CALL xios_set_fieldgroup_attr("dom_out", domain_ref="dom_regular")
+          CALL xios_set_fieldgroup_attr("remap_expr", expr="@this_ref")
+        ENDIF
 !$OMP END MASTER