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

Timestamp:

2009-07-03T17:07:08+02:00 (15 years ago)

Author:

ctlod

Message:

ensure restartability of TKE2 in coupled mode + few minor bugs corrections, see ticket: #466

File:

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

trunk/NEMO/OPA_SRC/step.F90

@@ -207 +207 @@
       ! N.B. ua, va, ta, sa arrays are used as workspace in this section
       !-----------------------------------------------------------------------
-      IF( neuler == 0 .AND. kstp == nit000 ) THEN
-                        CALL bn2( tn, sn, rn2 )              ! now    Brunt-Vaisala frequency
-                        rn2b(:,:,:) = rn2(:,:,:)
-      ELSE
-                        rn2b(:,:,:) = rn2(:,:,:)             ! before Brunt-Vaisala frequency  
-                        CALL bn2( tn, sn, rn2 )              ! now    Brunt-Vaisala frequency
-      ENDIF
-
-#if defined key_zdftke2
-      IF ( ln_dynhpg_imp ) THEN
-      !-----------------------------------------------------------------------
-      !  LATERAL PHYSICS
-      !-----------------------------------------------------------------------
-                               CALL zdf_mxl( kstp )                 ! mixed layer depth
-         IF( lk_ldfslp     )   CALL ldf_slp( kstp, rhd, rn2b )      ! 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
+
+                       CALL bn2( tb, sb, rn2b )              ! before Brunt-Vaisala frequency
+                       CALL bn2( tn, sn, rn2  )              ! now    Brunt-Vaisala frequency
+
       !-----------------------------------------------------------------------
       !  VERTICAL PHYSICS
@@ -260 +244 @@
                         CALL zdf_mxl( kstp )                 ! mixed layer depth
 
-#if defined key_zdftke2
-      IF( .NOT. ln_dynhpg_imp ) THEN
-                        CALL eos( tb, sb, rhd, rhop )        ! now (swap=before) in situ density for dynhpg module
-#endif
+      IF( lrst_oce .AND. lk_zdftke2 )   &                    ! write tke2 information in the restart file
+         &               CALL tke2_rst( kstp, 'WRITE' )
+
       !-----------------------------------------------------------------------
       !  LATERAL PHYSICS
       !-----------------------------------------------------------------------
-      IF( lk_ldfslp     )   CALL ldf_slp( kstp, rhd, rn2b )      ! before slope of the lateral mixing
+      IF( lk_ldfslp )   THEN 
+                           CALL eos( tb, sb, rhd, rhop )          ! before in situ density
+         IF( ln_zps )      CALL zps_hde( kstp, tb, sb, rhd,  &    ! Partial steps: before horizontal gradient
+            &                                gtu, gsu, gru,  &    ! of t, s, rd at the last ocean level
+            &                                gtv, gsv, grv )
+                               CALL ldf_slp( kstp, rhd, rn2b )      ! before slope of the lateral mixing
+      ENDIF
 #if defined key_traldf_c2d
       IF( lk_traldf_eiv )   CALL ldf_eiv( kstp )                 ! eddy induced velocity coefficient
 #  endif
-#if defined key_zdftke2
-      ENDIF
-#endif
 
 #if defined key_top
@@ -307 +293 @@
                              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
-
-      IF( ln_dynhpg_imp  ) THEN                             ! semi-implicit hpg
-                               CALL eos( ta, sa, rhd, rhop )          ! Time-filtered in situ density used in dynhpg module
-         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 )
-      ELSE                                                  ! centered hpg (default case)
-                               CALL eos( tb, sb, rhd, rhop )          ! now (swap=before) in situ density for dynhpg module
-         IF( ln_zps    )       CALL zps_hde( kstp, tb, sb, rhd,   &   ! Partial steps: now horizontal gradient
-            &                                     gtu, gsu, gru,  &   ! of t, s, rd at the bottom ocean level
-            &                                     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
@@ -333 +303 @@
       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
@@ -400 +369 @@
 
       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