Changeset 881

Timestamp:

02/03/10 16:54:51 (15 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

Location:

IOIPSL/trunk/src

Files:

• fliocom.f90 (modified) (5 diffs)
• histcom.f90 (modified) (11 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
 !---

IOIPSL/trunk/src/histcom.f90

@@ -110 +110 @@
  &  last_opp,last_wrt,last_opp_chk,last_wrt_chk,nb_opp,nb_wrt
 !- For future optimization
-  REAL,ALLOCATABLE,DIMENSION(:) :: t_bf
+  REAL,POINTER,DIMENSION(:) :: t_bf
 !#  REAL,ALLOCATABLE,DIMENSION(:) :: V_1_D
 !#  REAL,ALLOCATABLE,DIMENSION(:,:) :: V_2_D
@@ -692 +692 @@
     dims(1:1) = (/ W_F(idf)%xid /)
   ENDIF
-  iret = NF90_DEF_VAR (nfid,lon_name,NF90_FLOAT,dims(1:ndim),nlonid)
+  iret = NF90_DEF_VAR (nfid,lon_name,NF90_REAL4,dims(1:ndim),nlonid)
   IF (rectilinear) THEN
     iret = NF90_PUT_ATT (nfid,nlonid,'axis',"X")
@@ -713 +713 @@
     dims(1:1) = (/ W_F(idf)%yid /)
   ENDIF
-  iret = NF90_DEF_VAR (nfid,lat_name,NF90_FLOAT,dims(1:ndim),nlatid)
+  iret = NF90_DEF_VAR (nfid,lat_name,NF90_REAL4,dims(1:ndim),nlatid)
   IF (rectilinear) THEN
     iret = NF90_PUT_ATT (nfid,nlatid,'axis',"Y")
@@ -867 +867 @@
   IF (l_dbg) WRITE(*,*) "histhori_irregular 2.0"
 !-
-  iret = NF90_DEF_VAR (nfid,lon_name,NF90_FLOAT,dims(1:ndim),nlonid)
+  iret = NF90_DEF_VAR (nfid,lon_name,NF90_REAL4,dims(1:ndim),nlonid)
   iret = NF90_PUT_ATT (nfid,nlonid,'standard_name',"longitude")
   iret = NF90_PUT_ATT (nfid,nlonid,'units',"degrees_east")
@@ -880 +880 @@
 !-
   iret = NF90_PUT_ATT (nfid,nlonid,'bounds',TRIM(lonbound_name))
-  iret = NF90_DEF_VAR (nfid,lonbound_name,NF90_FLOAT, &
+  iret = NF90_DEF_VAR (nfid,lonbound_name,NF90_REAL4, &
  &                     dimsb(1:ndimb),nlonidb)
   longname = 'Boundaries for coordinate variable '//TRIM(lon_name)
@@ -889 +889 @@
   IF (l_dbg) WRITE(*,*) "histhori_irregular 3.0"
 !-
-  iret = NF90_DEF_VAR (nfid,lat_name,NF90_FLOAT,dims(1:ndim),nlatid)
+  iret = NF90_DEF_VAR (nfid,lat_name,NF90_REAL4,dims(1:ndim),nlatid)
   iret = NF90_PUT_ATT (nfid,nlatid,'standard_name',"latitude")
   iret = NF90_PUT_ATT (nfid,nlatid,'units',"degrees_north")
@@ -902 +902 @@
 !-
   iret = NF90_PUT_ATT (nfid,nlatid,'bounds',TRIM(latbound_name))
-  iret = NF90_DEF_VAR (nfid,latbound_name,NF90_FLOAT, &
+  iret = NF90_DEF_VAR (nfid,latbound_name,NF90_REAL4, &
  &                     dimsb(1:ndimb),nlatidb)
   longname = 'Boundaries for coordinate variable '//TRIM(lat_name)
@@ -1051 +1051 @@
   leng = MIN(LEN_TRIM(pzaxname),20)
   iret = NF90_DEF_DIM (nfid,pzaxname(1:leng),pzsize,zaxid_tmp)
-  iret = NF90_DEF_VAR (nfid,pzaxname(1:leng),NF90_FLOAT, &
+  iret = NF90_DEF_VAR (nfid,pzaxname(1:leng),NF90_REAL4, &
  &                     zaxid_tmp,zdimid)
   iret = NF90_PUT_ATT (nfid,zdimid,'axis',"Z")
@@ -1551 +1551 @@
       str30 = "time_counter"
     ENDIF
-    iret = NF90_DEF_VAR (nfid,str30,NF90_DOUBLE, &
+    iret = NF90_DEF_VAR (nfid,str30,NF90_REAL8, &
  &           dims(1),W_F(idf)%W_V(itx)%tdimid)
     IF (W_F(idf)%n_tax <= 1) THEN
@@ -1664 +1664 @@
       ENDIF
       IF (W_F(idf)%W_V(iv)%hist_wrt_rng) THEN
-        iret = NF90_PUT_ATT (nfid,nvid,'valid_min', &
- &               REAL(W_F(idf)%W_V(iv)%hist_minmax(1),KIND=4))
-        iret = NF90_PUT_ATT (nfid,nvid,'valid_max', &
- &               REAL(W_F(idf)%W_V(iv)%hist_minmax(2),KIND=4))
+        IF (W_F(idf)%W_V(iv)%v_typ == hist_r8) THEN
+          iret = NF90_PUT_ATT (nfid,nvid,'valid_min', &
+ &                 REAL(W_F(idf)%W_V(iv)%hist_minmax(1),KIND=8))
+          iret = NF90_PUT_ATT (nfid,nvid,'valid_max', &
+ &                 REAL(W_F(idf)%W_V(iv)%hist_minmax(2),KIND=8))
+        ELSE
+          iret = NF90_PUT_ATT (nfid,nvid,'valid_min', &
+ &                 REAL(W_F(idf)%W_V(iv)%hist_minmax(1),KIND=4))
+          iret = NF90_PUT_ATT (nfid,nvid,'valid_max', &
+ &                 REAL(W_F(idf)%W_V(iv)%hist_minmax(2),KIND=4))
+        ENDIF
       ENDIF
       iret = NF90_PUT_ATT (nfid,nvid,'long_name', &
@@ -2482 +2489 @@
 !-------- Put the min and max values on the file
           nvid = W_F(ifile)%W_V(iv)%ncvid
-          iret = NF90_PUT_ATT (nfid,nvid,'valid_min', &
- &                 REAL(W_F(ifile)%W_V(iv)%hist_minmax(1),KIND=4))
-          iret = NF90_PUT_ATT (nfid,nvid,'valid_max', &
- &                 REAL(W_F(ifile)%W_V(iv)%hist_minmax(2),KIND=4))
+          IF (W_F(ifile)%W_V(iv)%v_typ == hist_r8) THEN
+            iret = NF90_PUT_ATT (nfid,nvid,'valid_min', &
+ &                   REAL(W_F(ifile)%W_V(iv)%hist_minmax(1),KIND=8))
+            iret = NF90_PUT_ATT (nfid,nvid,'valid_max', &
+ &                   REAL(W_F(ifile)%W_V(iv)%hist_minmax(2),KIND=8))
+          ELSE
+            iret = NF90_PUT_ATT (nfid,nvid,'valid_min', &
+ &                   REAL(W_F(ifile)%W_V(iv)%hist_minmax(1),KIND=4))
+            iret = NF90_PUT_ATT (nfid,nvid,'valid_max', &
+ &                   REAL(W_F(ifile)%W_V(iv)%hist_minmax(2),KIND=4))
+          ENDIF
         ENDIF
       ENDIF
 !---- Time-Buffers
-      IF (ALLOCATED(W_F(ifile)%W_V(iv)%t_bf)) THEN
+      IF (ASSOCIATED(W_F(ifile)%W_V(iv)%t_bf)) THEN
         DEALLOCATE(W_F(ifile)%W_V(iv)%t_bf)
       ENDIF