Changeset 881 for IOIPSL/trunk/src/fliocom.f90

Timestamp:

02/03/10 16:54:51 (14 years ago)

Author:

bellier

Message:

• Changed ALLOCATABLE attribute to POINTER for a structure element
• Modified Netcdf external type for _FillValue, valid_min and valid_max

File:

• IOIPSL/trunk/src/fliocom.f90 (modified) (5 diffs)

IOIPSL/trunk/src/fliocom.f90

@@ -1380 +1380 @@
 !---
     IF (PRESENT(v_t)) THEN
-      IF      (v_t == flio_i) THEN
+      SELECT CASE (v_t)
+      CASE(flio_i)
         IF (i_std == i_8) THEN
-!-------- Not yet supported by NETCDF
+!-------- I8 not yet supported by NETCDF
 !-------- m_k = flio_i8
           m_k = flio_i4
@@ -1388 +1389 @@
           m_k = flio_i4
         ENDIF
-      ELSE IF (v_t == flio_r) THEN
+      CASE(flio_r)
         IF (r_std == r_8) THEN
           m_k = flio_r8
@@ -1394 +1395 @@
           m_k = flio_r4
         ENDIF
-      ELSE
+      CASE(flio_c,flio_i1,flio_i2,flio_i4,flio_r4,flio_r8)
         m_k = v_t
-      ENDIF
+      CASE DEFAULT
+        CALL ipslerr (3,'fliodefv', &
+ &        'Variable '//TRIM(v_n),'External type','not supported')
+      END SELECT
     ELSE IF (r_std == r_8) THEN
       m_k = flio_r8
@@ -1402 +1406 @@
       m_k = flio_r4
     ENDIF
+!---
     IF (n_d > 0) THEN
       i_rc = NF90_DEF_VAR(f_e,v_n,m_k,a_i(1:n_d),i_v)
@@ -1427 +1432 @@
     ENDIF
     IF (PRESENT(valid_min)) THEN
-      i_rc = NF90_PUT_ATT(f_e,i_v,'valid_min',valid_min)
+      SELECT CASE (m_k)
+      CASE(flio_i1,flio_i2)
+        i_rc = NF90_PUT_ATT(f_e,i_v,'valid_min',NINT(valid_min,KIND=i_2))
+      CASE(flio_i4)
+        i_rc = NF90_PUT_ATT(f_e,i_v,'valid_min',NINT(valid_min,KIND=i_4))
+      CASE(flio_r4)
+        i_rc = NF90_PUT_ATT(f_e,i_v,'valid_min',REAL(valid_min,KIND=r_4))
+      CASE(flio_r8)
+        i_rc = NF90_PUT_ATT(f_e,i_v,'valid_min',REAL(valid_min,KIND=r_8))
+      CASE DEFAULT
+        CALL ipslerr (2,'fliodefv', &
+   &      'Variable '//TRIM(v_n),'attribute valid_min', &
+   &      'not supported for this external type')
+      END SELECT
     ENDIF
     IF (PRESENT(valid_max)) THEN
-      i_rc = NF90_PUT_ATT(f_e,i_v,'valid_max',valid_max)
+      SELECT CASE (m_k)
+      CASE(flio_i1,flio_i2)
+        i_rc = NF90_PUT_ATT(f_e,i_v,'valid_max',NINT(valid_max,KIND=i_2))
+      CASE(flio_i4)
+        i_rc = NF90_PUT_ATT(f_e,i_v,'valid_max',NINT(valid_max,KIND=i_4))
+      CASE(flio_r4)
+        i_rc = NF90_PUT_ATT(f_e,i_v,'valid_max',REAL(valid_max,KIND=r_4))
+      CASE(flio_r8)
+        i_rc = NF90_PUT_ATT(f_e,i_v,'valid_max',REAL(valid_max,KIND=r_8))
+      CASE DEFAULT
+        CALL ipslerr (2,'fliodefv', &
+   &      'Variable '//TRIM(v_n),'attribute valid_max', &
+   &      'not supported for this external type')
+      END SELECT
     ENDIF
 !---