Changeset 7355 for branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

Timestamp:

2016-11-28T18:21:42+01:00 (8 years ago)

Author:

flavoni

Message:

merge branch dev_CNRS_2016 & dev_CNRS_AGRIF_LIM3

File:

• branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 (modified) (2 diffs)

branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -96 +96 @@
       CHARACTER(len=19) :: cldate 
       CHARACTER(len=10) :: clname
-      INTEGER           ::   ji
+      INTEGER           :: ji, jkmin
       !
       REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: z_bnds
@@ -169 +169 @@
 
       ! Add vertical grid bounds
+      jkmin = MIN(2,jpk)  ! in case jpk=1 (i.e. sas2D)
       z_bnds(:      ,1) = gdepw_1d(:)
-      z_bnds(1:jpkm1,2) = gdepw_1d(2:jpk)
+      z_bnds(1:jpkm1,2) = gdepw_1d(jkmin:jpk)
       z_bnds(jpk:   ,2) = gdepw_1d(jpk) + e3t_1d(jpk)
       CALL iom_set_axis_attr( "deptht", bounds=z_bnds )
       CALL iom_set_axis_attr( "depthu", bounds=z_bnds )
       CALL iom_set_axis_attr( "depthv", bounds=z_bnds )
-      z_bnds(:    ,2) = gdept_1d(:)
-      z_bnds(2:jpk,1) = gdept_1d(1:jpkm1)
-      z_bnds(1    ,1) = gdept_1d(1) - e3w_1d(1)
+      z_bnds(:        ,2) = gdept_1d(:)
+      z_bnds(jkmin:jpk,1) = gdept_1d(1:jpkm1)
+      z_bnds(1        ,1) = gdept_1d(1) - e3w_1d(1)
       CALL iom_set_axis_attr( "depthw", bounds=z_bnds )