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

Timestamp:

2007-06-29T18:29:31+02:00 (17 years ago)

Author:

rblod

Message:

nemo_v2_update_018 : SM : improve IOM
nemo_v2_bugfix_049 : SM : Patch to work when jpni*jpnj /= jpnij
nemo_v2_update_020 : SM : add jpdom_autoglo and jpdom_autodta
nemo_v2_bugfix_053 : SM : make sure everything is ok when kiomid <= 0
nemo_v2_bugfix_054 : RB : correct a bug in mpp with iom and suppress useless dummy arguments

File:

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

trunk/NEMO/OPA_SRC/IOM/iom_nf90.F90

@@ -36 +36 @@
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2006)
-   !! $Header$
+   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/IOM/iom_nf90.F90,v 1.8 2007/06/29 14:10:50 opalod Exp $
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -48 +48 @@
       !! ** Purpose : open an input file with NF90
       !!---------------------------------------------------------------------
-      CHARACTER(len=*)       , INTENT(inout) ::   cdname    ! File name
-      INTEGER                , INTENT(  out) ::   kiomid    ! nf90 identifier of the opened file
-      LOGICAL                , INTENT(in   ) ::   ldwrt     ! read or write the file?
-      LOGICAL                , INTENT(in   ) ::   ldok      ! check the existence 
-      INTEGER, DIMENSION(2,5), INTENT(in   ) ::   kdompar   ! domain parameters: 
+      CHARACTER(len=*)       , INTENT(inout)           ::   cdname    ! File name
+      INTEGER                , INTENT(  out)           ::   kiomid    ! nf90 identifier of the opened file
+      LOGICAL                , INTENT(in   )           ::   ldwrt     ! read or write the file?
+      LOGICAL                , INTENT(in   )           ::   ldok      ! check the existence 
+      INTEGER, DIMENSION(2,5), INTENT(in   ), OPTIONAL ::   kdompar   ! domain parameters: 
 
       CHARACTER(LEN=100) ::   clinfo   ! info character
@@ -104 +104 @@
             CALL iom_nf90_check(NF90_PUT_ATT( if90id, NF90_GLOBAL, 'DOMAIN_type'           , 'BOX'              ), clinfo)
          ELSE              ! the file should be open for read mode so it must exist...
-            CALL ctl_stop( TRIM(clinfo), 'File '//cdname(1:iln-1)//'* not found' )
+            CALL ctl_stop( TRIM(clinfo), ' should be impossible case...' )
          ENDIF
       ENDIF
@@ -232 +232 @@
 
 
-   SUBROUTINE iom_nf90_g123d( kiomid, kdom, kvid, knbdim, kstart, kcount,    &
-         &                          pv_r1d, pv_r2d, pv_r3d)
+   SUBROUTINE iom_nf90_g123d( kiomid, kvid, knbdim, kstart, kcount, kx1, kx2, ky1, ky2,   &
+         &                    pv_r1d, pv_r2d, pv_r3d )
       !!-----------------------------------------------------------------------
       !!                  ***  ROUTINE  iom_nf90_g123d  ***
@@ -242 +242 @@
       !!-----------------------------------------------------------------------
       INTEGER                    , INTENT(in   )           ::   kiomid    ! iom identifier of the file
-      INTEGER                    , INTENT(in   )           ::   kdom      ! Type of domain to be read
       INTEGER                    , INTENT(in   )           ::   kvid      ! Name of the variable
       INTEGER                    , INTENT(in   )           ::   knbdim    ! number of dimensions of the variable
       INTEGER , DIMENSION(:)     , INTENT(in   )           ::   kstart    ! start position of the reading in each axis 
       INTEGER , DIMENSION(:)     , INTENT(in   )           ::   kcount    ! number of points to be read in each axis
+      INTEGER ,                    INTENT(in   )           ::   kx1, kx2, ky1, ky2   ! subdomain indexes
       REAL(wp), DIMENSION(:)     , INTENT(  out), OPTIONAL ::   pv_r1d    ! read field (1D case)
       REAL(wp), DIMENSION(:,:)   , INTENT(  out), OPTIONAL ::   pv_r2d    ! read field (2D case)
       REAL(wp), DIMENSION(:,:,:) , INTENT(  out), OPTIONAL ::   pv_r3d    ! read field (3D case)
       !
-      CHARACTER(LEN=100) ::   clinfo   ! info character
-      INTEGER            ::   if90id   ! nf90 identifier of the opened file
-      INTEGER            ::   ivid     ! nf90 variable id
+      CHARACTER(LEN=100) ::   clinfo               ! info character
+      INTEGER            ::   if90id               ! nf90 identifier of the opened file
+      INTEGER            ::   ivid                 ! nf90 variable id
       !---------------------------------------------------------------------
       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
-      IF( PRESENT(pv_r1d) ) THEN
-         CALL iom_nf90_check(NF90_GET_VAR(if90id, ivid, pv_r1d(:), start=kstart(1:knbdim), count=kcount(1:knbdim)), clinfo )
+      !
+      IF(     PRESENT(pv_r1d) ) THEN
+         CALL iom_nf90_check( NF90_GET_VAR(if90id, ivid, pv_r1d(:                ), start = kstart(1:knbdim),   &
+            &                                                                       count = kcount(1:knbdim)), clinfo )
       ELSEIF( PRESENT(pv_r2d) ) THEN
-         IF( kdom /= jpdom_unknown ) THEN
-            CALL iom_nf90_check(NF90_GET_VAR(if90id, ivid, pv_r2d(nldi:nlei,nldj:nlej),   &
-                  &                           start=kstart(1:knbdim), count=kcount(1:knbdim)), clinfo)
-            !--- Fill the overlap areas and extra hallows (mpp)
-            CALL lbc_lnk (pv_r2d,'Z',-999.,'no0')
-         ELSE
-            CALL iom_nf90_check(NF90_GET_VAR(if90id, ivid, pv_r2d(:,:), start=kstart(1:knbdim), count=kcount(1:knbdim)), clinfo)
-         ENDIF
+         CALL iom_nf90_check( NF90_GET_VAR(if90id, ivid, pv_r2d(kx1:kx2,ky1:ky2  ), start = kstart(1:knbdim),   &
+            &                                                                       count = kcount(1:knbdim)), clinfo )
       ELSEIF( PRESENT(pv_r3d) ) THEN
-         IF( kdom /= jpdom_unknown ) THEN
-            CALL iom_nf90_check(NF90_GET_VAR(if90id, ivid, pv_r3d(nldi:nlei,nldj:nlej,:),   &
-                  &                           start=kstart(1:knbdim), count=kcount  (1:knbdim)), clinfo)
-            !--- Fill the overlap areas and extra hallows (mpp)
-            ! this if could be simplified with the new lbc_lnk that works with any size of the 3rd dimension
-            IF( kcount(3) == jpk ) THEN
-               CALL lbc_lnk( pv_r3d,'Z',-999.,'no0' )
-            ELSE   ! put some arbitrary value (a call to lbc_lnk will be done later...)
-               pv_r3d(nlei+1:jpi,      :   ,:) = 1.            
-               pv_r3d(      :   ,nlej+1:jpj,:) = 1.            
-            ENDIF
-         ELSE
-            CALL iom_nf90_check(NF90_GET_VAR(if90id, ivid, pv_r3d(:,:,:),   &
-                  &                           start=kstart(1:knbdim), count=kcount  (1:knbdim)), clinfo)
-         ENDIF
+         CALL iom_nf90_check( NF90_GET_VAR(if90id, ivid, pv_r3d(kx1:kx2,ky1:ky2,:), start = kstart(1:knbdim),   &
+            &                                                                       count = kcount(1:knbdim)), clinfo )
       ENDIF
       !