Changeset 14418

Timestamp:

2021-02-08T21:55:49+01:00 (3 years ago)

Author:

techene

Message:

#2605 correct the truncature change of ww induced by diawri when ln_zad_Aimp=T along a time step

File:

• NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DIA/diawri.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DIA/diawri.F90

@@ -250 +250 @@
          CALL iom_put( "sbv", z2d )                ! bottom j-current
       ENDIF
-
-      IF( ln_zad_Aimp ) ww = ww + wi               ! Recombine explicit and implicit parts of vertical velocity for diagnostic output
-      CALL iom_put( "woce", ww )                   ! vertical velocity
-
+      
+      IF( ln_zad_Aimp ) THEN                       ! Recombine explicit and implicit parts of vertical velocity for diagnostic output
+         CALL iom_put( "woce", ww + wi )           ! vertical velocity
+      ELSE
+         CALL iom_put( "woce", ww )                ! vertical velocity
+      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(:,:) = rho0 * e1e2t(:,:)
-         DO jk = 1, jpk
-            z3d(:,:,jk) = ww(:,:,jk) * z2d(:,:)
-         END DO
+         IF( ln_zad_Aimp ) THEN
+            DO jk = 1, jpk
+               z3d(:,:,jk) = ( ww(:,:,jk) + wi(:,:,jk) ) * z2d(:,:)
+            END DO
+         ELSE
+            DO jk = 1, jpk
+               z3d(:,:,jk) = ww(:,:,jk) * z2d(:,:)
+            END DO
+         ENDIF
          CALL iom_put( "w_masstr" , z3d )  
          IF( iom_use('w_masstr2') )   CALL iom_put( "w_masstr2", z3d(:,:,:) * z3d(:,:,:) )
       ENDIF
-      !
-      IF( ln_zad_Aimp ) ww = ww - wi               ! Remove implicit part of vertical velocity that was added for diagnostic output
 
       CALL iom_put( "avt" , avt )                  ! T vert. eddy diff. coef.