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

Timestamp:

2005-12-21T11:46:45+01:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_033 : RB + CT : Add new surface pressure gradient algorithms

File:

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

trunk/NEMO/OPA_SRC/oce.F90

@@ -6 +6 @@
    !! History :
    !!   8.5  !  02-11  (G. Madec)  F90: Free form and module
+   !!   9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
    !!----------------------------------------------------------------------
    !!  OPA 9.0 , LOCEAN-IPSL (2005) 
@@ -62 +63 @@
 #endif
 
-#if defined key_dynspg_fsc   ||   defined key_esopa
-   !! free surface - constant volume formulation
-   !! ------------------------------------------
+   !! 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)
-# if defined key_obc
+      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
@@ -74 +75 @@
       obcumask, obcvmask     !: u-, v- Force filtering mask for the open 
       !                      !  boundary condition on grad D
-# endif
-# if defined key_trdvor
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
-       hur, hvr             !: inverse of u and v-points ocean depth (1/m)
-# endif
 #endif
+
 #if defined key_dynspg_rl   ||   defined key_esopa
    !! rigid-lid formulation
    !! ---------------------
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj) ::   &   !:
-      hur, hvr,           &  !: inverse of u and v-points ocean depth (1/m)
       bsfb, bsfn,         &  !: before, now barotropic streamfunction (m3/s)
       bsfd                   !: now trend of barotropic streamfunction (m3/s2)