Changeset 1537 for trunk/NEMO/OPA_SRC/TRA/tranpc.F90

Timestamp:

2009-07-24T16:22:23+02:00 (15 years ago)

Author:

ctlod

Message:

ensure the restartability of the 2nd order advection scheme,see ticket: 489

File:

• trunk/NEMO/OPA_SRC/TRA/tranpc.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/TRA/tranpc.F90

@@ -4 +4 @@
    !! Ocean active tracers:  non penetrative convection scheme
    !!==============================================================================
-   !! History :  1.0  !  90-09  (G. Madec)  Original code
-   !!                 !  91-11  (G. Madec)
-   !!                 !  92-06  (M. Imbard)  periodic conditions on t and s
-   !!                 !  93-03  (M. Guyon)  symetrical conditions 
-   !!                 !  96-01  (G. Madec)  statement function for e3
-   !!                                       suppression of common work arrays
-   !!            8.5  !  02-06  (G. Madec)  free form F90
-   !!            9.0  !  08-06  (G. Madec)  applied on ta, sa and called before tranxt in step.F90
-   !!----------------------------------------------------------------------
-
-   !!----------------------------------------------------------------------
-   !!   tra_npc      : apply the non penetrative convection scheme
-   !!   tra_npc_init : initialization and control of the scheme
+   !! History :  1.0  ! 1990-09  (G. Madec)  Original code
+   !!                 ! 1996-01  (G. Madec)  statement function for e3
+   !!   NEMO     1.0  ! 2002-06  (G. Madec)  free form F90
+   !!            3.0  ! 2008-06  (G. Madec)  applied on ta, sa and called before tranxt in step.F90
+   !!----------------------------------------------------------------------
+
+   !!----------------------------------------------------------------------
+   !!   tra_npc : apply the non penetrative convection scheme
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and active tracers 
    USE dom_oce         ! ocean space and time domain
+   USE zdf_oce         ! ocean vertical physics
    USE trdmod          ! ocean active tracer trends
    USE trdmod_oce      ! ocean variables trends
@@ -31 +27 @@
    PUBLIC   tra_npc    ! routine called by step.F90
 
-   !!* Namelist namnpc: non penetrative convection algorithm
-   INTEGER ::   nnpc1 =   1   ! nnpc1   non penetrative convective scheme frequency
-   INTEGER ::   nnpc2 =  15   ! nnpc2   non penetrative convective scheme print frequency
-
    !! * Substitutions
 #  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
    !! $Id$ 
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -78 +70 @@
       !!----------------------------------------------------------------------
 
-      IF( kt == nit000  )   CALL tra_npc_init   ! Initialisation
-
-      IF( MOD( kt, nnpc1 ) == 0 ) THEN
+      IF( MOD( kt, nn_npc ) == 0 ) THEN
 
          inpcc = 0
@@ -214 +204 @@
          !  2. non penetrative convective scheme statistics
          !  -----------------------------------------------
-         IF( nnpc2 /= 0 .AND. MOD( kt, nnpc2 ) == 0 ) THEN
+         IF( nn_npcp /= 0 .AND. MOD( kt, nn_npcp ) == 0 ) THEN
             IF(lwp) WRITE(numout,*)' kt=',kt, ' number of statically instable',   &
                &                   ' water column : ',inpcc, ' number of iteration : ',inpci
@@ -223 +213 @@
    END SUBROUTINE tra_npc
 
-
-   SUBROUTINE tra_npc_init
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE tra_npc_init  ***
-      !!                   
-      !! ** Purpose :   initializations of the non-penetrative adjustment scheme
-      !!----------------------------------------------------------------------
-      NAMELIST/namnpc/ nnpc1, nnpc2
-      !
-      REWIND( numnam )           ! Namelist namzdf : vertical diffusion
-      READ  ( numnam, namnpc )
-      !
-      IF(lwp) THEN               ! Namelist print
-         WRITE(numout,*)
-         WRITE(numout,*) 'tra_npc_init : Non Penetrative Convection (npc) scheme'
-         WRITE(numout,*) '~~~~~~~~~~~~'
-         WRITE(numout,*) '       Namelist namnpc : set npc scheme parameters'
-         WRITE(numout,*) '          npc scheme frequency           nnpc1  = ', nnpc1
-         WRITE(numout,*) '          npc scheme print frequency     nnpc2  = ', nnpc2
-      ENDIF
-      !
-      IF ( nnpc1 == 0 ) THEN      ! Parameter controls
-          IF(lwp) WRITE(numout,cform_war)
-          IF(lwp) WRITE(numout,*) '             nnpc1 = ', nnpc1, ' is forced to 1'
-          nnpc1 = 1
-          nwarn = nwarn + 1
-      ENDIF
-      !
-   END SUBROUTINE tra_npc_init
-
    !!======================================================================
 END MODULE tranpc