Changeset 12597 for NEMO

Timestamp:

2020-03-25T09:57:21+01:00 (4 years ago)

Author:

smasson

Message:

trunk: ice_agrif bugfix, see #2421

Location:

NEMO/trunk

Files:

• src/OCE/IOM/iom.F90 (modified) (2 diffs)
• tests/ICE_AGRIF/MY_SRC/usrdef_nam.F90 (modified) (1 diff)
• tests/ICE_AGRIF/MY_SRC/usrdef_zgr.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/IOM/iom.F90

@@ -111 +111 @@
       CHARACTER(len=lc) :: clname
       INTEGER             :: irefyear, irefmonth, irefday
-      INTEGER           :: ji, jkmin
+      INTEGER           :: ji
       LOGICAL :: llrst_context              ! is context related to restart
       !
@@ -220 +220 @@
           
           ! Add vertical grid bounds
-          jkmin = MIN(2,jpk)  ! in case jpk=1 (i.e. sas2D)
-          zt_bnds(2,:        ) = gdept_1d(:)
-          zt_bnds(1,jkmin:jpk) = gdept_1d(1:jpkm1)
-          zt_bnds(1,1        ) = gdept_1d(1) - e3w_1d(1)
-          zw_bnds(1,:        ) = gdepw_1d(:)
-          zw_bnds(2,1:jpkm1  ) = gdepw_1d(jkmin:jpk)
-          zw_bnds(2,jpk:     ) = gdepw_1d(jpk) + e3t_1d(jpk)
+          zt_bnds(2,:      ) = gdept_1d(:)
+          zt_bnds(1,2:jpk  ) = gdept_1d(1:jpkm1)
+          zt_bnds(1,1      ) = gdept_1d(1) - e3w_1d(1)
+          zw_bnds(1,:      ) = gdepw_1d(:)
+          zw_bnds(2,1:jpkm1) = gdepw_1d(2:jpk)
+          zw_bnds(2,jpk:   ) = gdepw_1d(jpk) + e3t_1d(jpk)
           CALL iom_set_axis_attr(  "deptht", bounds=zw_bnds )
           CALL iom_set_axis_attr(  "depthu", bounds=zw_bnds )

NEMO/trunk/tests/ICE_AGRIF/MY_SRC/usrdef_nam.F90

@@ -89 +89 @@
          kpj = nbcellsy + 2 + 2*nbghostcells
       ENDIF
-      kpk = 1
+      kpk = 2
       !
 !!      zlx = (kpi-2)*rn_dx*1.e-3

NEMO/trunk/tests/ICE_AGRIF/MY_SRC/usrdef_zgr.F90

@@ -89 +89 @@
       !                       !==  z-coordinate  ==!   (step-like topography)
       !                                !* bottom ocean compute from the depth of grid-points
-      jpkm1 = jpk
+      jpkm1 = jpk-1
       k_bot(:,:) = 1    ! here use k_top as a land mask
       !                                !* horizontally uniform coordinate (reference z-co everywhere)