Changeset 109 for trunk/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

Timestamp:

2004-06-28T12:21:11+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE069 : Vorticity diagnostics has been added

File:

• trunk/NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) (8 diffs)

trunk/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

@@ -75 +75 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   &
          zwi                             ! temporary workspace arrays
-#if defined key_trddyn
+#if defined key_trddyn || defined key_trd_vor
       INTEGER ::   &
-         ikbu, ikbum1, ikbv, ikbvm1   &  ! temporary integers
+         ikbu, ikbum1, ikbv, ikbvm1     ! temporary integers
 #endif
       !!----------------------------------------------------------------------
@@ -94 +94 @@
       IF( neuler == 0 .AND. kt == nit000 )   z2dt = rdt
       ! Normalization to obtain the general momentum trend ua
-#if defined key_trddyn
+#if defined key_trddyn || defined key_trd_vor
       ! Save the previously computed trend
       DO jk = 1, jpkm1
@@ -190 +190 @@
       END DO
 
-#if defined key_trddyn
+#if defined key_trddyn || defined key_trd_vor
       ! diagnose surface and bottom momentum fluxes
       DO jj = 2, jpjm1   
@@ -203 +203 @@
             ! subtract surface forcing and bottom friction trend from vertical
             ! diffusive momentum trend
-            utrd(ji,jj,1     ,7) = utrd(ji,jj,1     ,7) - tautrd(ji,jj,1)
-            utrd(ji,jj,ikbum1,7) = utrd(ji,jj,ikbum1,7) - tautrd(ji,jj,3)
+            utrd(ji,jj,1     ,7) = utrd(ji,jj,1     ,7) + tautrd(ji,jj,1)
+            utrd(ji,jj,ikbum1,7) = utrd(ji,jj,ikbum1,7) + tautrd(ji,jj,3)
          END DO
       END DO
@@ -214 +214 @@
             DO ji = fs_2, fs_jpim1   ! vector opt.
                zua = ( ua(ji,jj,jk) - ub(ji,jj,jk) ) / z2dt
-#if defined key_trddyn
+#if defined key_trddyn || defined key_trd_vor
                ! save the vertical diffusive momentum trend (general trend - previous one)
                utrd(ji,jj,jk,7) = zua - utrd(ji,jj,jk,7)
@@ -309 +309 @@
       END DO
 
-#if defined key_trddyn
+#if defined key_trddyn || defined key_trd_vor
       ! diagnose surface and bottom momentum fluxes
       DO jj = 2, jpjm1   
@@ -322 +322 @@
             ! subtract surface forcing and bottom friction trend from vertical
             ! diffusive momentum trend
-            vtrd(ji,jj,1     ,7) = vtrd(ji,jj,1     ,7) - tautrd(ji,jj,2)
-            vtrd(ji,jj,ikbvm1,7) = vtrd(ji,jj,ikbvm1,7) - tautrd(ji,jj,4)
+            vtrd(ji,jj,1     ,7) = vtrd(ji,jj,1     ,7) + tautrd(ji,jj,2)
+            vtrd(ji,jj,ikbvm1,7) = vtrd(ji,jj,ikbvm1,7) + tautrd(ji,jj,4)
          END DO
       END DO
@@ -333 +333 @@
             DO ji = fs_2, fs_jpim1   ! vector opt.
                zva = ( va(ji,jj,jk) - vb(ji,jj,jk) ) / z2dt
-#if defined key_trddyn
+#if defined key_trddyn || defined key_trd_vor
                ! save the vertical diffusive momentum fluxes
                vtrd(ji,jj,jk,7) = zva - vtrd(ji,jj,jk,7)