Changeset 7439 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90

Timestamp:

2016-12-02T12:17:06+01:00 (8 years ago)

Author:

lovato

Message:

#1811 - Reinstate developments from dev_NOC_CMCC branch lost in merge

File:

• branches/2016/dev_merge_2016/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 (modified) (2 diffs)

branches/2016/dev_merge_2016/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, zdta    ! global workspace
+      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   zbot, ztop          ! global workspace
       REAL(wp) ::   zidom , zjdom          ! local scalars
       NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file,         &
@@ -116 +116 @@
       IF( ln_bdy .AND. ln_mask_file ) THEN
          CALL iom_open( cn_mask_file, inum )
-         CALL iom_get ( inum, jpdom_unknown, 'bdy_msk', zdta(:,:) )
+         CALL iom_get ( inum, jpdom_data, 'bdy_msk', bdytmask(:,:) )
          CALL iom_close( inum )
-         WHERE ( zdta(:,:) <= 0. ) imask = 0
+         WHERE ( bdytmask(:,:) <= 0. ) imask = 0
       ENDIF