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

Timestamp:

2005-03-17T15:02:38+01:00 (19 years ago)

Author:

opalod

Message:

CT : UPDATE151 : New trends organization

File:

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

trunk/NEMO/OPA_SRC/step.F90

@@ -14 +14 @@
    USE ldftra_oce
    USE ldfdyn_oce
-   USE cpl_oce         ! ??? 
+   USE cpl_oce         ! coupled ocean-atmosphere variables
    USE in_out_manager  ! I/O manager
    USE lbclnk
@@ -101 +101 @@
 
    USE diawri          ! Standard run outputs             (dia_wri routine)
-   USE trddyn          ! Ocean momentum trends            (trd_dyn routine)
-   USE trdtra          ! Ocean active tracer trends       (trd_tra routine)
-   USE diagap          ! hor. mean model-data gap         (dia_gap routine)
+   USE trdicp          ! Ocean momentum/tracers trends    (trd_wri routine)
    USE trdmld          ! mixed-layer trends               (trd_mld routine)
    USE trdvor          ! vorticity budget                 (trd_vor routine)
+   USE diagap          ! hor. mean model-data gap         (dia_gap routine)
    USE diahdy          ! dynamic height                   (dia_hdy routine)
    USE diaptr          ! poleward transports              (dia_ptr routine)
@@ -161 +160 @@
       !!   8.2  !  00-07  (J-M Molines, M. Imbard)  Open Bondary Conditions
       !!   9.0  !  02-06  (G. Madec)  free form, suppress macro-tasking
+      !!    "   !  04-08  (C. Talandier) New trends organization
       !!----------------------------------------------------------------------
       !! * Arguments
@@ -384 +384 @@
 
       !                                                       ! 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
+      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
 
       IF( lk_dynspg_rl ) THEN 
@@ -433 +433 @@
          !                                         ! Diagnostics:
          IF( lk_floats  )   CALL flo_stp( kstp )                 ! drifting Floats
-         IF( lk_trddyn  )   CALL trd_dyn( kstp )                 ! trends: dynamics 
-         IF( lk_trdtra  )   CALL trd_tra( kstp )                 ! trends: active tracers
+         IF( lk_trddyn  )   CALL trd_dwr( kstp )                 ! trends: dynamics 
+         IF( lk_trdtra  )   CALL trd_twr( kstp )                 ! trends: active tracers
          IF( lk_trdmld  )   CALL trd_mld( kstp )                 ! trends: Mixed-layer 
          IF( lk_trdvor  )   CALL trd_vor( kstp )                 ! trends: vorticity budget
@@ -447 +447 @@
 
          !                                         ! save and outputs
-                           CALL rst_write  ( kstp )              ! ocean model: restart file output
-         IF( lk_obc    )   CALL obc_rst_wri( kstp )              ! ocean model: open boundary restart file output
-                           CALL dia_wri    ( kstp, indic )       ! ocean model: outputs
+                            CALL rst_write  ( kstp )             ! ocean model: restart file output
+         IF( lk_obc     )   CALL obc_rst_wri( kstp )             ! ocean model: open boundary restart file output
+                            CALL dia_wri    ( kstp, indic )      ! ocean model: outputs
 
       ENDIF