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

Timestamp:

2006-05-10T19:44:38+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_057:RB: step and opa reorganization

File:

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

trunk/NEMO/OPA_SRC/oce.F90

@@ -42 +42 @@
       !! -----------------------
       CHARACTER(len=3), PUBLIC  ::   l_adv   !: 'ce2' centre scheme used
-              !                              !: 'tvd' TVD scheme used
-              !                              !: 'mus' MUSCL scheme used
-              !                              !: 'mu2' MUSCL2 scheme used
+         !                                   !: 'tvd' TVD scheme used
+         !                                   !: 'mus' MUSCL scheme used
+         !                                   !: 'mu2' MUSCL2 scheme used
 
    !! surface pressure gradient
@@ -51 +51 @@
       spgu, spgv             !: horizontal surface pressure gradient
 
-#if defined key_partial_steps     ||   defined key_esopa
-   !! interpolated 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 
-#else
-   REAL(wp), PUBLIC ::   &   !:
-      gtu, gsu, gru,      &  !: dummy scalars
-      gtv, gsv, grv          !:
-#endif
 
    !! free surface
    !! ------------
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
-      sshb, sshn,         &  !: before, now sea surface height (meters)
-      hu  , hv  ,         &  !: depth at u- and v-points (meters)
-      hur , hvr              !: inverse of u and v-points ocean depth (1/m)
-#if defined key_obc
-   REAL(wp), PUBLIC ::    &  !:
-      obcsurftot       !: Total lateral surface of open boundaries
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
-      obcumask, obcvmask     !: u-, v- Force filtering mask for the open 
-      !                      !  boundary condition on grad D
-#endif
+      sshb, sshn             !: before, now sea surface height (meters)
 
 #if defined key_dynspg_rl   ||   defined key_esopa