Changeset 3902

Timestamp:

Feb 2, 2016, 10:36:48 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

File:

• dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src/interface_icosa_lmdz.f90 (modified) (5 diffs)

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/src/interface_icosa_lmdz.f90

@@ -177 +177 @@
   USE xios_mod
   USE time_mod , init_time_icosa=> init_time 
+  USE omp_para
 
 ! from LMDZ
@@ -204 +205 @@
   REAL(rstd),ALLOCATABLE :: bounds_latfi(:,:)
   REAL(rstd),ALLOCATABLE :: bounds_lonfi(:,:)
+  REAL(rstd),ALLOCATABLE :: ind_cell_glo(:)
+
   REAL(rstd) :: pseudoalt(llm)
 
@@ -221 +224 @@
   INTEGER,ALLOCATABLE           :: conv_flg(:) ! conv_flg(it)=0 : convection desactivated for tracer number it 
   INTEGER,ALLOCATABLE           :: pbl_flg(:)  ! pbl_flg(it)=0  : boundary layer diffusion desactivaded for tracer number it 
-  CHARACTER(len=8),ALLOCATABLE :: solsym(:)  ! tracer name from inca
-
+  CHARACTER(len=8),ALLOCATABLE  :: solsym(:)  ! tracer name from inca
+  TYPE(t_field),POINTER,SAVE    :: f_ind_cell_glo(:)
+  
   INTEGER :: iflag_phys    
-
 
     CALL init_distrib_icosa_lmdz
@@ -233 +236 @@
     ALLOCATE(bounds_latfi(klon_omp,6))
     ALLOCATE(bounds_lonfi(klon_omp,6))
+    ALLOCATE(ind_cell_glo(klon_omp))
 
     CALL transfer_icosa_to_lmdz(geom%lat_i,latfi)
@@ -240 +244 @@
     CALL transfer_icosa_to_lmdz(geom%Ai,airefi)
 
-    CALL init_geometry(lonfi, latfi, bounds_lonfi, bounds_latfi, airefi)
+    CALL allocate_field(f_ind_cell_glo,field_t,type_real)
+    
+    DO ind=1,ndomain
+      IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master ) CYCLE
+      CALL swap_dimensions(ind)
+      CALL swap_geometry(ind)
+      DO j=jj_begin,jj_end
+        DO i=ii_begin,ii_end
+          ij=(j-1)*iim+i
+          f_ind_cell_glo(ind)%rval2d(ij)=domain(ind)%assign_cell_glo(i,j)
+        ENDDO
+      ENDDO
+    ENDDO
+
+!$OMP BARRIER
+      
+    CALL transfer_icosa_to_lmdz(f_ind_cell_glo,ind_cell_glo)
+    CALL deallocate_field(f_ind_cell_glo)
+      
+              
+    CALL init_geometry(lonfi, latfi, bounds_lonfi, bounds_latfi, airefi, INT(ind_cell_glo))
 
     pseudoalt(:)=0