Changeset 883 for codes/icosagcm/devel/src/base

Timestamp:

06/11/19 17:38:17 (5 years ago)

Author:

dubos

Message:

devel/unstructured : XIOS output

Location:

codes/icosagcm/devel/src/base

Files:

• field.f90 (modified) (8 diffs)
• math_const.f90 (modified) (1 diff)

codes/icosagcm/devel/src/base/field.f90

@@ -1 +1 @@
 MODULE field_mod
   USE genmod
+  USE grid_param
+
   IMPLICIT NONE
   
@@ -44 +46 @@
   END INTERFACE
 
-  PRIVATE :: allocate_field_, deallocate_field_
+  ! This module is PUBLIC, we do not want to propagate symbols from modules USEd at module level
+  PRIVATE :: allocate_field_, deallocate_field_, grid_type, grid_unst, grid_ico
 
 CONTAINS
@@ -150 +153 @@
   SUBROUTINE allocate_field_XvalY(field, dom)
     USE domain_mod, ONLY : t_domain
-    USE grid_param
     TYPE(t_field) :: field
     TYPE(t_domain), INTENT(IN) :: dom
@@ -184 +186 @@
        
     CASE(grid_unst)
-       PRINT *, 'Allocating field ', field%name
        SELECT CASE(field%field_type)
        CASE(field_T)
@@ -194 +195 @@
        END SELECT
 
-       PRINT *, 'Allocating field ', field%name
-       PRINT *, '          with ij_size = ', ij_size
        
        IF (field%ndim==4) THEN
+          PRINT *, 'Allocating field ', TRIM(field%name), ' with shape = ', dim1, ij_size, dim2
           IF (data_type==type_integer) ALLOCATE(field%ival4d(dim1,ij_size,dim2))
           IF (data_type==type_real)    ALLOCATE(field%rval4d(dim1,ij_size,dim2))
           IF (data_type==type_logical) ALLOCATE(field%lval4d(dim1,ij_size,dim2))
        ELSE IF (field%ndim==3) THEN
+          PRINT *, 'Allocating field ', TRIM(field%name), ' with shape = ', dim1, ij_size
           IF (data_type==type_integer) ALLOCATE(field%ival3d(dim1,ij_size))
           IF (data_type==type_real)    ALLOCATE(field%rval3d(dim1,ij_size))
           IF (data_type==type_logical) ALLOCATE(field%lval3d(dim1,ij_size))
        ELSE IF (field%ndim==2) THEN
+          PRINT *, 'Allocating field ', TRIM(field%name), ' with shape = ', ij_size
           IF (data_type==type_integer) ALLOCATE(field%ival2d(ij_size))
           IF (data_type==type_real)    ALLOCATE(field%rval2d(ij_size))
@@ -362 +364 @@
     END IF
     field_pt=>field%rval2d
+    IF(grid_type == grid_unst) THEN
+       PRINT *, 'getval_r2d for ' // TRIM(field%name) // ' : ', SHAPE(field_pt)
+    END IF
   END SUBROUTINE  getval_r2d
 
@@ -375 +380 @@
     END IF
     field_pt=>field%rval3d
+    IF(grid_type == grid_unst) THEN
+       PRINT *, 'getval_r3d for ' // TRIM(field%name) // ' : ', SHAPE(field_pt)
+    END IF
   END SUBROUTINE  getval_r3d
 
@@ -387 +395 @@
     END IF
     field_pt=>field%rval4d
+    IF(grid_type == grid_unst) THEN
+       PRINT *, 'getval_r4d for ' // TRIM(field%name) // ' : ', SHAPE(field_pt)
+    END IF
   END SUBROUTINE  getval_r4d  
 

codes/icosagcm/devel/src/base/math_const.f90

@@ -2 +2 @@
   USE PREC
   
-  REAL(rstd),PARAMETER :: Pi=acos(-1._rstd)
+  REAL(rstd), PARAMETER :: Pi=acos(-1._rstd), radian_to_degree=180._rstd/Pi
   COMPLEX(cstd), PARAMETER :: Imag=(0,1)