Changeset 1239 for trunk/NEMO/OPA_SRC/step.F90

Timestamp:

2008-12-31T10:35:35+01:00 (16 years ago)

Author:

ctlod

Message:

this version allows to stabilize the computation of En production term, see ticket: #281

File:

• trunk/NEMO/OPA_SRC/step.F90 (modified) (8 diffs)

trunk/NEMO/OPA_SRC/step.F90

@@ -88 +88 @@
    USE zdfbfr          ! bottom friction                  (zdf_bfr routine)
    USE zdftke          ! TKE vertical mixing              (zdf_tke routine)
+   USE zdftke2         ! TKE2 vertical mixing             (zdf_tke2 routine)
    USE zdfkpp          ! KPP vertical mixing              (zdf_kpp routine)
    USE zdfddm          ! double diffusion mixing          (zdf_ddm routine)
@@ -202 +203 @@
       ! Ocean physics update
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+#if defined key_zdftke2
+      IF ( ln_dynhpg_imp ) THEN
+      !-----------------------------------------------------------------------
+      !  LATERAL PHYSICS
+      !-----------------------------------------------------------------------
+      ! N.B. ua, va, ta, sa arrays are used as workspace in this section
+      !-----------------------------------------------------------------------
+                               CALL zdf_mxl( kstp )                 ! mixed layer depth
+         IF( lk_ldfslp     )   CALL ldf_slp( kstp, rhd, rn2 )       ! before slope of the lateral mixing
+#  if defined key_traldf_c2d
+         IF( lk_traldf_eiv )   CALL ldf_eiv( kstp )                 ! eddy induced velocity coefficient
+#  endif
+      ENDIF
+#endif
       !-----------------------------------------------------------------------
       !  VERTICAL PHYSICS
@@ -207 +222 @@
       ! N.B. ua, va, ta, sa arrays are used as workspace in this section
       !-----------------------------------------------------------------------
-
+#if defined key_zdftke2
+                        CALL bn2( tn, sn, rn2 )              ! now Brunt-Vaisala frequency
+#else
                         CALL bn2( tb, sb, rn2 )              ! before Brunt-Vaisala frequency
-      
+#endif
       !                                                     ! 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_zdftke )   CALL zdf_tke ( kstp )                      ! TKE  closure scheme for Kz
+      IF( lk_zdftke2)   CALL zdf_tke2( kstp )                      ! TKE2 closure scheme for Kz
 
       IF( lk_zdfkpp )   CALL zdf_kpp( kstp )                       ! KPP closure scheme for Kz
@@ -236 +254 @@
                         CALL zdf_mxl( kstp )                 ! mixed layer depth
 
-
+#if defined key_zdftke2
+      IF( .NOT. ln_dynhpg_imp ) THEN
+                        CALL bn2( tb, sb, rn2 )              ! before Brunt-Vaisala frequency
+                        CALL eos( tb, sb, rhd, rhop )        ! now (swap=before) in situ density for dynhpg module
+#endif
       !-----------------------------------------------------------------------
       !  LATERAL PHYSICS
@@ -245 +267 @@
 #if defined key_traldf_c2d
       IF( lk_traldf_eiv )   CALL ldf_eiv( kstp )                 ! eddy induced velocity coefficient
+#  endif
+#if defined key_zdftke2
+      ENDIF
 #endif
 
@@ -278 +303 @@
 #endif
                              CALL tra_zdf    ( kstp )       ! vertical mixing and after tracer fields
+
+#if ! defined key_zdftke2
       IF( ln_zdfnpc      )   CALL tra_npc    ( kstp )       ! update after fields by non-penetrative convection
                              CALL tra_nxt    ( kstp )       ! tracer fields at next time step
@@ -292 +319 @@
             &                                     gtv, gsv, grv )
       ENDIF
-
+#else
+      IF( .NOT. ln_dynhpg_imp  ) THEN                       ! centered hpg (default case)
+                               CALL eos( tn, sn, rhd, rhop )          ! now (swap=before) in situ density for dynhpg module
+         IF( ln_zps    )       CALL zps_hde( kstp, tn, sn, rhd,   &   ! Partial steps: now horizontal gradient
+            &                                     gtu, gsu, gru,  &   ! of t, s, rd at the bottom ocean level
+            &                                     gtv, gsv, grv )
+      ENDIF 
+      IF( ln_zdfnpc      )   CALL tra_npc    ( kstp )       ! update after fields by non-penetrative convection
+                             CALL tra_nxt    ( kstp )       ! tracer fields at next time step
+      IF( ln_dynhpg_imp  ) THEN                             ! semi-implicit hpg
+                               CALL eos( ta, sa, rhd, rhop )          ! Time-filtered in situ density used in dynhpg module
+         IF( lk_ldfslp     )   CALL bn2( ta, sa, rn2 )                ! Time-filtered Brunt-Vaisala frequency
+         IF( ln_zps    )       CALL zps_hde( kstp, ta, sa, rhd,   &   ! Partial steps: time filtered hor. gradient
+            &                                     gtu, gsu, gru,  &   ! of t, s, rd at the bottom ocean level
+            &                                     gtv, gsv, grv )
+      ENDIF
+#endif
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Dynamics
@@ -363 +406 @@
 
       IF( lk_cpl )   CALL sbc_cpl_snd( kstp )                 ! coupled mode : field exchanges
+
+#if defined key_zdftke2
+      IF( ( kstp == nitend ).AND.( lrst_oce ) )  THEN
+
+         CALL day( kstp+1 )             ! Calendar
+         !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+         ! Update data, open boundaries, surface boundary condition (including sea-ice)
+         !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+                            CALL sbc    ( kstp+1 )         ! Sea Boundary Condition (including sea-ice)
+         !-----------------------------------------------------------------------
+         !  VERTICAL PHYSICS
+         !-----------------------------------------------------------------------
+         ! N.B. ua, va, ta, sa arrays are used as workspace in this section
+         !-----------------------------------------------------------------------
+                            CALL bn2( tn, sn, rn2 )            ! now Brunt-Vaisala frequency
+         !                                                     ! Vertical eddy viscosity and diffusivity coefficients
+         IF( lk_zdftke2 )   CALL zdf_tke2 ( kstp+1 )           ! TKE2 closure scheme for Kz
+                            CALL rst_write( kstp+1 )           ! close the restart file
+      ENDIF
+#endif
       !
    END SUBROUTINE stp