Changeset 7397 for branches/2016/dev_NOC_CMCC_merge_2016/NEMOGCM/NEMO/OPA_SRC/IOM

Timestamp:

2016-11-30T15:13:05+01:00 (8 years ago)

Author:

lovato

Message:

#1810 - Merge with dev_NOC_2016

Location:

branches/2016/dev_NOC_CMCC_merge_2016/NEMOGCM/NEMO/OPA_SRC/IOM

Files:

• iom.F90 (modified) (4 diffs)
• iom_nf90.F90 (modified) (5 diffs)

branches/2016/dev_NOC_CMCC_merge_2016/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -9 +9 @@
    !!            3.4  ! 2012-12  (R. Bourdalle-Badie and G. Reffray)  add C1D case  
    !!            3.6  ! 2014-15  DIMG format removed
+   !!            3.6  ! 2015-15  (J. Harle) Added procedure to read REAL attributes
    !!--------------------------------------------------------------------
 
@@ -67 +68 @@
    END INTERFACE
    INTERFACE iom_getatt
-      MODULE PROCEDURE iom_g0d_intatt
+      MODULE PROCEDURE iom_g0d_intatt, iom_g0d_ratt
    END INTERFACE
    INTERFACE iom_rstput
@@ -979 +980 @@
          IF( iom_file(kiomid)%nfid > 0 ) THEN
             SELECT CASE (iom_file(kiomid)%iolib)
-            CASE (jpnf90   )   ;   CALL iom_nf90_getatt( kiomid, cdatt, pvar )
+            CASE (jpnf90   )   ;   CALL iom_nf90_getatt( kiomid, cdatt, pv_i0d=pvar )
             CASE DEFAULT
                CALL ctl_stop( 'iom_g0d_att: accepted IO library is only jpnf90' )
@@ -987 +988 @@
    END SUBROUTINE iom_g0d_intatt
 
+   SUBROUTINE iom_g0d_ratt( kiomid, cdatt, pvar, cdvar )
+      INTEGER         , INTENT(in   )                 ::   kiomid    ! Identifier of the file
+      CHARACTER(len=*), INTENT(in   )                 ::   cdatt     ! Name of the attribute
+      REAL(wp)        , INTENT(  out)                 ::   pvar      ! written field
+      CHARACTER(len=*), INTENT(in   ), OPTIONAL       ::   cdvar     ! Name of the variable
+      !
+      IF( kiomid > 0 ) THEN
+         IF( iom_file(kiomid)%nfid > 0 ) THEN
+            SELECT CASE (iom_file(kiomid)%iolib)
+            CASE (jpnf90   )   ;   IF( PRESENT(cdvar) ) THEN
+                                      CALL iom_nf90_getatt( kiomid, cdatt, pv_r0d=pvar, cdvar=cdvar )
+                                   ELSE
+                                      CALL iom_nf90_getatt( kiomid, cdatt, pv_r0d=pvar )
+                                   ENDIF
+            CASE DEFAULT    
+               CALL ctl_stop( 'iom_g0d_att: accepted IO library is only jpnf90' )
+            END SELECT
+         ENDIF
+      ENDIF
+   END SUBROUTINE iom_g0d_ratt
 
    !!----------------------------------------------------------------------

branches/2016/dev_NOC_CMCC_merge_2016/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90

@@ -7 +7 @@
    !!            9.0  ! 06 02  (S. Masson) Adaptation to NEMO
    !!             "   ! 07 07  (D. Storkey) Changes to iom_nf90_gettime
+   !!            3.6  ! 2015-15  (J. Harle) Added procedure to read REAL attributes
    !!--------------------------------------------------------------------
    !!gm  caution add !DIR nec: improved performance to be checked as well as no result changes
@@ -35 +36 @@
    END INTERFACE
    INTERFACE iom_nf90_getatt
-      MODULE PROCEDURE iom_nf90_intatt
+      MODULE PROCEDURE iom_nf90_att
    END INTERFACE
    INTERFACE iom_nf90_rstput
@@ -313 +314 @@
 
 
-   SUBROUTINE iom_nf90_intatt( kiomid, cdatt, pvar )
-      !!-----------------------------------------------------------------------
-      !!                  ***  ROUTINE  iom_nf90_intatt  ***
+   SUBROUTINE iom_nf90_att( kiomid, cdatt, pv_i0d, pv_r0d, cdvar)
+      !!-----------------------------------------------------------------------
+      !!                  ***  ROUTINE  iom_nf90_att  ***
       !!
       !! ** Purpose : read an integer attribute with NF90
@@ -321 +322 @@
       INTEGER         , INTENT(in   ) ::   kiomid   ! Identifier of the file
       CHARACTER(len=*), INTENT(in   ) ::   cdatt    ! attribute name
-      INTEGER         , INTENT(  out) ::   pvar     ! read field
+      INTEGER         , INTENT(  out), OPTIONAL       ::   pv_i0d    ! read field
+      REAL(wp),         INTENT(  out), OPTIONAL       ::   pv_r0d    ! read field 
+      CHARACTER(len=*), INTENT(in   ), OPTIONAL       ::   cdvar     ! name of the variable
       !
       INTEGER                         ::   if90id   ! temporary integer
+      INTEGER                         ::   ivarid           ! NetCDF  variable Id
       LOGICAL                         ::   llok     ! temporary logical
       CHARACTER(LEN=100)              ::   clinfo   ! info character
@@ -329 +333 @@
       ! 
       if90id = iom_file(kiomid)%nfid
-      llok = NF90_Inquire_attribute(if90id, NF90_GLOBAL, cdatt) == nf90_noerr
+      IF( PRESENT(cdvar) ) THEN
+         llok = NF90_INQ_VARID( if90id, TRIM(cdvar), ivarid ) == nf90_noerr   ! does the variable exist in the file
+         IF( llok ) THEN
+            llok = NF90_Inquire_attribute(if90id, ivarid, cdatt) == nf90_noerr
+         ELSE
+            CALL ctl_warn('iom_nf90_getatt: no variable '//cdvar//' found')
+         ENDIF
+      ELSE
+         llok = NF90_Inquire_attribute(if90id, NF90_GLOBAL, cdatt) == nf90_noerr
+      ENDIF 
+!
       IF( llok) THEN
          clinfo = 'iom_nf90_getatt, file: '//TRIM(iom_file(kiomid)%name)//', att: '//TRIM(cdatt)
-         CALL iom_nf90_check(NF90_GET_ATT(if90id, NF90_GLOBAL, cdatt, values=pvar), clinfo)
+         IF(     PRESENT(pv_r0d) ) THEN
+            IF( PRESENT(cdvar) ) THEN
+               CALL iom_nf90_check(NF90_GET_ATT(if90id, ivarid, cdatt, values=pv_r0d), clinfo)
+            ELSE
+               CALL iom_nf90_check(NF90_GET_ATT(if90id, NF90_GLOBAL, cdatt, values=pv_r0d), clinfo)
+            ENDIF
+         ELSE
+            IF( PRESENT(cdvar) ) THEN
+               CALL iom_nf90_check(NF90_GET_ATT(if90id, ivarid, cdatt, values=pv_i0d), clinfo)
+            ELSE
+               CALL iom_nf90_check(NF90_GET_ATT(if90id, NF90_GLOBAL, cdatt, values=pv_i0d), clinfo)
+            ENDIF
+         ENDIF
       ELSE
          CALL ctl_warn('iom_nf90_getatt: no attribute '//cdatt//' found')
-         pvar = -999
+         IF(     PRESENT(pv_r0d) ) THEN
+            pv_r0d = -999._wp
+         ELSE
+            pv_i0d = -999
+         ENDIF
       ENDIF
       ! 
-   END SUBROUTINE iom_nf90_intatt
+   END SUBROUTINE iom_nf90_att