Changeset 14580 for NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DIA/diawri.F90

Timestamp:

2021-03-04T10:32:30+01:00 (2 years ago)

Author:

clem

Message:

4.0-HEAD: solve ticket #2620

File:

• NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DIA/diawri.F90 (modified) (1 diff)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DIA/diawri.F90

@@ -211 +211 @@
       ENDIF
 
-      IF( ln_zad_Aimp ) wn = wn + wi               ! Recombine explicit and implicit parts of vertical velocity for diagnostic output
-      !
-      CALL iom_put( "woce", wn )                   ! vertical velocity
+      !                                            ! vertical velocity
+      IF( ln_zad_Aimp ) THEN   ;   CALL iom_put( "woce", wn + wi )   ! explicit plus implicit parts
+      ELSE                     ;   CALL iom_put( "woce", wn )
+      ENDIF
+
       IF( iom_use('w_masstr') .OR. iom_use('w_masstr2') ) THEN   ! vertical mass transport & its square value
-         ! Caution: in the VVL case, it only correponds to the baroclinic mass transport.
-         z2d(:,:) = rau0 * e1e2t(:,:)
+         !                     ! Caution: in the VVL case, it only correponds to the baroclinic mass transport.
          DO jk = 1, jpk
-            z3d(:,:,jk) = wn(:,:,jk) * z2d(:,:)
+            IF( ln_zad_Aimp ) THEN
+               z3d(:,:,jk) = rau0 * e1e2t(:,:) * ( wn(:,:,jk) + wi(:,:,jk) )
+            ELSE
+               z3d(:,:,jk) = rau0 * e1e2t(:,:) * wn(:,:,jk)
+            ENDIF
          END DO
          CALL iom_put( "w_masstr" , z3d )  
-         IF( iom_use('w_masstr2') )   CALL iom_put( "w_masstr2", z3d(:,:,:) * z3d(:,:,:) )
-      ENDIF
-      !
-      IF( ln_zad_Aimp ) wn = wn - wi               ! Remove implicit part of vertical velocity that was added for diagnostic output
-
+         IF( iom_use('w_masstr2') )   CALL iom_put( "w_masstr2", z3d * z3d )
+      ENDIF
+      
       CALL iom_put( "avt" , avt )                  ! T vert. eddy diff. coef.
       CALL iom_put( "avs" , avs )                  ! S vert. eddy diff. coef.