Changeset 7029 for branches/NERC/dev_r6998_ORCHESTRA/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90

Timestamp:

2016-10-14T11:10:43+02:00 (8 years ago)

Author:

jamesharle

Message:

Adding ORCHESTRA configuration
Merging with branches/2016/dev_r5549_BDY_ZEROGRAD
Merging with branches/2016/dev_r5840_BDY_MSK
Merging with branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP

File:

• branches/NERC/dev_r6998_ORCHESTRA/NEMOGCM/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified) (5 diffs)

branches/NERC/dev_r6998_ORCHESTRA/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