Changeset 2128 for branches/devukmo2010/NEMO/OPA_SRC/step.F90

Timestamp:

2010-09-28T14:29:51+02:00 (14 years ago)

Author:

rfurner

Message:

merged branches OBS, ASM, Rivers, BDY & mixed_dynldf ready for vn3.3 merge

File:

• branches/devukmo2010/NEMO/OPA_SRC/step.F90 (modified) (4 diffs)

branches/devukmo2010/NEMO/OPA_SRC/step.F90

@@ -21 +21 @@
    !!            3.2  !  2009-02  (G. Madec, R. Benshila)  reintroduicing z*-coordinate
    !!             -   !  2009-06  (S. Masson, G. Madec)  TKE restart compatible with key_cpl
+   !!            3.3  !  2010-05  (K. Mogensen, A. Weaver, M. Martin, D. Lea) Assimilation interface
    !!----------------------------------------------------------------------
 
@@ -113 +114 @@
    USE floats          ! floats computation               (flo_stp routine)
 
+   USE asminc          ! assimilation increments    (tra_asm_inc, dyn_asm_inc routines)
    USE stpctl          ! time stepping control            (stp_ctl routine)
    USE restart         ! ocean restart                    (rst_wri routine)
@@ -265 +267 @@
                              sa(:,:,:) = 0.e0
 
+      IF(  ln_asmiau .AND. &
+         & ln_trainc     )   CALL tra_asm_inc( kstp )       ! apply tracer assimilation increment
                              CALL tra_sbc    ( kstp )       ! surface boundary condition
       IF( ln_traqsr      )   CALL tra_qsr    ( kstp )       ! penetrative solar radiation qsr
@@ -303 +307 @@
                                va(:,:,:) = 0.e0
 
+      IF(  ln_asmiau .AND. &
+         & ln_dyninc     )     CALL dyn_asm_inc( kstp )       ! apply dynamics assimilation increment
                                CALL dyn_adv( kstp )         ! advection (vector or flux form)
                                CALL dyn_vor( kstp )         ! vorticity term including Coriolis