Changeset 905

Timestamp:

06/14/19 01:11:56 (5 years ago)

Author:

dubos

Message:

devel : XIOS output for unstructured mesh

File:

• codes/icosagcm/devel/src/output/xios_mod.F90 (modified) (4 diffs)

codes/icosagcm/devel/src/output/xios_mod.F90

@@ -8 +8 @@
   USE field_mod, ONLY : t_field, field_T, field_U, field_Z
   USE domain_mod, ONLY : t_domain, t_cellset, domain, ndomain, mesh_loc
+  USE grid_param, ONLY : grid_type, grid_unst, grid_ico
   IMPLICIT NONE   
   PRIVATE
@@ -163 +164 @@
       PRINT *, "xios_write_field : dimension > 4 are not supported for now"
    ELSE
-      CALL xios_write_field_hex(name, field, cells, & 
+      CALL xios_write_field_gen(name, field, cells, & 
            ncells, field(1)%dim3, field(1)%dim4)
    END IF
@@ -205 +206 @@
  END SUBROUTINE xios_read_field
 
- SUBROUTINE xios_write_field_hex(name, field, cells, ncell_tot, nlev, nq)
+ SUBROUTINE xios_write_field_gen(name, field, cells, ncell_tot, nlev, nq)
    CHARACTER(LEN=*),INTENT(IN) :: name
    TYPE(t_field) :: field(:)
    TYPE(t_cellset), TARGET :: cells(:)
    INTEGER,INTENT(IN) :: ncell_tot, nlev, nq
-
-   REAL(rstd) :: field_tmp(ncell_tot,nlev,nq)
+   REAL(rstd) :: field_tmp(ncell_tot, nlev, nq)
    TYPE(t_cellset), POINTER :: cellset
-   INTEGER :: ind, n_beg, n_end, n, ij, sgn
+   INTEGER :: ind, n_beg, n, ij, sgn
    LOGICAL :: signed
 
@@ -226 +226 @@
    DO ind=1,ndomain
       cellset => cells(ind)
-      n_end = n_beg + cellset%ncell
       DO n=1, cellset%ncell
          ij = cellset%ij(n)
          IF(signed) sgn = cellset%sgn(n)
-         SELECT CASE(field(1)%ndim)
-         CASE(2)
-            field_tmp(n_beg+n,1,1) = sgn*field(ind)%rval2d(ij)
-         CASE(3)
-            field_tmp(n_beg+n,:,1) = sgn*field(ind)%rval3d(ij,:)
-         CASE(4)
-            field_tmp(n_beg+n,:,:) = sgn*field(ind)%rval4d(ij,:,:)
+         SELECT CASE(grid_type)
+         CASE(grid_ico)
+            SELECT CASE(field(1)%ndim)
+            CASE(2)
+               field_tmp(n_beg+n,1,1) = sgn*field(ind)%rval2d(ij)
+            CASE(3)
+               field_tmp(n_beg+n,:,1) = sgn*field(ind)%rval3d(ij,:)
+            CASE(4)
+               field_tmp(n_beg+n,:,:) = sgn*field(ind)%rval4d(ij,:,:)
+            END SELECT
+         CASE(grid_unst)
+            SELECT CASE(field(1)%ndim)
+            CASE(2)
+               field_tmp(n_beg+n,1,1) = sgn*field(ind)%rval2d(ij)
+            CASE(3)
+               field_tmp(n_beg+n,:,1) = sgn*field(ind)%rval3d(:,ij)
+            CASE(4)
+               field_tmp(n_beg+n,:,:) = sgn*field(ind)%rval4d(:,ij,:)
+            END SELECT
          END SELECT
       END DO
+      n_beg = n_beg + cellset%ncell
    END DO
    CALL xios_send_field(name,field_tmp)  
- END SUBROUTINE xios_write_field_hex
+   
+ END SUBROUTINE xios_write_field_gen
 
 SUBROUTINE xios_read_field_hex(name, field, cells, ncell_tot, nlev, nq)