Changeset 1438 for trunk/NEMO/OPA_SRC/oce.F90

Timestamp:

2009-05-11T16:34:47+02:00 (15 years ago)

Author:

rblod

Message:

Merge VVL branch with the trunk (act II), see ticket #429

File:

• trunk/NEMO/OPA_SRC/oce.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/oce.F90

@@ -4 +4 @@
    !! Ocean        :  dynamics and active tracers defined in memory 
    !!======================================================================
-   !! History :
-   !!   8.5  !  02-11  (G. Madec)  F90: Free form and module
-   !!   9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
+   !! History :  0.1  !  2002-11  (G. Madec)  F90: Free form and module
+   !!            1.0  !  2005-11  (V. Garnier) Surface pressure gradient organization
+   !!            3.1  !  2009-02  (G. Madec, M. Leclair)  pure z* coordinate
    !!----------------------------------------------------------------------
-   !!  OPA 9.0 , LOCEAN-IPSL (2005) 
-   !! $Id$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
-   !!----------------------------------------------------------------------
-   !! * Modules used
    USE par_oce      ! ocean parameters
 
@@ -20 +15 @@
    !! Physics and algorithm flags
    !! ---------------------------
-   LOGICAL, PUBLIC ::   l_traldf_rot    = .FALSE.  !: rotated laplacian operator for lateral diffusion 
+   LOGICAL, PUBLIC ::   l_traldf_rot    = .FALSE.  !: rotated laplacian operator for lateral diffusion
    LOGICAL, PUBLIC ::   ln_dynhpg_imp   = .FALSE.  !: semi-implicite hpg flag
    INTEGER, PUBLIC ::   nn_dynhpg_rst   = 0        !: add dynhpg implicit variables in restart ot not
 
-   !! dynamics and tracer fields
-   !! --------------------------
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   &   !:
-      ! before !  now      !  after  !      ! the after trends becomes the fields
-      ! fields !  fields   !  trends !      ! only in dyn(tra)_zdf and dyn(tra)_nxt
-      ub       ,  un       ,  ua     ,   &  !: i-horizontal velocity (m/s)
-      vb       ,  vn       ,  va     ,   &  !: j-horizontal velocity (m/s)
-                  wn       ,             &  !: vertical velocity (m/s)
-      rotb     ,  rotn     ,             &  !: relative vorticity (1/s)
-      hdivb    ,  hdivn    ,             &  !: horizontal divergence (1/s)
-      tb       ,  tn       ,  ta     ,   &  !: potential temperature (celcius)
-      sb       ,  sn       ,  sa            !: salinity (psu)
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   &   !:
-      rhd ,                              &  !: in situ density anomalie rhd=(rho-rau0)/rau0 (no units)
-      rhop,                              &  !: potential volumic mass (kg/m3)
-      rn2                                   !: brunt-vaisala frequency (1/s2)
+   !! dynamics and tracer fields             !  before  !  now     !  after   ! the after trends becomes the fields
+   !! --------------------------             !  fields  !  fields  !  trends  ! only after tra_zdf and dyn_spg
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   ub     ,  un      ,  ua      !: i-horizontal velocity      [m/s]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   vb     ,  vn      ,  va      !: j-horizontal velocity      [m/s]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::             wn                 !: vertical velocity          [m/s]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   rotb   ,  rotn               !: relative vorticity         [s-1]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   hdivb  ,  hdivn              !: horizontal divergence      [s-1]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   tb     ,  tn      ,  ta      !: potential temperature      [Celcius]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   sb     ,  sn      ,  sa      !: salinity                   [psu]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   rn2b   ,  rn2                !: brunt-vaisala frequency**2 [s-2]
+   !
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   rhd    !: in situ density anomalie rhd=(rho-rau0)/rau0     [no units]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   rhop   !: potential volumic mass                           [kg/m3]
 
-      !! advection scheme choice
-      !! -----------------------
-      CHARACTER(len=3), PUBLIC  ::   l_adv   !: 'ce2' centre scheme used
-         !                                   !: 'tvd' TVD scheme used
-         !                                   !: 'mus' MUSCL scheme used
-         !                                   !: 'mu2' MUSCL2 scheme used
+   !! advection scheme choice
+   !! -----------------------
+   CHARACTER(len=3), PUBLIC  ::   l_adv   !: flag for the advection scheme used (= 'ce2', 'tvd', 'mus' or ...)
 
    !! surface pressure gradient
    !! -------------------------
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
-      spgu, spgv             !: horizontal surface pressure gradient
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   spgu, spgv      !: horizontal surface pressure gradient
 
    !! interpolated gradient (only used in zps case)
    !! ---------------------
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
-      gtu, gsu, gru,      &  !: t-, s- and rd horizontal gradient at u- and 
-      gtv, gsv, grv          !: v-points at bottom ocean level 
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   gtu, gsu, gru   !: horizontal gradient of T, S and rd at bottom u-point
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   gtv, gsv, grv   !: horizontal gradient of T, S and rd at bottom v-point 
 
-   !! free surface
-   !! ------------
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
-      sshb , sshn ,        &  !: before, now sea surface height (meters)
-      sshu , sshv ,        &  !: sea surface height at u- and v- point
-      sshbb, ssha             !: before before sea surface height at t-point
+   !! free surface                       !  before  !  now     !  after   !
+   !! ------------                       !  fields  !  fields  !  trends  !
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sshb   ,  sshn    ,  ssha    !: sea surface height at t-point [m]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sshu_b ,  sshu_n  ,  sshu_a  !: sea surface height at u-point [m]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sshv_b ,  sshv_n  ,  sshv_a  !: sea surface height at u-point [m]
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   sshf_b ,  sshf_n  ,  sshf_a  !: sea surface height at f-point [m]
 
 #if defined key_dynspg_rl   ||   defined key_esopa
    !! rigid-lid formulation
    !! ---------------------
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
-      bsfb, bsfn,         &  !: before, now barotropic streamfunction (m3/s)
-      bsfd                   !: now trend of barotropic streamfunction (m3/s2)
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   bsfb, bsfn   !: before, now barotropic streamfunction (m3/s)
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   bsfd         !: now trend of barotropic streamfunction (m3/s2)
 #endif
    !!----------------------------------------------------------------------
+   !! NEMO/OPA 3.2 , LOCEAN-IPSL (2008) 
+   !! $Id$ 
+   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !!======================================================================
 END MODULE oce