Changeset 2207 for branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/step.F90

Timestamp:

2010-10-11T18:51:54+02:00 (14 years ago)

Author:

acc

Message:

#733 DEV_r2191_3partymerge2010. Merged in changes from devukmo2010 branch

File:

• branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/step.F90 (modified) (5 diffs)

branches/DEV_r2191_3partymerge2010/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
    !!----------------------------------------------------------------------
 
@@ -110 +111 @@
    USE diahth          ! thermocline depth                (dia_hth routine)
    USE diafwb          ! freshwater budget                (dia_fwb routine)
+   USE diaobs          ! obs-minus-model (assimilation)   (dia_obs routine)
    USE flo_oce         ! floats variables
    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)
@@ -251 +254 @@
       IF( lk_diahdy  )   CALL dia_hdy( kstp )         ! dynamical heigh diagnostics
       IF( lk_diafwb  )   CALL dia_fwb( kstp )         ! Fresh water budget diagnostics
+      IF( lk_diaobs  )   CALL dia_obs( kstp )         ! obs-minus-model (assimilation) diagnostics
       IF( ln_diaptr  )   CALL dia_ptr( kstp )         ! Poleward TRansports diagnostics
       IF( lk_diaar5  )   CALL dia_ar5( kstp )         ! ar5 diag
@@ -268 +272 @@
                              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
@@ -306 +312 @@
                                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