Changeset 359 for trunk/NEMO/OPA_SRC/TRA/traadv_tvd.F90

Timestamp:

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

Author:

opalod

Message:

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

File:

• trunk/NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -17 +17 @@
    USE trdmod_oce      ! ocean variables trends
    USE in_out_manager  ! I/O manager
-   USE dynspg_fsc      ! surface pressure gradient 
-   USE dynspg_fsc_atsk ! autotasked surface pressure gradient
+   USE dynspg          ! choice/control of key cpp for surface pressure gradient
    USE trabbl          ! Advective term of BBL
    USE lib_mpp
@@ -65 +64 @@
       !!   8.5  !  02-06  (G. Madec)  F90: Free form and module
       !!   9.0  !  04-01  (A. de Miranda, G. Madec, J.M. Molines ): advective bbl
-      !!   9.0  !  08-04  (S. Cravatte) add the i-, j- & k- trends computation
+      !!    "   !  08-04  (S. Cravatte) add the i-, j- & k- trends computation
+      !!    "   !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
       !! * Modules used
@@ -159 +159 @@
       ! upstream tracer flux in the k direction
       ! Surface value
-      IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN   ! free surface-constant volume
+      IF( lk_dynspg_rl ) THEN          ! rigid lid : flux set to zero
+         ztw(:,:,1) = 0.e0
+         zsw(:,:,1) = 0.e0
+      ELSE                 ! free surface
          DO jj = 1, jpj
             DO ji = 1, jpi
@@ -167 +170 @@
             END DO
          END DO
-      ELSE                                              ! rigid lid : flux set to zero
-         ztw(:,:,1) = 0.e0
-         zsw(:,:,1) = 0.e0
       ENDIF