Changeset 497 for trunk/NEMO/OFF_SRC/DOM/dom_oce.F90

Timestamp:

2006-09-12T13:03:53+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_064:CE:re-organization of coordinate definition and scale factors

File:

• trunk/NEMO/OFF_SRC/DOM/dom_oce.F90 (modified) (2 diffs)

trunk/NEMO/OFF_SRC/DOM/dom_oce.F90

@@ -83 +83 @@
       ff                  !: coriolis factor (2.*omega*sin(yphi) ) (s-1)
 
+
    !!----------------------------------------------------------------------
    !! vertical coordinate and scale factors
    !! --------------------------------------
 
-   REAL(wp), PUBLIC ::   & !!: * namelist namdom *
-      e3zps_min = 5.0,   &  !: miminum thickness for partial steps (meters)
-      e3zps_rat = 0.1       !: minimum thickness ration for partial steps
+   LOGICAL, PUBLIC ::           & !!: namzgr : vertical coordinate
+      ln_zco     =  .TRUE.  ,   &  !: z-coordinate - full step
+      ln_zps     =  .FALSE. ,   &  !: z-coordinate - partial step
+      ln_sco     =  .FALSE.        !: s-coordinate or hybrid z-s coordinate
 
-   !! z-coordinate (default option) (also used in the other cases
-   !! -----------------------------  as reference z-coordinate)
+#if defined key_zco
+   LOGICAL, PUBLIC, PARAMETER ::   lk_zco = .TRUE.    !: z-coordinate flag (1D arrays)
+#else
+   LOGICAL, PUBLIC, PARAMETER ::   lk_zco = .FALSE.   !: z-coordinate flag (3D arrays)
+
+   !! All coordinates
+   !! ---------------
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   &  !:
+      gdep3w        ,    &  !: depth of T-points (sum of e3w) (m)
+      gdept , gdepw ,    &  !: analytical depth at T-W  points (m)
+      e3v   , e3f   ,    &  !: analytical vertical scale factors at  V--F
+      e3t   , e3u   ,    &  !:                                       T--U  points (m)
+      e3vw          ,    &  !: analytical vertical scale factors at  VW--
+      e3w   , e3uw          !:                                        W--UW  points (m)
+#endif
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
+      hur, hvr,          &  !: inverse of u and v-points ocean depth (1/m)
+      hu , hv               !: depth at u- and v-points (meters)
+
+   !! z-coordinate with full steps (also used in the other cases as reference z-coordinate)
+   !! =-----------------====------
    REAL(wp), PUBLIC, DIMENSION(jpk) ::   &  !:
-      gdept, gdepw,    &  !: reference depth of t- and w-points (m)
-      e3t, e3w            !: reference vertical scale factors at T- and W-pts (m)
+      gdept_0, gdepw_0,       &  !: reference depth of t- and w-points (m)
+      e3t_0  , e3w_0             !: reference vertical scale factors at T- and W-pts (m)
 
-#if defined key_partial_steps
-   !! Partial steps ('key_partial_steps')
-   !! -----------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zps = .TRUE.   !: partial steps flag
-   LOGICAL, PUBLIC, PARAMETER ::   lk_sco = .FALSE.  !: s-coordinate flag
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zco = .FALSE.  !: z-coordinate flag
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   &  !:
-      gdep3w,                 &  !: ???
-      gdept_ps, gdepw_ps,     &  !: depth of t- and w-points (m)
-      e3t_ps, e3u_ps, e3v_ps, &  !: vertical scale factors at t-, u-, w-,
-      e3w_ps, e3f_ps,         &  !: w- and f- points (m)
-      e3uw_ps, e3vw_ps           !: uw- and vw- points (m)
+   !! z-coordinate with partial steps
+   !! =-----------------=======------
+   REAL(wp), PUBLIC ::      & !!: * namelist namdom *
+      e3zps_min = 5.0_wp,   &  !: miminum thickness for partial steps (meters)
+      e3zps_rat = 0.1_wp       !: minimum thickness ration for partial steps
 
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &  !:
       hdept, hdepw, e3tp, e3wp   !: ???
 
-#elif defined key_s_coord
-   !! s-coordinate ('key_s_coord')
-   !! ----------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zps = .FALSE.   !: partial steps flag
-   LOGICAL, PUBLIC, PARAMETER ::   lk_sco = .TRUE.    !: s-coordinate flag
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zco = .FALSE.   !: z-coordinate flag
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
-      hbatt, hbatu,    &  !: ocean depth at the vertical of  t-, u-, v-
-      hbatv               !: and f-point (m)
-
+   !! s-coordinate and hybrid z-s-coordinate
+   !! =----------------======---------------
    REAL(wp), PUBLIC, DIMENSION(jpk) ::   &   !:
-      gsigt, gsigw ,   &  !: model level depth coefficient at t-, w-levels
-      gsi3w,           &  !: model level depth coefficient at w-level
-                          !  defined as the sum of e3w scale factors
+      gsigt, gsigw ,   &  !: model level depth coefficient at t-, w-levels (analytic)
+      gsi3w        ,   &  !: model level depth coefficient at w-level (sum of gsigw)
       esigt, esigw        !: vertical scale factor coef. at t-, w-levels
 
-#else
-   !! z-coordinate (Default option)
-   !! -----------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zps = .FALSE.   !: partial steps flag
-   LOGICAL, PUBLIC, PARAMETER ::   lk_sco = .FALSE.   !: s-coordinate flag
-   LOGICAL, PUBLIC, PARAMETER ::   lk_zco = .TRUE.    !: s-coordinate flag
-#endif
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
+      hbatv , hbatf ,   &  !: ocean depth at the vertical of  V--F
+      hbatt , hbatu ,   &  !:                                 T--U  points (m)
+      scosrf, scobot,   &  !:  ocean surface and bottom topographies (if deviating from coordinate surfaces in HYBRID)
+      hifv  , hiff  ,   &  !: interface depth between stretching    at  V--F
+      hift  , hifu         !: and quasi-uniform spacing                 T--U  points (m)
+
+
    !!----------------------------------------------------------------------
    !! masks, bathymetry
@@ -180 +186 @@
       !                        ! parameterize exchanges through straits
 
+#if defined key_off_degrad
+   !! ------------------------------------------------
+   !! Degradation method
+   !! --------------------------------------------------
+   REAL(wp), PUBLIC, DIMENSION (jpi,jpj,jpk) :: &
+      facvol  !! volume for degraded regions
+#endif
+
    !!----------------------------------------------------------------------
 END MODULE dom_oce