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

Timestamp:

2010-09-17T14:35:46+02:00 (14 years ago)

Author:

cetlod

Message:

update DEV_r2006_merge_TRA_TRC according to review

File:

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

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/opa.F90

@@ -7 +7 @@
    !!            7.0  ! 1991-11  (M. Imbard, C. Levy, G. Madec)
    !!            7.1  ! 1993-03  (M. Imbard, C. Levy, G. Madec, O. Marti, M. Guyon, A. Lazar, 
-   !!                             P. Delecluse, C. Perigaud, G. Caniaux, B. Colot, C. Maes )  release 7.1 
+   !!                             P. Delecluse, C. Perigaud, G. Caniaux, B. Colot, C. Maes) release 7.1 
    !!             -   ! 1992-06  (L.Terray)  coupling implementation
    !!             -   ! 1993-11  (M.A. Filiberti) IGLOO sea-ice 
    !!            8.0  ! 1996-03  (M. Imbard, C. Levy, G. Madec, O. Marti, M. Guyon, A. Lazar, 
-   !!                             P. Delecluse, L.Terray, M.A. Filiberti, J. Vialar, A.M. Treguier, M. Levy)  release 8.0
+   !!                             P. Delecluse, L.Terray, M.A. Filiberti, J. Vialar, A.M. Treguier, M. Levy) release 8.0
    !!            8.1  ! 1997-06  (M. Imbard, G. Madec)
    !!            8.2  ! 1999-11  (M. Imbard, H. Goosse)  LIM sea-ice model 
@@ -31 +31 @@
    !!   opa_model      : solve ocean dynamics, tracer and/or sea-ice
    !!   opa_init       : initialization of the opa model
-   !!   opa_flg        : initialisation of algorithm flag 
+   !!   opa_ctl        : initialisation of algorithm flag 
    !!   opa_closefile  : close remaining files
    !!----------------------------------------------------------------------
@@ -72 +72 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
+   !! NEMO/OPA 3.3 , LOCEAN-IPSL (2010) 
    !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -204 +204 @@
          WRITE(numout,*) '                       NEMO team'
          WRITE(numout,*) '            Ocean General Circulation Model'
-         WRITE(numout,*) '                  version 3.2  (2009) '
+         WRITE(numout,*) '                  version 3.3  (2010) '
          WRITE(numout,*)
          WRITE(numout,*)
@@ -217 +217 @@
       !                             !--------------------------------!
 
-      CALL opa_flg                           ! Control prints & Benchmark
+      CALL opa_ctl                           ! Control prints & Benchmark
 
       !                                      ! Domain decomposition
@@ -223 +223 @@
       ELSE                            ;   CALL mpp_init2     ! eliminate land processors
       ENDIF
- 
-
-
-     
 
       !                                      ! General initialization
@@ -243 +239 @@
 
       !                                     ! Ocean physics
-                            CALL     sbc_init   !  Forcings : surface module 
-
+                            CALL     sbc_init   ! Forcings : surface module 
       !                                         ! 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_zdftke_old )   CALL zdf_tke_init_o    ! TKE closure scheme for Kz (old scheme)
+      IF( lk_zdftke     )   CALL zdf_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
@@ -272 +267 @@
       !                                     ! Dynamics
                             CALL dyn_adv_init   ! advection (vector or flux form)
-                            CALL     vor_init   ! vorticity term including Coriolis
+                            CALL dyn_vor_init   ! vorticity term including Coriolis
                             CALL dyn_ldf_init   ! lateral mixing
-                            CALL     hpg_init   ! horizontal gradient of Hydrostatic pressure
+                            CALL dyn_hpg_init   ! horizontal gradient of Hydrostatic pressure
                             CALL dyn_zdf_init   ! vertical diffusion
                             CALL dyn_spg_init   ! surface pressure gradient
@@ -291 +286 @@
 
 
-   SUBROUTINE opa_flg
+   SUBROUTINE opa_ctl
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE opa  ***
@@ -308 +303 @@
       IF(lwp) THEN                 ! Parameter print
          WRITE(numout,*)
-         WRITE(numout,*) 'opa_flg: Control prints & Benchmark'
+         WRITE(numout,*) 'opa_ctl: Control prints & Benchmark'
          WRITE(numout,*) '~~~~~~~ '
          WRITE(numout,*) '   Namelist namctl'
@@ -377 +372 @@
          END SELECT
       ENDIF
-
-      REWIND( numnam )              ! Read Namelist namdyn_hpg : ln_dynhpg_imp must be read at the initialisation phase
-      READ  ( numnam, namdyn_hpg )
-      !
-   END SUBROUTINE opa_flg
+      !
+   END SUBROUTINE opa_ctl