Changeset 2027 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/opa.F90

Timestamp:

2010-07-29T13:33:05+02:00 (14 years ago)

Author:

cetlod

Message:

Reorganisation of the initialisation phase, see ticket:695

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/opa.F90 (modified) (7 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/opa.F90

@@ -25 +25 @@
    !!             -   ! 2007-07  (J. Chanut, A. Sellar) Unstructured open boundaries (BDY)
    !!            3.2  ! 2009-08  (S. Masson)  open/write in the listing file in mpp
+   !!            3.3  ! 2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase
    !!----------------------------------------------------------------------
 
@@ -33 +34 @@
    !!   opa_closefile  : close remaining files
    !!----------------------------------------------------------------------
-   USE oce             ! dynamics and tracers variables
-   USE dom_oce         ! ocean space domain variables
+
+   USE step_oce        ! Time stepping module definition
    USE sbc_oce         ! surface boundary condition: ocean
    USE trdmod_oce      ! ocean variables trends
@@ -40 +41 @@
    USE mppini          ! shared/distributed memory setting (mpp_init routine)
    USE domain          ! domain initialization             (dom_init routine)
-   USE obc_par         ! open boundary cond. parameters
    USE obcini          ! open boundary cond. initialization (obc_ini routine)
-   USE bdy_par         ! unstructured open boundary cond. parameters
    USE bdyini          ! unstructured open boundary cond. initialization (bdy_init routine)
    USE istate          ! initial state setting          (istate_init routine)
-   USE sbcmod          ! surface boundary condition 
-   USE eosbn2          ! equation of state                 (eos_init routine)
-   USE dynhpg          ! hydrostatic pressure gradient
    USE ldfdyn          ! lateral viscosity setting      (ldfdyn_init routine)
    USE ldftra          ! lateral diffusivity setting    (ldftra_init routine)
@@ -53 +49 @@
    USE phycst          ! physical constant                  (par_cst routine)
    USE trdmod          ! momentum/tracers trends       (trd_mod_init routine)
-   USE diaptr          ! poleward transports           (dia_ptr_init routine)
    USE step            ! OPA time-stepping                  (stp     routine)
 #if defined key_oasis3
@@ -60 +55 @@
    USE cpl_oasis4      ! OASIS4 coupling (not working)
 #endif
-   USE dynspg_oce      ! Control choice of surface pressure gradient schemes
-   USE prtctl          ! Print control                 (prt_ctl_init routine)
    USE c1d             ! 1D configuration
-   USE dyncor_c1d      ! Coriolis factor at T-point
    USE step_c1d        ! Time stepping loop for the 1D configuration
 #if defined key_top
    USE trcini          ! passive tracer initialisation
 #endif
-   
-   USE iom
-   USE in_out_manager  ! I/O manager
+
    USE lib_mpp         ! distributed memory computing
 #if defined key_iomput
@@ -76 +66 @@
 #endif
 
-   IMPLICIT NONE
    PRIVATE
 
@@ -237 +226 @@
       ELSE                            ;   CALL mpp_init2     ! eliminate land processors
       ENDIF
-      
-      CALL phy_cst                          ! Physical constants
-      CALL eos_init                         ! Equation of state
-      CALL dom_cfg                          ! Domain configuration
-      CALL dom_init                         ! Domain
-!!gm c1d case can be moved in dom_init routine
-      IF( lk_c1d ) THEN                          ! 1D configuration 
-         CALL cor_c1d                            ! Coriolis defined at T-point
-         umask(:,:,:) = tmask(:,:,:)             ! U, V and T-points are the same
-         vmask(:,:,:) = tmask(:,:,:)             ! 
-      ENDIF
-!!gm c1d end
-
-      IF( ln_ctl )   CALL prt_ctl_init      ! Print control
-
-      IF( lk_obc )   CALL obc_init          ! Open boundaries 
-      IF( lk_bdy )   CALL bdy_init          ! Unstructured open boundaries
-
-      CALL istate_init                      ! ocean initial state (Dynamics and tracers)
+ 
+
+
+     
+
+                            CALL     phy_cst    ! Physical constants
+                            CALL     eos_init   ! Equation of state
+                            CALL     dom_cfg    ! Domain configuration
+                            CALL     dom_init   ! Domain
+
+      IF( ln_ctl        )   CALL prt_ctl_init   ! Print control
+
+      IF( lk_obc        )   CALL     obc_init   ! Open boundaries 
+      IF( lk_bdy        )   CALL     bdy_init   ! Unstructured open boundaries
+
+      IF( ln_zps        )   CALL zps_hde_init   ! Partial steps:  horizontal derivative
+                            CALL  istate_init   ! ocean initial state (Dynamics and tracers)
 
       !                                     ! Ocean physics
-      CALL sbc_init                             ! Read namsbc namelist : surface module (needed for iom_init)
-      CALL ldf_tra_init                         ! Lateral ocean tracer physics
-      CALL ldf_dyn_init                         ! Lateral ocean momentum physics
-      CALL zdf_init                             ! Vertical ocean physics
-
+                            CALL     sbc_init   ! Read namsbc namelist : surface module (needed for iom_init)
+
+      !                                     ! Vertical physics
+                            CALL     zdf_init   ! namelist read
+                            CALL zdf_bfr_init   ! bottom friction
+      IF( lk_zdfric     )   CALL zdf_ric_init   ! Richardson number dependent Kz
+      IF( lk_zdftke_old )   CALL zdf_tke_init   ! TKE closure scheme for Kz (old scheme)
+      IF( lk_zdftke     )   CALL     tke_init   ! TKE closure scheme for Kz
+      IF( lk_zdfkpp     )   CALL zdf_kpp_init   ! KPP closure scheme for Kz
+      IF( lk_zdftmx     )   CALL zdf_tmx_init   ! tidal vertical mixing
+      IF( lk_zdfddm .AND. .NOT. lk_zdfkpp )   & 
+         &                  CALL zdf_ddm_init   ! double diffusive mixing
+      !                                     ! Lateral physics
+                            CALL ldf_tra_init   ! Lateral ocean tracer physics
+                            CALL ldf_dyn_init   ! Lateral ocean momentum physics
+      IF( lk_ldfslp )       CALL ldf_slp_init   ! slope of lateral mixing
+#if defined key_traldf_c2d
+      IF( lk_traldf_eiv )   CALL ldf_eiv( kstp )      ! eddy induced velocity coefficient
+#  endif
+      !                                     ! Active tracers
+                            CALL tra_qsr_init   ! penetrative solar radiation qsr
+      IF( lk_trabbc     )   CALL tra_bbc_init   ! bottom heat flux
+      IF( lk_trabbl     )   CALL tra_bbl_init   ! advective (and/or diffusive) bottom boundary layer scheme
+      IF( lk_tradmp     )   CALL tra_dmp_init   ! internal damping trends
+                            CALL tra_adv_init   ! horizontal & vertical advection
+      IF( n_cla == 1    )   CALL tra_cla_init   ! Cross Land Advection (Update Hor. advection)
+                            CALL tra_ldf_init   ! lateral mixing
+                            CALL tra_zdf_init   ! vertical mixing and after tracer fields
+
+      !                                     ! Dynamics
+                            CALL dyn_adv_init   ! advection (vector or flux form)
+                            CALL     vor_init   ! vorticity term including Coriolis
+                            CALL dyn_ldf_init   ! lateral mixing
+                            CALL     hpg_init   ! horizontal gradient of Hydrostatic pressure
+                            CALL dyn_zdf_init   ! vertical diffusion
+                            CALL dyn_spg_init   ! surface pressure gradient
 #if defined key_top
-      CALL trc_ini                          ! Passive tracers
+      !                                     ! Passive tracers
+                            CALL     trc_ini
 #endif
 
       !                                     ! diagnostics
-      CALL iom_init                             ! iom_put initialization
-      CALL dia_ptr_init                         ! Poleward TRansports initialization
-      CALL trd_mod_init                         ! Mixed-layer/Vorticity/Integral constraints trends
+                            CALL     iom_init   ! iom_put initialization
+      IF( lk_floats    )    CALL     flo_init   ! drifting Floats
+      IF( lk_diaar5    )    CALL dia_ar5_init   ! ar5 diag
+                            CALL dia_ptr_init   ! Poleward TRansports initialization
+                            CALL trd_mod_init   ! Mixed-layer/Vorticity/Integral constraints trends
       !
    END SUBROUTINE opa_init