Changeset 7832 for trunk/NEMOGCM

Timestamp:

2017-03-24T13:49:13+01:00 (7 years ago)

Author:

jamesharle

Message:

Fixes to reading in arrays from domain_cfg.nc and bdy_msk.nc, and updates
to landsupression mask (see tickets #1853 and #1854).

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90

@@ -67 +67 @@
          ibne  , ibnw  , ibse  , ibsw         !    "           "
       INTEGER,  DIMENSION(jpiglo,jpjglo) ::   imask               ! global workspace
-      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   zbot, ztop          ! global workspace
+      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   zbot, ztop, zbdy          ! global workspace
       REAL(wp) ::   zidom , zjdom          ! local scalars
       NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file,         &
@@ -94 +94 @@
       !
       !                                   ! ocean top and bottom level
-      CALL iom_get( inum, jpdom_data, 'bottom_level' , zbot    )  ! nb of ocean T-points
-      CALL iom_get( inum, jpdom_data, 'top_level'    , ztop    )  ! nb of ocean T-points (ISF)
+      CALL iom_get( inum, jpdom_unknown, 'bottom_level' , zbot    )  ! nb of ocean T-points
+      CALL iom_get( inum, jpdom_unknown, 'top_level'    , ztop    )  ! nb of ocean T-points (ISF)
       !
       CALL iom_close( inum )
       !
       ! 2D ocean mask (=1 if at least one level of the water column is ocean, =0 otherwise)
-      WHERE( zbot(:,:) - ztop(:,:) + 1 > 0 )   ;   imask(:,:) = 1
+      WHERE( zbot(:,:) > 0 )                   ;   imask(:,:) = 1
       ELSEWHERE                                ;   imask(:,:) = 0
       END WHERE
@@ -116 +116 @@
       IF( ln_bdy .AND. ln_mask_file ) THEN
          CALL iom_open( cn_mask_file, inum )
-         CALL iom_get ( inum, jpdom_data, 'bdy_msk', bdytmask(:,:) )
+         CALL iom_get ( inum, jpdom_unknown, 'bdy_msk', zbdy)
          CALL iom_close( inum )
-         WHERE ( bdytmask(:,:) <= 0. ) imask = 0
+         WHERE ( zbdy(:,:) <= 0. ) imask = 0
       ENDIF