Changeset 200

Timestamp:

2004-12-22T16:49:40+01:00 (19 years ago)

Author:

opalod

Message:

CT : UPDATE141 : use logicals lk_dynspg_fsc or lk_dynspg_fsc_tsk instead of associated cpp keys

Location:

trunk/NEMO/OPA_SRC/TRA

Files:

• traadv_cen2.F90 (modified) (3 diffs)
• traadv_cen2_atsk.h90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/TRA/traadv_cen2.F90

@@ -21 +21 @@
    USE in_out_manager  ! I/O manager
    USE diaptr          ! poleward transport diagnostics
+   USE dynspg_fsc      ! 
+   USE dynspg_fsc_atsk ! 
 
    IMPLICIT NONE
@@ -178 +180 @@
 
 #if defined key_trabbl_adv
-
       ! Advective bottom boundary layer 
       ! -------------------------------
@@ -334 +335 @@
 
       ! Surface value
-#if defined key_dynspg_fsc
-      ! free surface-constant volume
-      zwx(:,:, 1 ) = zwn(:,:,1) * tn(:,:,1)
-      zwy(:,:, 1 ) = zwn(:,:,1) * sn(:,:,1)
-#else
-      ! rigid lid : flux set to zero
-      zwx(:,:, 1 ) = 0.e0    ;    zwy(:,:, 1 ) = 0.e0
-#endif
+      IF( lk_dynspg_fsc ) THEN
+         ! free surface-constant volume
+         zwx(:,:, 1 ) = zwn(:,:,1) * tn(:,:,1)
+         zwy(:,:, 1 ) = zwn(:,:,1) * sn(:,:,1)
+      ELSE
+         ! rigid lid : flux set to zero
+         zwx(:,:, 1 ) = 0.e0    ;    zwy(:,:, 1 ) = 0.e0
+      ENDIF
 
       ! 1. Vertical advective fluxes

trunk/NEMO/OPA_SRC/TRA/traadv_cen2_atsk.h90

@@ -139 +139 @@
          !                                             ! ===============
 #if defined key_trabbl_adv
-
          ! Advective bottom boundary layer
          ! -------------------------------
@@ -285 +284 @@
 
          ! Surface value
-#if defined key_dynspg_fsc
-         ! free surface-constant volume
-         zwz(:,jj, 1 ) = zwn(:,jj,1) * tn(:,jj,1)
-         zww(:,jj, 1 ) = zwn(:,jj,1) * sn(:,jj,1)
-#endif
-#if defined key_dynspg_rl
-         ! rigid lid : flux set to zero
-         zwz(:,jj, 1 ) = 0.e0    ;    zww(:,jj, 1 ) = 0.e0
-#endif
+         IF( lk_dynspg_fsc_tsk ) THEN
+            ! free surface-constant volume
+            zwz(:,jj, 1 ) = zwn(:,jj,1) * tn(:,jj,1)
+            zww(:,jj, 1 ) = zwn(:,jj,1) * sn(:,jj,1)
+         ELSE
+            ! rigid lid : flux set to zero
+            zwz(:,jj, 1 ) = 0.e0    ;    zww(:,jj, 1 ) = 0.e0
+         ENDIF
          
          ! 1. Vertical advective fluxes