Changeset 7340 for branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2016-11-25T16:41:40+01:00 (7 years ago)

Author:

emanuelaclementi

Message:

#1643 Correction after review in development branch 2015/dev_r5936_INGV1_WAVE

File:

• branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (1 diff)

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -130 +130 @@
                          CALL zdf_bfr( kstp )         ! bottom friction (if quadratic)
       !                                               ! Vertical eddy viscosity and diffusivity coefficients
-      IF( lk_zdfric  )   CALL zdf_ric( kstp )            ! Richardson number dependent Kz
-      IF( lk_zdftke  )   CALL zdf_tke( kstp )            ! TKE closure scheme for Kz
-      IF( lk_zdfgls  )   CALL zdf_gls( kstp )            ! GLS closure scheme for Kz
-      IF( ln_zdfqiao )   THEN
-      !Activated Qiao enhanced turbulence but neither ln_wave or ln_sdw are activated
-       IF ( .NOT.( ln_wave .AND. ln_sdw ) )   THEN
-        CALL ctl_stop ( 'Ask for wave Qiao enhanced turbulence but ln_wave and ln_sdw have to be activated')
-       ELSE
-        CALL zdf_qiao(kstp )                             ! Qiao vertical mixing 
-         DO jk = 1, jpkm1
-          DO jj = 1, jpj
-            DO ji = 1, jpi
-               avmu(ji,jj,jk) = (avmu(ji,jj,jk) + QBvu(ji,jj,jk)) * umask(ji,jj,jk)
-               avmv(ji,jj,jk) = (avmv(ji,jj,jk) + QBvv(ji,jj,jk)) * vmask(ji,jj,jk)
-               avt( ji,jj,jk) = (avt( ji,jj,jk) + QBv(ji,jj,jk))  * tmask(ji,jj,jk)
-            END DO
-          END DO
-         END DO
-       ENDIF 
-      ENDIF
-      !
-      IF( lk_zdfcst  ) THEN                              ! Constant Kz (reset avt, avm[uv] to the background value)
+      IF( lk_zdfric  )   CALL zdf_ric ( kstp )             ! Richardson number dependent Kz
+      IF( lk_zdftke  )   CALL zdf_tke ( kstp )             ! TKE closure scheme for Kz
+      IF( lk_zdfgls  )   CALL zdf_gls ( kstp )             ! GLS closure scheme for Kz
+      IF( ln_zdfqiao )   CALL zdf_qiao( kstp )             ! Qiao vertical mixing 
+      !
+      IF( lk_zdfcst  ) THEN                                ! Constant Kz (reset avt, avm[uv] to the background value)
          avt (:,:,:) = rn_avt0 * wmask (:,:,:)
          avmu(:,:,:) = rn_avm0 * wumask(:,:,:)