Changeset 879 for codes/icosagcm/devel/src/sphere/geometry.f90

Timestamp:

06/04/19 18:03:54 (5 years ago)

Author:

dubos

Message:

devel : introduced derived type to store cell bounds

File:

• codes/icosagcm/devel/src/sphere/geometry.f90 (modified) (3 diffs)

codes/icosagcm/devel/src/sphere/geometry.f90

@@ -104 +104 @@
   USE field_mod
   IMPLICIT NONE
-  
+  INTEGER, PARAMETER :: nvertex=6    ! FIXME unstructured
+
     CALL allocate_field(geom%Ai,field_t,type_real,name='Ai')
 
     CALL allocate_field(geom%xyz_i,field_t,type_real,3)
-    CALL allocate_field(geom%lon_i,field_t,type_real)
-    CALL allocate_field(geom%lat_i,field_t,type_real)
+    CALL allocate_field(geom%lon_i,field_t,type_real, name='lon_i')
+    CALL allocate_field(geom%lat_i,field_t,type_real, name='lat_i')
     CALL allocate_field(geom%elon_i,field_t,type_real,3)
     CALL allocate_field(geom%elat_i,field_t,type_real,3)
@@ -115 +116 @@
 
     CALL allocate_field(geom%xyz_e,field_u,type_real,3)
-    CALL allocate_field(geom%lon_e,field_u,type_real)
-    CALL allocate_field(geom%lat_e,field_u,type_real)
+    CALL allocate_field(geom%lon_e,field_u,type_real, name='lon_e')
+    CALL allocate_field(geom%lat_e,field_u,type_real, name='lat_e')
     CALL allocate_field(geom%elon_e,field_u,type_real,3)
     CALL allocate_field(geom%elat_e,field_u,type_real,3)
@@ -123 +124 @@
 
     CALL allocate_field(geom%xyz_v,field_z,type_real,3)
-    CALL allocate_field(geom%de,field_u,type_real)
-    CALL allocate_field(geom%le,field_u,type_real)
-    CALL allocate_field(geom%le_de,field_u,type_real)
+    CALL allocate_field(geom%de,field_u,type_real, name='de')
+    CALL allocate_field(geom%le,field_u,type_real, name='le')
+    CALL allocate_field(geom%le_de,field_u,type_real, name='le_de')
     CALL allocate_field(geom%bi,field_t,type_real)
-    CALL allocate_field(geom%Av,field_z,type_real)
-    CALL allocate_field(geom%S1,field_t,type_real,6)
-    CALL allocate_field(geom%S2,field_t,type_real,6)
-    CALL allocate_field(geom%Riv,field_t,type_real,6)
-    CALL allocate_field(geom%Riv2,field_t,type_real,6)
-    CALL allocate_field(geom%ne,field_t,type_integer,6)
-    CALL allocate_field(geom%Wee,field_u,type_real,5,2)
+    CALL allocate_field(geom%Av,field_z,type_real, name='Av')
+    CALL allocate_field(geom%S1,field_t,type_real,nvertex)
+    CALL allocate_field(geom%S2,field_t,type_real,nvertex)
+    CALL allocate_field(geom%Riv,field_t,type_real,nvertex)
+    CALL allocate_field(geom%Riv2,field_t,type_real,nvertex)
+    CALL allocate_field(geom%ne,field_t,type_integer,nvertex)
+    CALL allocate_field(geom%Wee,field_u,type_real,5,2) ! FIXME unstructured
     CALL allocate_field(geom%bi,field_t,type_real)
-    CALL allocate_field(geom%fv,field_z,type_real)
+    CALL allocate_field(geom%fv,field_z,type_real, name='fv')
 
   END SUBROUTINE allocate_geometry