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

Timestamp:

2007-03-15T14:34:58+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_update_010:RB: add flux formulae for momentum

File:

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

trunk/NEMO/OPA_SRC/step.F90

@@ -64 +64 @@
    USE eosbn2          ! equation of state                (eos_bn2 routine)
 
+   USE dynadv          ! advection                        (dyn_adv routine)
+   USE dynvor          ! vorticity term                   (dyn_vor routine)
    USE dynhpg          ! hydrostatic pressure grad.       (dyn_hpg routine)
-   USE dynkeg          ! kinetic energy gradient          (dyn_keg routine)
-   USE dynvor          ! vorticity term                   (dyn_vor routine)
-   USE dynzad          ! vertical advection               (dyn_adv routine)
    USE dynldf          ! lateral momentum diffusion       (dyn_ldf routine)
    USE dynzdf          ! vertical diffusion               (dyn_zdf routine)
@@ -361 +360 @@
                                va(:,:,:) = 0.e0
 
-                               CALL dyn_keg( kstp )           ! horizontal gradient of kinetic energy
+                               CALL dyn_adv( kstp )           ! advection (vector or flux form)
 
                                CALL dyn_vor( kstp )           ! vorticity term including Coriolis
@@ -370 +369 @@
 #endif
                                CALL dyn_hpg( kstp )           ! horizontal gradient of Hydrostatic pressure
-
-                               CALL dyn_zad( kstp )           ! vertical advection
 
                                CALL dyn_zdf( kstp )           ! vertical diffusion