Changeset 3900 for dynamico_lmdz/aquaplanet/LMDZ5

Timestamp:

Feb 2, 2016, 10:21:39 AM (9 years ago)

Author:

ymipsl

Message:

Add global index array in order to be able of correctly restart when changing data distribution between 2 jobs (not same number of mpi process or openmp threads)

YM

Location:

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd

Files:

• geometry_mod.f90 (modified) (4 diffs)
• iostart.F90 (modified) (5 diffs)
• wxios.F90 (modified) (4 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/geometry_mod.f90

@@ -29 +29 @@
 !$OMP THREADPRIVATE(cell_area)
 
+  INTEGER,SAVE,ALLOCATABLE :: ind_cell_glo(:)      ! global indice of a local cell
+!$OMP THREADPRIVATE(ind_cell_glo)
 
 CONTAINS
 
-  SUBROUTINE init_geometry(longitude_, latitude_, boundslon_, boundslat_, cell_area_, dx_, dy_)
+  SUBROUTINE init_geometry(longitude_, latitude_, boundslon_, boundslat_, cell_area_,ind_cell_glo_, dx_, dy_)
   USE dimphy, ONLY: klon
   USE mod_grid_phy_lmdz, ONLY: nvertex
@@ -42 +44 @@
     REAL :: boundslat_(klon,nvertex)
     REAL :: cell_area_(klon)
+    INTEGER :: ind_cell_glo_(klon) 
     REAL,OPTIONAL :: dx_(klon)
     REAL,OPTIONAL :: dy_(klon)
@@ -52 +55 @@
     ALLOCATE(boundslat(klon,nvertex))
     ALLOCATE(cell_area(klon))
+    ALLOCATE(ind_cell_glo(klon))
     IF (PRESENT(dx_)) ALLOCATE(dx(klon))
     IF (PRESENT(dy_))ALLOCATE(dy(klon))
@@ -62 +66 @@
     boundslat(:,:) = boundslat_(:,:)
     cell_area(:) = cell_area_(:)
+    ind_cell_glo(:) = ind_cell_glo_(:)
     IF (PRESENT(dx_)) dx(:) = dx_(:)
     IF (PRESENT(dy_)) dy(:) = dy_(:)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/iostart.F90

@@ -129 +129 @@
   USE netcdf
   USE dimphy
+  USE geometry_mod
   USE mod_grid_phy_lmdz
   USE mod_phys_lmdz_para
@@ -138 +139 @@
     
     REAL    :: field_glo(klon_glo,field_size)
+    REAL    :: field_glo_tmp(klon_glo,field_size)
+    INTEGER :: ind_cell_glo_glo(klon_glo)
     LOGICAL :: tmp_found
     INTEGER :: varid
-    INTEGER :: ierr
-    
-    IF (is_mpi_root .AND. is_omp_root) THEN
+    INTEGER :: ierr,i
+
+!    IF (is_master) ALLOCATE(ind_cell_glo_glo(1:klon_glo))
+    CALL gather(ind_cell_glo,ind_cell_glo_glo)
+    
+    IF (is_master) THEN
   
       ierr=NF90_INQ_VARID(nid_start,Field_name,varid)
       
       IF (ierr==NF90_NOERR) THEN
-        CALL body(field_glo)
+        CALL body(field_glo_tmp)
         tmp_found=.TRUE.
       ELSE
@@ -158 +164 @@
 
     IF (tmp_found) THEN
+      IF (is_master) THEN  
+        DO i=1,klon_glo
+         field_glo(i,:)=field_glo_tmp(ind_cell_glo_glo(i),:)
+        ENDDO
+      ENDIF
       CALL scatter(field_glo,field)
     ENDIF
@@ -384 +395 @@
   USE netcdf
   USE dimphy
+  USE geometry_mod
   USE mod_grid_phy_lmdz
   USE mod_phys_lmdz_para
@@ -393 +405 @@
   
   REAL                           :: field_glo(klon_glo,field_size)
-  INTEGER                        :: ierr
+  REAL                           :: field_glo_tmp(klon_glo,field_size)
+  INTEGER,ALLOCATABLE            :: ind_cell_glo_glo(:)
+  INTEGER                        :: ierr,i
   INTEGER                        :: nvarid
   INTEGER                        :: idim
    
    
-    CALL gather(field,field_glo)
-    
-    IF (is_mpi_root .AND. is_omp_root) THEN
+    IF (is_master) ALLOCATE(ind_cell_glo_glo(klon_glo))
+    CALL gather(ind_cell_glo,ind_cell_glo_glo)
+
+    CALL gather(field,field_glo_tmp)
+    
+    IF (is_master) THEN
+
+      DO i=1,klon_glo
+       field_glo(ind_cell_glo_glo(i),:)=field_glo_tmp(i,:)
+      ENDDO
+
 
       IF (field_size==1) THEN

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/wxios.F90

@@ -314 +314 @@
 
     SUBROUTINE wxios_domain_param_unstructured
-        USE geometry_mod, ONLY : longitude, latitude, boundslon, boundslat
+        USE geometry_mod, ONLY : longitude, latitude, boundslon, boundslat,ind_cell_glo
         USE mod_grid_phy_lmdz, ONLY : nvertex, klon_glo
         USE mod_phys_lmdz_para 
@@ -323 +323 @@
         REAL :: boundslon_mpi(klon_mpi,nvertex)
         REAL :: boundslat_mpi(klon_mpi,nvertex)
+        INTEGER :: ind_cell_glo_mpi(klon_mpi)
         TYPE(xios_domaingroup) :: dom
 
@@ -330 +331 @@
         CALL gather_omp(boundslon*180/PI,boundslon_mpi)
         CALL gather_omp(boundslat*180/PI,boundslat_mpi)
+        CALL gather_omp(ind_cell_glo,ind_cell_glo_mpi)
+        
 
 !$OMP MASTER
@@ -336 +339 @@
         !On parametrise le domaine:
         CALL xios_set_attr(dom, ni_glo=klon_glo, ibegin=ij_begin-1, ni=ij_nb, type="unstructured")
-        CALL xios_set_attr(dom, nvertex=nvertex, lonvalue_1d=lon_mpi, latvalue_1d=lat_mpi, bounds_lon_1d=TRANSPOSE(boundslon_mpi), bounds_lat_1d=TRANSPOSE(boundslat_mpi) )
+        CALL xios_set_attr(dom, nvertex=nvertex, lonvalue_1d=lon_mpi, latvalue_1d=lat_mpi, &
+                           bounds_lon_1d=TRANSPOSE(boundslon_mpi), bounds_lat_1d=TRANSPOSE(boundslat_mpi) )
+        CALL xios_set_attr(dom, i_index=ind_cell_glo_mpi(:)-1)
 !$OMP END MASTER