Changeset 370 for codes

Timestamp:

02/22/16 01:24:33 (8 years ago)

Author:

dubos

Message:

Bugfix : mesh info written in output files

File:

• codes/icosagcm/trunk/src/geometry.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/geometry.f90

@@ -347 +347 @@
   SUBROUTINE update_domain 
     ! copy position of generators and vertices back into domain(:)%xyz/vertex
-    ! so that XIOS gets the right values
+    ! so that XIOS/create_header_gen gets the right values
     USE omp_para
     USE dimensions
-    USE domain_mod
+    USE domain_mod 
+    USE transfert_mpi_mod
+
     INTEGER :: ind,i,j,k,n
     TYPE(t_domain),POINTER :: d
+    TYPE(t_field),POINTER :: xyz_glo(:), xyz_loc(:), vertex_glo(:), vertex_loc(:)
+    REAL(rstd), POINTER :: xyz(:,:), vertex(:,:)
+    
+    CALL allocate_field(xyz_loc, field_t, type_real, 3)
+    CALL allocate_field(vertex_loc, field_z, type_real, 3)
+
     DO ind=1,ndomain
        IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master ) CYCLE
-       d=>domain(ind)
        CALL swap_dimensions(ind)
        CALL swap_geometry(ind)
-       DO j=jj_begin,jj_end
-          DO i=ii_begin,ii_end          
-             n=(j-1)*iim+i
-             d%xyz(:,i,j)=xyz_i(n,:)
+       xyz = xyz_loc(ind)
+       xyz(:,:) = xyz_i(:,:)
+       vertex = vertex_loc(ind)
+       vertex(:,:) = xyz_v(:,:)
+    END DO
+    
+    CALL allocate_field_glo(xyz_glo, field_t, type_real, 3)
+    CALL allocate_field_glo(vertex_glo, field_z, type_real, 3)
+    CALL gather_field(xyz_loc, xyz_glo)
+    CALL gather_field(vertex_loc, vertex_glo)
+    CALL deallocate_field(vertex_loc)
+    CALL deallocate_field(xyz_loc)
+
+    DO ind=1,ndomain_glo
+       d=>domain_glo(ind)
+       xyz = xyz_glo(ind)
+       vertex = vertex_glo(ind)
+       DO j=d%jj_begin,d%jj_end
+          DO i=d%ii_begin,d%ii_end          
+             n=(j-1)*d%iim+i
+             d%xyz(:,i,j)=xyz(n,:)
              DO k=0,5
-                d%vertex(:,k,i,j) = xyz_v(n+z_pos(k+1),:)
+                d%vertex(:,k,i,j) = vertex(n+d%z_pos(k+1),:)
              END DO
           END DO
        END DO
     END DO
+
+    CALL deallocate_field_glo(vertex_glo)
+    CALL deallocate_field_glo(xyz_glo)
+
   END SUBROUTINE update_domain