Changeset 2382 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2010-11-13T14:08:12+01:00 (13 years ago)

Author:

gm

Message:

v3.3beta: C1D - bug correction to compile with key_c1d

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (9 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -32 +32 @@
    USE trcstp           ! passive tracer time-stepping      (trc_stp routine)
 #endif
+#if defined key_agrif
+   USE agrif_opa_sponge ! Momemtum and tracers sponges
+#endif
    USE asminc           ! assimilation increments    (tra_asm_inc, dyn_asm_inc routines)
-   USE stpctl           ! time stepping control            (stp_ctl routine)
-   USE restart          ! ocean restart                    (rst_wri routine)
-   USE prtctl           ! Print control                    (prt_ctl routine)
-
-#if defined key_agrif
-   USE agrif_opa_sponge ! Momemtum and tracers sponges
-#endif
 
    IMPLICIT NONE
@@ -116 +112 @@
       !  VERTICAL PHYSICS   
                          CALL zdf_bfr( kstp )         ! bottom friction
+                         
       !                                               ! 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( lk_zdfkpp     )   CALL zdf_kpp    ( kstp )  ! KPP closure scheme for Kz
-      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( lk_zdfkpp  )   CALL zdf_kpp( kstp )            ! KPP closure scheme for Kz
+      IF( lk_zdfcst  )   THEN                            ! Constant Kz (reset avt, avm[uv] to the background value)
          avt (:,:,:) = rn_avt0 * tmask(:,:,:)
          avmu(:,:,:) = rn_avm0 * umask(:,:,:)
@@ -135 +132 @@
       IF( lk_zdfddm .AND. .NOT. lk_zdfkpp )   &
          &               CALL zdf_ddm( kstp )         ! double diffusive mixing
+         
                          CALL zdf_mxl( kstp )         ! mixed layer depth
 
-                                                      ! write tke information in the restart file
+                                                      ! write TKE or GLS information in the restart file
       IF( lrst_oce .AND. lk_zdftke )   CALL tke_rst( kstp, 'WRITE' )
-                                                      ! write gls information in the restart file
       IF( lrst_oce .AND. lk_zdfgls )   CALL gls_rst( kstp, 'WRITE' )
       !
@@ -156 +153 @@
 #if defined key_traldf_c2d
       IF( lk_traldf_eiv )   CALL ldf_eiv( kstp )      ! eddy induced velocity coefficient
-#  endif
+#endif
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -179 +176 @@
       ! Active tracers                              (ua, va used as workspace)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-                             tsa(:,:,:,:) = 0.e0               ! set tracer trends to zero
+                             tsa(:,:,:,:) = 0.e0            ! set tracer trends to zero
 
       IF(  ln_asmiau .AND. &
@@ -190 +187 @@
                              CALL tra_adv    ( kstp )       ! horizontal & vertical advection
       IF( n_cla == 1     )   CALL tra_cla    ( kstp )       ! Cross Land Advection (Update Hor. advection)
-      IF( lk_zdfkpp )        CALL tra_kpp    ( kstp )       ! KPP non-local tracer fluxes
+      IF( lk_zdfkpp      )   CALL tra_kpp    ( kstp )       ! KPP non-local tracer fluxes
                              CALL tra_ldf    ( kstp )       ! lateral mixing
 #if defined key_agrif
@@ -213 +210 @@
                              CALL tra_nxt    ( kstp )       ! tracer fields at next time step
       ENDIF 
-                             CALL tra_unswap
+                             CALL tra_unswap                ! udate T & S 3D arrays  (to be suppressed)
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -222 +219 @@
 
       IF(  ln_asmiau .AND. &
-         & ln_dyninc     )     CALL dyn_asm_inc( kstp )       ! apply dynamics assimilation increment
+         & ln_dyninc       )   CALL dyn_asm_inc( kstp )     ! apply dynamics assimilation increment
                                CALL dyn_adv( kstp )         ! advection (vector or flux form)
                                CALL dyn_vor( kstp )         ! vorticity term including Coriolis
@@ -230 +227 @@
 #endif
                                CALL dyn_hpg( kstp )         ! horizontal gradient of Hydrostatic pressure
-                               CALL dyn_bfr( kstp )           ! bottom friction   
+                               CALL dyn_bfr( kstp )         ! bottom friction   
                                CALL dyn_zdf( kstp )         ! vertical diffusion
                                CALL dyn_spg( kstp, indic )  ! surface pressure gradient