Changeset 468 for trunk/NEMO/C1D_SRC/step1d.F90

Timestamp:

2006-05-10T19:49:38+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_058:RB: reorganization of step1d

File:

• trunk/NEMO/C1D_SRC/step1d.F90 (modified) (3 diffs)

trunk/NEMO/C1D_SRC/step1d.F90

@@ -34 +34 @@
    USE trcstp          ! passive tracer time-stepping     (trc_stp routine)
 
-   USE dynzdf_imp      ! vertical diffusion: implicit     (dyn_zdf routine)
-   USE dynzdf_imp_atsk ! vertical diffusion: implicit     (dyn_zdf routine)
-   USE dynzdf_iso      ! vertical diffusion: isopycnal    (dyn_zdf routine)
-   USE dynzdf_exp      ! vertical diffusion: explicit (dyn_zdf_exp routine)
- 
+   USE dynzdf          ! vertical diffusion               (dyn_zdf routine)
 
    USE traqsr          ! solar radiation penetration      (tra_qsr routine)
    USE tranxt          ! time-stepping                    (tra_nxt routine)
-   USE trazdf_exp      ! vertical diffusion: explicit (tra_zdf_exp routine)
-   USE trazdf_imp      ! vertical diffusion: implicit (tra_zdf_imp routine)
-   USE trazdf_iso      ! vertical diffusion           (tra_zdf_exp routine)
-   USE trazdf_iso_vopt ! vertical diffusion           (tra_zdf_exp routine)
+   USE trazdf          ! vertical diffusion               (tra_zdf routine)
    USE trasbc          ! surface boundary condition       (tra_sbc routine)
 
@@ -228 +221 @@
       IF( ln_traqsr        )   CALL tra_qsr( kstp )           ! penetrative solar radiation qsr
 
-      !                                                       ! vertical diffusion
-      IF( l_trazdf_exp     )   CALL tra_zdf_exp     ( kstp )          ! explicit time stepping (time splitting scheme)
-      IF( l_trazdf_imp     )   CALL tra_zdf_imp     ( kstp )          ! implicit time stepping (euler backward)
-      IF( l_trazdf_iso     )   CALL tra_zdf_iso     ( kstp )          ! isopycnal
-      IF( l_trazdf_iso_vo  )   CALL tra_zdf_iso_vopt( kstp )          ! vector opt. isopycnal
+      IF( lk_zdfkpp        )   CALL tra_kpp( kstp )           ! KPP non-local tracer fluxes
+
+                               CALL tra_zdf( kstp )           ! vertical mixing
 
                                CALL tra_nxt( kstp )           ! tracer fields at next time step
@@ -249 +240 @@
                                CALL dyn_cor_1d     ( kstp )
       !                                                       ! vertical diffusion
-      IF( l_dynzdf_exp     )   CALL dyn_zdf_exp    ( kstp )         ! explicit time stepping (time splitting scheme)
-      IF( l_dynzdf_imp     )   CALL dyn_zdf_imp    ( kstp )         ! implicit time stepping (euler backward)
-      IF( l_dynzdf_imp_tsk )   CALL dyn_zdf_imp_tsk( kstp )         ! autotask implicit time stepping (euler backward)
-      IF( l_dynzdf_iso     )   CALL dyn_zdf_iso    ( kstp )         ! iso-neutral case
+                               CALL dyn_zdf( kstp )      
 
 !i bug lbc sur emp