Changeset 9135 for branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC

Timestamp:

2017-12-19T16:44:50+01:00 (6 years ago)

Author:

flavoni

Message:

fix input/ouput flag of coordinates in usrdef routines

File:

• branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_zgr.F90 (modified) (5 diffs)

branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/MY_SRC/usrdef_zgr.F90

@@ -15 +15 @@
    !!---------------------------------------------------------------------
    USE oce            ! ocean variables
-   USE dom_oce ,  ONLY: ln_zco, ln_zps, ln_sco   ! ocean space and time domain
    USE dom_oce ,  ONLY: mi0, mi1, nimpp, njmpp   ! ocean space and time domain
    USE dom_oce ,  ONLY: glamt                    ! ocean space and time domain
@@ -51 +50 @@
       !!
       !!----------------------------------------------------------------------
-      LOGICAL                   , INTENT(out) ::   ld_zco, ld_zps, ld_sco      ! vertical coordinate flags
-      LOGICAL                   , INTENT(out) ::   ld_isfcav                   ! under iceshelf cavity flag
-      REAL(wp), DIMENSION(:)    , INTENT(out) ::   pdept_1d, pdepw_1d          ! 1D grid-point depth     [m]
-      REAL(wp), DIMENSION(:)    , INTENT(out) ::   pe3t_1d , pe3w_1d           ! 1D grid-point depth     [m]
-      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 
-      INTEGER , DIMENSION(:,:)  , INTENT(out) ::   k_top, k_bot                ! first & last ocean level
+      LOGICAL                   , INTENT(in   ) ::   ld_zco, ld_zps, ld_sco      ! vertical coordinate flags ( read in namusr_def )
+      LOGICAL                   , INTENT(  out) ::   ld_isfcav                   ! under iceshelf cavity flag
+      REAL(wp), DIMENSION(:)    , INTENT(  out) ::   pdept_1d, pdepw_1d          ! 1D grid-point depth     [m]
+      REAL(wp), DIMENSION(:)    , INTENT(  out) ::   pe3t_1d , pe3w_1d           ! 1D grid-point depth     [m]
+      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 
+      INTEGER , DIMENSION(:,:)  , INTENT(  out) ::   k_top, k_bot                ! first & last ocean level
       !
       INTEGER  ::   ji, jj, jk        ! dummy indices
@@ -118 +117 @@
       !                              
       !
-      IF ( ln_sco ) THEN      !==  s-coordinate  ==!   (terrain-following coordinate)
+      IF ( ld_sco ) THEN      !==  s-coordinate  ==!   (terrain-following coordinate)
          !
          k_bot(:,:) = jpkm1 * k_top(:,:)  !* bottom ocean = jpk-1 (here use k_top as a land mask)
@@ -139 +138 @@
       !
       !
-      IF ( ln_zco ) THEN      !==  z-coordinate  ==!   (step-like topography)
+      IF ( ld_zco ) THEN      !==  z-coordinate  ==!   (step-like topography)
          !
          !                                !* bottom ocean compute from the depth of grid-points
@@ -161 +160 @@
       !
       !
-      IF ( ln_zps ) THEN      !==  zps-coordinate  ==!   (partial bottom-steps)
+      IF ( ld_zps ) THEN      !==  zps-coordinate  ==!   (partial bottom-steps)
          !
          ze3min = 0.1_wp * rn_dz