Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (7 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -14 +14 @@
    !!            2.0  !  2006-11  (G. Madec)  flux form advection: add metric term
    !!            3.2  !  2009-04  (R. Benshila)  vvl: correction of een scheme
+   !!            3.3  !  2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase
    !!----------------------------------------------------------------------
 
    !!----------------------------------------------------------------------
-   !!   dyn_vor     : Update the momentum trend with the vorticity trend
-   !!       vor_ens : enstrophy conserving scheme       (ln_dynvor_ens=T)
-   !!       vor_ene : energy conserving scheme          (ln_dynvor_ene=T)
-   !!       vor_mix : mixed enstrophy/energy conserving (ln_dynvor_mix=T)
-   !!       vor_een : energy and enstrophy conserving   (ln_dynvor_een=T)
-   !!       vor_ctl : set and control of the different vorticity option
+   !!   dyn_vor      : Update the momentum trend with the vorticity trend
+   !!       vor_ens  : enstrophy conserving scheme       (ln_dynvor_ens=T)
+   !!       vor_ene  : energy conserving scheme          (ln_dynvor_ene=T)
+   !!       vor_mix  : mixed enstrophy/energy conserving (ln_dynvor_mix=T)
+   !!       vor_een  : energy and enstrophy conserving   (ln_dynvor_een=T)
+   !!   dyn_vor_init : set and control of the different vorticity option
    !!----------------------------------------------------------------------
    USE oce            ! ocean dynamics and tracers
@@ -36 +37 @@
    PRIVATE
 
-   PUBLIC   dyn_vor   ! routine called by step.F90
+   PUBLIC   dyn_vor        ! routine called by step.F90
+   PUBLIC   dyn_vor_init   ! routine called by opa.F90
 
    !                                             !!* Namelist namdyn_vor: vorticity term
@@ -53 +55 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3,2 , LOCEAN-IPSL (2009) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -74 +76 @@
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
       !!----------------------------------------------------------------------
-
-      IF( kt == nit000 )   CALL vor_ctl          ! initialisation & control of options
 
       !                                          ! vorticity term 
@@ -637 +637 @@
 
 
-   SUBROUTINE vor_ctl
+   SUBROUTINE dyn_vor_init
       !!---------------------------------------------------------------------
-      !!                  ***  ROUTINE vor_ctl  ***
+      !!                  ***  ROUTINE dyn_vor_init  ***
       !!
       !! ** Purpose :   Control the consistency between cpp options for
@@ -653 +653 @@
       IF(lwp) THEN                    ! Namelist print
          WRITE(numout,*)
-         WRITE(numout,*) 'dyn:vor_ctl : vorticity term : read namelist and control the consistency'
-         WRITE(numout,*) '~~~~~~~~~~~'
+         WRITE(numout,*) 'dyn_vor_init : vorticity term : read namelist and control the consistency'
+         WRITE(numout,*) '~~~~~~~~~~~~'
          WRITE(numout,*) '        Namelist namdyn_vor : oice of the vorticity term scheme'
          WRITE(numout,*) '           energy    conserving scheme                ln_dynvor_ene = ', ln_dynvor_ene
@@ -700 +700 @@
       ENDIF
       !
-   END SUBROUTINE vor_ctl
+   END SUBROUTINE dyn_vor_init
 
    !!==============================================================================