Changeset 6914 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90

Timestamp:

2016-09-06T13:27:38+02:00 (8 years ago)

Author:

gm

Message:

#1692 - branch SIMPLIF_2_usrdef: final adjustment of OVERFLOW and LOCK-ECHANGE configuration

File:

• branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90 (modified) (5 diffs)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90

@@ -2 +2 @@
    !!==============================================================================
    !!                       ***  MODULE usrdef_zgr  ***
+   !!
+   !!                   ===      LOCK_EXCHANGE case      ===
+   !!
    !! Ocean domain : user defined vertical coordinate system 
-   !!
-   !!                       ===      LOCK_EXCHANGE case      ===
-   !!
    !!==============================================================================
-   !! History :  4.0  ! 2016-08  (G. Madec)  Original code
+   !! History :  4.0  ! 2016-08  (G. Madec, S. Flavoni)  Original code
    !!----------------------------------------------------------------------
 
    !!----------------------------------------------------------------------
-   !!   usr_def_zgr      : user defined vertical coordinate system (required)
-   !!       zgr_z1d      : reference 1D z-coordinate 
-   !!       zgr_zps      : 3D vertical coordinate in z-partial cell coordinate
+   !!   usr_def_zgr   : user defined vertical coordinate system (required)
+   !!       zgr_z1d   : reference 1D z-coordinate 
    !!---------------------------------------------------------------------
-   USE oce               ! ocean variables
-   USE dom_oce  ,  ONLY: ln_zco, ln_zps, ln_sco   ! ocean space and time domain
-   USE dom_oce  ,  ONLY: nimpp, njmpp             ! ocean space and time domain
-   USE dom_oce  ,  ONLY: glamt                    ! ocean space and time domain
-   USE usrdef_nam        ! User defined : namelist variables
+   USE oce            ! ocean variables
+   USE dom_oce ,  ONLY: ln_zco, ln_zps, ln_sco   ! ocean space and time domain
+   USE usrdef_nam     ! User defined : namelist variables
    !
-   USE in_out_manager    ! I/O manager
-   USE lbclnk            ! ocean lateral boundary conditions (or mpp link)
-   USE lib_mpp           ! distributed memory computing library
-   USE wrk_nemo          ! Memory allocation
-   USE timing            ! Timing
+   USE in_out_manager ! I/O manager
+   USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
+   USE lib_mpp        ! distributed memory computing library
+   USE wrk_nemo       ! Memory allocation
+   USE timing         ! Timing
 
    IMPLICIT NONE
@@ -62 +59 @@
       INTEGER , DIMENSION(:,:)  , INTENT(out) ::   k_top, k_bot                ! first & last ocean level
       !
-      INTEGER  ::   ji, jj, jk        ! dummy indices
-      INTEGER  ::   ik                ! local integers
-      REAL(wp) ::   zfact, z1_jpkm1   ! local scalar
-      REAL(wp) ::   ze3min            ! local scalar
-      REAL(wp), DIMENSION(jpi,jpj) ::   zht, zhu, z2d   ! 2D workspace
+      INTEGER  ::   jk   ! dummy indices
+      REAL(wp), DIMENSION(jpi,jpj) ::   z2d   ! 2D workspace
       !!----------------------------------------------------------------------
       !
@@ -77 +71 @@
       ! ---------------------------
       ! set in usrdef_nam.F90 by reading the namusr_def namelist only ln_zco
+      ln_zco    = .TRUE.       ! z-partial-step coordinate
       ln_zps    = .FALSE.      ! z-partial-step coordinate
       ln_sco    = .FALSE.      ! s-coordinate
@@ -87 +82 @@
       !                       !==  UNmasked meter bathymetry  ==!
       !
-      ! flat bassin (20m deep and 64000m wide)
+      ! flat bassin (20m deep and 64000m wide, set through the jpk and jpi (see userdef_nam.F90))
       CALL zgr_z1d( pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d )   ! Reference z-coordinate system
       !
@@ -96 +91 @@
       ! the ocean basin surrounded by land (1 grid-point) set through lbc_lnk call as jperio=0 
       z2d(:,:) = 1._wp                    ! surface ocean is the 1st level
-      CALL lbc_lnk( z2d, 'T', 1. )        ! closed basin 
-      k_top(:,:) = z2d(:,:)
+      CALL lbc_lnk( z2d, 'T', 1. )        ! closed basin since jperio = 0 (see userdef_nam.F90)
+      k_top(:,:) = NINT( z2d(:,:) )
       !
       !                              
-      IF ( ln_zco ) THEN      !==  z-coordinate  ==!   (step-like topography)
-         !
-         !                                !* bottom ocean compute from the depth of grid-points
-         k_bot(:,:) = jpkm1 * k_top(:,:)     ! here use k_top as a land mask
-         !                                !* horizontally uniform coordinate (reference z-co everywhere)
-         DO jk = 1, jpk
-            pdept(:,:,jk) = pdept_1d(jk)
-            pdepw(:,:,jk) = pdepw_1d(jk)
-            pe3t (:,:,jk) = pe3t_1d (jk)
-            pe3u (:,:,jk) = pe3t_1d (jk)
-            pe3v (:,:,jk) = pe3t_1d (jk)
-            pe3f (:,:,jk) = pe3t_1d (jk)
-            pe3w (:,:,jk) = pe3w_1d (jk)
-            pe3uw(:,:,jk) = pe3w_1d (jk)
-            pe3vw(:,:,jk) = pe3w_1d (jk)
-         END DO
-      ENDIF
+      !                       !==  z-coordinate  ==!   (step-like topography)
       !
+      !                                !* bottom ocean compute from the depth of grid-points
+      k_bot(:,:) = jpkm1 * k_top(:,:)     ! here use k_top as a land mask
+      !                                !* horizontally uniform coordinate (reference z-co everywhere)
+      DO jk = 1, jpk
+         pdept(:,:,jk) = pdept_1d(jk)
+         pdepw(:,:,jk) = pdepw_1d(jk)
+         pe3t (:,:,jk) = pe3t_1d (jk)
+         pe3u (:,:,jk) = pe3t_1d (jk)
+         pe3v (:,:,jk) = pe3t_1d (jk)
+         pe3f (:,:,jk) = pe3t_1d (jk)
+         pe3w (:,:,jk) = pe3w_1d (jk)
+         pe3uw(:,:,jk) = pe3w_1d (jk)
+         pe3vw(:,:,jk) = pe3w_1d (jk)
+      END DO
       !
    END SUBROUTINE usr_def_zgr