Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.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/dynadv.F90 (modified) (8 diffs, 2 props)

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

@@ -4 +4 @@
    !! Ocean active tracers:  advection scheme control
    !!==============================================================================
-   !! History :  9.0  !  06-11  (G. Madec)  Original code
+   !! History :  1.0  !  2006-11  (G. Madec)  Original code
+   !!            3.3  !  2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase
    !!----------------------------------------------------------------------
 
    !!----------------------------------------------------------------------
    !!   dyn_adv      : compute the momentum advection trend 
-   !!   dyn_adv_ctl  : control the different options of advection scheme
+   !!   dyn_adv_init : control the different options of advection scheme
    !!----------------------------------------------------------------------
    USE dom_oce         ! ocean space and time domain
@@ -22 +23 @@
    PRIVATE
 
-   PUBLIC dyn_adv     ! routine called by step module
+   PUBLIC dyn_adv       ! routine called by step module
+   PUBLIC dyn_adv_init  ! routine called by opa module
  
-   LOGICAL, PUBLIC ::   ln_dynadv_vec  = .TRUE.    ! vector form flag
-   LOGICAL, PUBLIC ::   ln_dynadv_cen2 = .FALSE.   ! flux form - 2nd order centered scheme flag
-   LOGICAL, PUBLIC ::   ln_dynadv_ubs  = .FALSE.   ! flux form - 3rd order UBS scheme flag
+   LOGICAL, PUBLIC ::   ln_dynadv_vec  = .TRUE.    !: vector form flag
+   LOGICAL, PUBLIC ::   ln_dynadv_cen2 = .FALSE.   !: flux form - 2nd order centered scheme flag
+   LOGICAL, PUBLIC ::   ln_dynadv_ubs  = .FALSE.   !: flux form - 3rd order UBS scheme flag
    
    INTEGER ::   nadv   ! choice of the formulation and scheme for the advection
@@ -34 +36 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+   !! $Id$
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -56 +58 @@
       !!----------------------------------------------------------------------
       !
-      IF( kt == nit000 )   CALL dyn_adv_ctl          ! initialisation & control of options
-
       SELECT CASE ( nadv )                     ! compute advection trend and add it to general trend
       CASE ( 0 )     
@@ -77 +77 @@
 
    
-   SUBROUTINE dyn_adv_ctl
+   SUBROUTINE dyn_adv_init
       !!---------------------------------------------------------------------
-      !!                  ***  ROUTINE dyn_adv_ctl  ***
+      !!                  ***  ROUTINE dyn_adv_init  ***
       !!                
       !! ** Purpose :   Control the consistency between namelist options for 
@@ -85 +85 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ioptio
-
+      !!
       NAMELIST/namdyn_adv/ ln_dynadv_vec, ln_dynadv_cen2 , ln_dynadv_ubs
       !!----------------------------------------------------------------------
@@ -94 +94 @@
       IF(lwp) THEN                    ! Namelist print
          WRITE(numout,*)
-         WRITE(numout,*) 'dyn_adv_ctl : choice/control of the momentum advection scheme'
+         WRITE(numout,*) 'dyn_adv_init : choice/control of the momentum advection scheme'
          WRITE(numout,*) '~~~~~~~~~~~'
          WRITE(numout,*) '       Namelist namdyn_adv : chose a advection formulation & scheme for momentum'
@@ -124 +124 @@
       ENDIF
       !
-   END SUBROUTINE dyn_adv_ctl
+   END SUBROUTINE dyn_adv_init
 
   !!======================================================================