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

Timestamp:

2004-06-28T12:19:07+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE069 : Vorticity diagnostics and new advection scheme (energy and enstrophy conserving) have been added

File:

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

trunk/NEMO/OPA_SRC/step.F90

@@ -107 +107 @@
    USE diagap          ! hor. mean model-data gap         (dia_gap routine)
    USE trdmld          ! mixed-layer trends               (trd_mld routine)
+   USE trdvor          ! vorticity budget                 (trd_vor routine)
    USE diahdy          ! dynamic height                   (dia_hdy routine)
    USE ptr             ! poleward transports         (dia_ptr_init routine)
@@ -373 +374 @@
       IF( ln_dynvor_ene    )   CALL dyn_vor_energy   ( kstp )        ! energy conserving scheme
       IF( ln_dynvor_mix    )   CALL dyn_vor_mixed    ( kstp )        ! mixed energy/enstrophy conserving scheme
+      IF( ln_dynvor_een    )   CALL dyn_vor_ene_ens  ( kstp )        ! combined energy/enstrophy conserving scheme
 
       !                                                       ! lateral mixing 
@@ -439 +441 @@
          IF( lk_trdtra  )   CALL trd_tra( kstp )                 ! trends: active tracers
          IF( lk_trdmld  )   CALL trd_mld( kstp )                 ! trends: Mixed-layer 
+         IF( lk_trdvor  )   CALL trd_vor( kstp )                 ! trends: vorticity budget
          IF( lk_diaspr  )   CALL dia_spr( kstp )                 ! Surface pressure diagnostics
          IF( lk_diahth  )   CALL dia_hth( kstp )                 ! Thermocline depth (20 degres isotherm depth)