Changeset 2795 for branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2011-07-07T15:21:12+02:00 (13 years ago)

Author:

acc

Message:

First set of changes for simplified laplacian Neptune, see ticket #843

File:

• branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (2 diffs)

branches/2011/dev_r2787_NOCS_NEPTUNE/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -36 +36 @@
 #endif
    USE asminc           ! assimilation increments    (tra_asm_inc, dyn_asm_inc routines)
+   USE dynnept          ! simplified form of Neptune effect
 
    IMPLICIT NONE
@@ -220 +221 @@
       IF(  ln_asmiau .AND. &
          & ln_dyninc       )   CALL dyn_asm_inc( kstp )     ! apply dynamics assimilation increment
+      IF( ln_neptsimp )        CALL dyn_cor_topo( kstp )    ! subtract Neptune velocities (simplified)
                                CALL dyn_adv( kstp )         ! advection (vector or flux form)
                                CALL dyn_vor( kstp )         ! vorticity term including Coriolis
                                CALL dyn_ldf( kstp )         ! lateral mixing
+      IF( ln_neptsimp )        CALL dyn_cor_topo( kstp )    ! add Neptune velocities (simplified)
 #if defined key_agrif
       IF(.NOT. Agrif_Root())   CALL Agrif_Sponge_dyn        ! momemtum sponge