Changeset 14072 for NEMO/trunk/tests/STATION_ASF/MY_SRC/usrdef_zgr.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/tests/STATION_ASF/MY_SRC/usrdef_zgr.F90 (modified) (4 diffs)

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

@@ -13 +13 @@
    !!----------------------------------------------------------------------
    !!   usr_def_zgr   : user defined vertical coordinate system
-   !!      zgr_z      : reference 1D z-coordinate 
+   !!      zgr_z      : reference 1D z-coordinate
    !!      zgr_top_bot: ocean top and bottom level indices
    !!      zgr_zco    : 3D verticl coordinate in pure z-coordinate case
@@ -31 +31 @@
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
-   !! $Id: usrdef_zgr.F90 12377 2020-02-12 14:39:06Z acc $
+   !! $Id: usrdef_zgr.F90 13226 2020-07-02 14:24:31Z orioltp $
    !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
@@ -54 +54 @@
       REAL(wp), DIMENSION(:,:,:), INTENT(out) ::   pdept, pdepw                ! grid-point depth        [m]
       REAL(wp), DIMENSION(:,:,:), INTENT(out) ::   pe3t , pe3u , pe3v , pe3f   ! vertical scale factors  [m]
-      REAL(wp), DIMENSION(:,:,:), INTENT(out) ::   pe3w , pe3uw, pe3vw         ! i-scale factors 
+      REAL(wp), DIMENSION(:,:,:), INTENT(out) ::   pe3w , pe3uw, pe3vw         ! i-scale factors
       INTEGER , DIMENSION(:,:)  , INTENT(out) ::   k_top, k_bot                ! first & last ocean level
       !!----------------------------------------------------------------------
@@ -85 +85 @@
       pe3uw(:,:,1) = rn_dept1  ! LB???
       pe3vw(:,:,1) = rn_dept1  ! LB???
-      
+
       !! 2nd level, technically useless (only for the sake of code stability)
       pdept_1d(2) = 3._wp*rn_dept1