Changeset 7931 for branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2017-04-19T12:15:07+02:00 (7 years ago)

Author:

gm

Message:

#1880 (HPC-09): remove key_zdfddm + phasing with last changes of HPC08 branch

File:

• branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (1 diff)

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -136 +136 @@
       IF( lk_zdfcst  ) THEN                                ! Constant Kz (reset avt, avm[uv] to the background value)
          avt (:,:,:) = rn_avt0 * wmask (:,:,:)
+         avm (:,:,:) = rn_avm0 * wmask (:,:,:)
          avmu(:,:,:) = rn_avm0 * wumask(:,:,:)
          avmv(:,:,:) = rn_avm0 * wvmask(:,:,:)
       ENDIF
-
+      !
       IF( ln_rnf_mouth ) THEN                         ! increase diffusivity at rivers mouths
          DO jk = 2, nkrnf   ;   avt(:,:,jk) = avt(:,:,jk) + 2._wp * rn_avt_rnf * rnfmsk(:,:) * tmask(:,:,jk)   ;   END DO
       ENDIF
+      !
       IF( ln_zdfevd  )   CALL zdf_evd( kstp )         ! enhanced vertical eddy diffusivity
-
+      !
+      IF( ln_zdfddm  ) THEN                           ! double diffusive mixing
+                         CALL zdf_ddm( kstp )
+      ELSE                                            ! avs=avt
+         DO jk = 2, jpkm1   ;   avs(:,:,jk) = avt(:,:,jk)   ;   END DO
+      ENDIF
+      !
       IF( lk_zdftmx  )   CALL zdf_tmx( kstp )         ! tidal vertical mixing
-
-      IF( lk_zdfddm  )   CALL zdf_ddm( kstp )         ! double diffusive mixing
 
                          CALL zdf_mxl( kstp )         ! mixed layer depth