Changeset 7279 for branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2016-11-21T11:23:19+01:00 (7 years ago)

Author:

jcastill

Message:

Final changes and bug fixes, tests successful

File:

• branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (2 diffs)

branches/UKMO/r5936_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -134 +134 @@
       IF( lk_zdfgls  )   CALL zdf_gls( kstp )            ! GLS closure scheme for Kz
       IF( ln_zdfqiao )   THEN
-        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)
+         !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
-          END DO
-         END DO
+         ENDIF
       ENDIF
       !
@@ -231 +236 @@
                          CALL dyn_adv       ( kstp )  ! advection (vector or flux form)
                          CALL dyn_vor       ( kstp )  ! vorticity term including Coriolis
-      IF( ln_stcor    )  CALL dyn_stcor     ( kstp )  ! Stokes-Coriolis forcing
+      IF( ln_wave .AND. ln_sdw .AND. ln_stcor    )  &
+               &         CALL dyn_stcor     ( kstp )  ! Stokes-Coriolis forcing
                          CALL dyn_ldf       ( kstp )  ! lateral mixing
                          CALL dyn_hpg       ( kstp )  ! horizontal gradient of Hydrostatic pressure