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 12598 for NEMO/releases/r4.0/r4.0-HEAD – NEMO

Ignore:
Timestamp:
2020-03-25T10:02:31+01:00 (4 years ago)
Author:
smasson
Message:

r4.0-HEAD: ice_agrif bugfix, see #2422

Location:
NEMO/releases/r4.0/r4.0-HEAD
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/IOM/iom.F90

    r12283 r12598  
    109109      CHARACTER(len=lc) :: clname 
    110110      INTEGER             :: irefyear, irefmonth, irefday 
    111       INTEGER           :: ji, jkmin 
     111      INTEGER           :: ji 
    112112      LOGICAL :: llrst_context              ! is context related to restart 
    113113      ! 
     
    206206 
    207207          ! Add vertical grid bounds 
    208           jkmin = MIN(2,jpk)  ! in case jpk=1 (i.e. sas2D) 
    209208          zt_bnds(2,:        ) = gdept_1d(:) 
    210           zt_bnds(1,jkmin:jpk) = gdept_1d(1:jpkm1) 
     209          zt_bnds(1,2:jpk    ) = gdept_1d(1:jpkm1) 
    211210          zt_bnds(1,1        ) = gdept_1d(1) - e3w_1d(1) 
    212211          zw_bnds(1,:        ) = gdepw_1d(:) 
    213           zw_bnds(2,1:jpkm1  ) = gdepw_1d(jkmin:jpk) 
     212          zw_bnds(2,1:jpkm1  ) = gdepw_1d(2:jpk) 
    214213          zw_bnds(2,jpk:     ) = gdepw_1d(jpk) + e3t_1d(jpk) 
    215214          CALL iom_set_axis_attr( "deptht", bounds=zw_bnds ) 
  • NEMO/releases/r4.0/r4.0-HEAD/tests/ICE_AGRIF/MY_SRC/usrdef_nam.F90

    r11536 r12598  
    9090         kpj = nbcellsy + 2 + 2*nbghostcells 
    9191      ENDIF 
    92       kpk = 1 
     92      kpk = 2 
    9393      ! 
    9494!!      zlx = (kpi-2)*rn_dx*1.e-3 
  • NEMO/releases/r4.0/r4.0-HEAD/tests/ICE_AGRIF/MY_SRC/usrdef_zgr.F90

    r10516 r12598  
    9191      !                       !==  z-coordinate  ==!   (step-like topography) 
    9292      !                                !* bottom ocean compute from the depth of grid-points 
    93       jpkm1 = jpk 
     93      jpkm1 = jpk-1 
    9494      k_bot(:,:) = 1    ! here use k_top as a land mask 
    9595      !                                !* horizontally uniform coordinate (reference z-co everywhere) 
Note: See TracChangeset for help on using the changeset viewer.