New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 7832 – NEMO

Changeset 7832


Ignore:
Timestamp:
2017-03-24T13:49:13+01:00 (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90

    r7646 r7832  
    6767         ibne  , ibnw  , ibse  , ibsw         !    "           " 
    6868      INTEGER,  DIMENSION(jpiglo,jpjglo) ::   imask               ! global workspace 
    69       REAL(wp), DIMENSION(jpiglo,jpjglo) ::   zbot, ztop          ! global workspace 
     69      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   zbot, ztop, zbdy          ! global workspace 
    7070      REAL(wp) ::   zidom , zjdom          ! local scalars 
    7171      NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file,         & 
     
    9494      ! 
    9595      !                                   ! ocean top and bottom level 
    96       CALL iom_get( inum, jpdom_data, 'bottom_level' , zbot    )  ! nb of ocean T-points 
    97       CALL iom_get( inum, jpdom_data, 'top_level'    , ztop    )  ! nb of ocean T-points (ISF) 
     96      CALL iom_get( inum, jpdom_unknown, 'bottom_level' , zbot    )  ! nb of ocean T-points 
     97      CALL iom_get( inum, jpdom_unknown, 'top_level'    , ztop    )  ! nb of ocean T-points (ISF) 
    9898      ! 
    9999      CALL iom_close( inum ) 
    100100      ! 
    101101      ! 2D ocean mask (=1 if at least one level of the water column is ocean, =0 otherwise) 
    102       WHERE( zbot(:,:) - ztop(:,:) + 1 > 0 )   ;   imask(:,:) = 1 
     102      WHERE( zbot(:,:) > 0 )                   ;   imask(:,:) = 1 
    103103      ELSEWHERE                                ;   imask(:,:) = 0 
    104104      END WHERE 
     
    116116      IF( ln_bdy .AND. ln_mask_file ) THEN 
    117117         CALL iom_open( cn_mask_file, inum ) 
    118          CALL iom_get ( inum, jpdom_data, 'bdy_msk', bdytmask(:,:) ) 
     118         CALL iom_get ( inum, jpdom_unknown, 'bdy_msk', zbdy) 
    119119         CALL iom_close( inum ) 
    120          WHERE ( bdytmask(:,:) <= 0. ) imask = 0 
     120         WHERE ( zbdy(:,:) <= 0. ) imask = 0 
    121121      ENDIF 
    122122 
Note: See TracChangeset for help on using the changeset viewer.