Changeset 1528 for trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90

Timestamp:

2009-07-23T16:38:47+02:00 (15 years ago)

Author:

rblod

Message:

Suppress rigid-lid option, see ticket #486

File:

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

trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90

@@ -110 +110 @@
       !!        zcenu = centered flux = wn * mk(tn)
       !!         The surface boundary condition is :
-      !!      rigid-lid (lk_dynspg_frd = T) : zero advective flux
-      !!      free-surf (lk_dynspg_fsc = T) : wn(:,:,1) * tn(:,:,1)
+      !!      variable volume (lk_vvl = T) : zero advective flux
+      !!      lin. free-surf  (lk_vvl = F) : wn(:,:,1) * tn(:,:,1)
       !!         Add this trend now to the general trend of tracer (ta,sa):
       !!            (ta,sa) = (ta,sa) + ( zta , zsa )
@@ -333 +333 @@
 
       ! Surface value
-      IF( lk_dynspg_rl .OR. lk_vvl ) THEN
-         ! rigid lid or variable volume: flux set to zero
+      IF( lk_vvl ) THEN
+         ! variable volume: flux set to zero
          zwx(:,:, 1 ) = 0.e0    ;    zwy(:,:, 1 ) = 0.e0
       ELSE
-         ! free surface
+         ! free surface-constant volume
          zwx(:,:, 1 ) = pwn(:,:,1) * tn(:,:,1)
          zwy(:,:, 1 ) = pwn(:,:,1) * sn(:,:,1)