Changeset 550 for trunk/NEMO/OPA_SRC/IOM/iom_nf90.F90

Timestamp:

2006-10-25T15:43:58+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_065: SM: iom bugfix for agrif + others...

File:

• trunk/NEMO/OPA_SRC/IOM/iom_nf90.F90 (modified) (11 diffs)

trunk/NEMO/OPA_SRC/IOM/iom_nf90.F90

@@ -20 +20 @@
    USE dom_oce         ! ocean space and time domain
    USE lbclnk          ! lateal boundary condition / mpp exchanges
-
-
    USE netcdf          ! NetCDF library
-   USE iom_def         ! 
 
    IMPLICIT NONE
@@ -31 +28 @@
 
    INTERFACE iom_nf90_get
-      MODULE PROCEDURE iom_nf90_get_0d, iom_nf90_get_123d
+      MODULE PROCEDURE iom_nf90_g0d, iom_nf90_g123d
    END INTERFACE
    INTERFACE iom_nf90_rstput
-      MODULE PROCEDURE iom_nf90_rstput_0123d
+      MODULE PROCEDURE iom_nf90_rp0123d
    END INTERFACE
    !!----------------------------------------------------------------------
@@ -81 +78 @@
          iln = INDEX( cdname, '.nc' )
          IF( ldwrt ) THEN  ! the file should be open in write mode so we create it...
-            WRITE(cltmp,'(a,a,i4.4,a)') cdname(1:iln-1), '_', narea-1, '.nc'
-            cdname = TRIM(cltmp)
+            IF( jpnij > 1 ) THEN
+               WRITE(cltmp,'(a,a,i4.4,a)') cdname(1:iln-1), '_', narea-1, '.nc'
+               cdname = TRIM(cltmp)
+            ENDIF
             IF(lwp) WRITE(numout,*) TRIM(clinfo)//' create new file: '//TRIM(cdname)//' in WRITE mode'
             CALL iom_nf90_check(NF90_CREATE( TRIM(cdname), NF90_NOCLOBBER, if90id ), clinfo)
@@ -208 +207 @@
 
 
-   SUBROUTINE iom_nf90_get_0d( kiomid, kvid, pvar )
-      !!-----------------------------------------------------------------------
-      !!                  ***  ROUTINE  iom_nf90_get_0d  ***
+   SUBROUTINE iom_nf90_g0d( kiomid, kvid, pvar )
+      !!-----------------------------------------------------------------------
+      !!                  ***  ROUTINE  iom_nf90_g0d  ***
       !!
       !! ** Purpose : read a scalar with NF90
@@ -220 +219 @@
       CHARACTER(LEN=100)      ::   clinfo   ! info character
       !---------------------------------------------------------------------
-      clinfo = 'iom_nf90_get_0d , file: '//TRIM(iom_file(kiomid)%name)//', var: '//TRIM(iom_file(kiomid)%cn_var(kvid))
+      clinfo = 'iom_nf90_g0d , file: '//TRIM(iom_file(kiomid)%name)//', var: '//TRIM(iom_file(kiomid)%cn_var(kvid))
       CALL iom_nf90_check(NF90_GET_VAR(iom_file(kiomid)%nfid, iom_file(kiomid)%nvid(kvid), pvar), clinfo )
       ! 
-   END SUBROUTINE iom_nf90_get_0d
-
-
-   SUBROUTINE iom_nf90_get_123d( kiomid, kdom, kvid, knbdim, kstart, kcount,    &
+   END SUBROUTINE iom_nf90_g0d
+
+
+   SUBROUTINE iom_nf90_g123d( kiomid, kdom, kvid, knbdim, kstart, kcount,    &
          &                          pv_r1d, pv_r2d, pv_r3d)
       !!-----------------------------------------------------------------------
-      !!                  ***  ROUTINE  iom_nf90_get_123d  ***
+      !!                  ***  ROUTINE  iom_nf90_g123d  ***
       !!
       !! ** Purpose : read a 1D/2D/3D variable with NF90
@@ -249 +248 @@
       INTEGER            ::   ivid     ! nf90 variable id
       !---------------------------------------------------------------------
-      clinfo = 'iom_nf90_get_123d , file: '//TRIM(iom_file(kiomid)%name)//', var: '//TRIM(iom_file(kiomid)%cn_var(kvid))
+      clinfo = 'iom_nf90_g123d , file: '//TRIM(iom_file(kiomid)%name)//', var: '//TRIM(iom_file(kiomid)%cn_var(kvid))
       if90id = iom_file(kiomid)%nfid         ! get back NetCDF file id
       ivid   = iom_file(kiomid)%nvid(kvid)   ! get back NetCDF var id
@@ -281 +280 @@
       ENDIF
       !
-   END SUBROUTINE iom_nf90_get_123d
+   END SUBROUTINE iom_nf90_g123d
 
 
@@ -303 +302 @@
 
 
-   SUBROUTINE iom_nf90_rstput_0123d( kt, kwrite, kiomid, cdvar , kvid  , ktype,   &
+   SUBROUTINE iom_nf90_rp0123d( kt, kwrite, kiomid, cdvar , kvid  , ktype,   &
          &                               pv_r0d, pv_r1d, pv_r2d, pv_r3d )
       !!--------------------------------------------------------------------
@@ -334 +333 @@
       !---------------------------------------------------------------------
       !
-      clinfo = '          iom_nf90_rstput_0123d, file: '//TRIM(iom_file(kiomid)%name)//', var: '//TRIM(cdvar)
+      clinfo = '          iom_nf90_rp0123d, file: '//TRIM(iom_file(kiomid)%name)//', var: '//TRIM(cdvar)
       if90id = iom_file(kiomid)%nfid
       !
@@ -428 +427 @@
                ix1 = 1      ;   ix2 = jpi    ;   iy1 = 1      ;   iy2 = jpj
             ELSE 
-               CALL ctl_stop( 'iom_nf90_rstput_0123d: should have been an impossible case...' )
+               CALL ctl_stop( 'iom_nf90_rp0123d: should have been an impossible case...' )
             ENDIF
 
@@ -464 +463 @@
       ENDIF
       !     
-   END SUBROUTINE iom_nf90_rstput_0123d
+   END SUBROUTINE iom_nf90_rp0123d