Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/step_oce.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -17 +17 @@
    USE daymod           ! calendar                         (day     routine)
 
-   USE dtatem           ! ocean temperature data           (dta_tem routine)
-   USE dtasal           ! ocean salinity    data           (dta_sal routine)
    USE sbcmod           ! surface boundary condition       (sbc     routine)
    USE sbcrnf           ! surface boundary condition: runoff variables
    USE sbccpl           ! surface boundary condition: coupled formulation (call send at end of step)
    USE cpl_oasis3, ONLY : lk_cpl
+   USE sbctide          ! Tide initialisation
 
    USE traqsr           ! solar radiation penetration      (tra_qsr routine)
@@ -46 +45 @@
    USE dynspg_oce       ! surface pressure gradient        (dyn_spg routine)
    USE dynspg           ! surface pressure gradient        (dyn_spg routine)
+   USE dynnept          ! simp. form of Neptune effect(dyn_nept_cor routine)
+
    USE dynnxt           ! time-stepping                    (dyn_nxt routine)
 
@@ -53 +54 @@
    USE obcrad           ! open boundary cond. radiation    (obc_rad routine)
 
-   USE bdy_par          ! unstructured open boundary data variables
-   USE bdydta           ! unstructured open boundary data  (bdy_dta routine)
+   USE bdy_par          ! for lk_bdy
+   USE bdydta           ! open boundary condition data     (bdy_dta routine)
 
    USE sshwzv           ! vertical velocity and ssh        (ssh_wzv routine)
@@ -81 +82 @@
    USE trdvor           ! vorticity budget                 (trd_vor routine)
    USE diaptr           ! poleward transports              (dia_ptr routine)
+   USE diadct           ! sections transports              (dia_dct routine)
    USE diaar5           ! AR5 diagnosics                   (dia_ar5 routine)
    USE diahth           ! thermocline depth                (dia_hth routine)
    USE diafwb           ! freshwater budget                (dia_fwb routine)
    USE diahsb           ! heat, salt and volume budgets    (dia_hsb routine)
+   USE diaharm
    USE flo_oce          ! floats variables
    USE floats           ! floats computation               (flo_stp routine)
+
+   USE asminc           ! assimilation increments      (tra_asm_inc routine)
+   !                                                   (dyn_asm_inc routine)
 
    USE stpctl           ! time stepping control            (stp_ctl routine)
@@ -92 +98 @@
    USE prtctl           ! Print control                    (prt_ctl routine)
 
-   USE traswp           ! Swap arrays           (tra_swp, tra_unswp routine)
+   USE diaobs           ! Observation operator
 
-   USE diaobs           ! Observation operator
+   USE timing           ! Timing            
 
 #if defined key_agrif