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 4990 for trunk/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 – NEMO

Ignore:
Timestamp:
2014-12-15T17:42:49+01:00 (9 years ago)
Author:
timgraham
Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

File:
1 edited

Legend:

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

    r4671 r4990  
    6767         imask                                ! temporary global workspace 
    6868      REAL(wp), DIMENSION(jpiglo,jpjglo) ::   & 
    69          zdta                   ! temporary data workspace 
     69         zdta, zdtaisf                     ! temporary data workspace 
    7070      REAL(wp) ::   zidom , zjdom          ! temporary scalars 
    7171 
    7272      ! read namelist for ln_zco 
    73       NAMELIST/namzgr/ ln_zco, ln_zps, ln_sco 
     73      NAMELIST/namzgr/ ln_zco, ln_zps, ln_sco, ln_isfcav 
    7474 
    7575      !!---------------------------------------------------------------------- 
     
    109109      ENDIF 
    110110      CALL iom_close (inum) 
     111       
     112      ! used to compute the land processor in case of not masked bathy file. 
     113      zdtaisf(:,:) = 0.0_wp 
     114      IF ( ln_isfcav ) THEN 
     115         CALL iom_open ( 'bathy_meter.nc', inum )   ! Meter bathy in case of partial steps 
     116         CALL iom_get ( inum, jpdom_unknown, 'isf_draft' , zdtaisf, kstart=(/jpizoom,jpjzoom/), kcount=(/jpiglo,jpjglo/) ) 
     117      END IF 
     118      CALL iom_close (inum) 
    111119 
    112120      ! land/sea mask over the global/zoom domain 
    113121 
    114122      imask(:,:)=1 
    115       WHERE ( zdta(:,:) <= 0. ) imask = 0 
     123      WHERE ( zdta(:,:) - zdtaisf(:,:) <= 0. ) imask = 0 
    116124 
    117125      !  1. Dimension arrays for subdomains 
Note: See TracChangeset for help on using the changeset viewer.