Changeset 9019 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90

Timestamp:

2017-12-13T15:58:53+01:00 (6 years ago)

Author:

timgraham

Message:

Merge of dev_CNRS_2017 into branch

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90 (modified) (5 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcbbl.F90

@@ -5 +5 @@
    !!                                  layer scheme
    !!======================================================================
-   !!==============================================================================
    !! History :  OPA  !  1996-06  (L. Mortier)  Original code
    !!            8.0  !  1997-11  (G. Madec)    Optimization
@@ -13 +12 @@
    !!             -   !  2010-04  (G. Madec)  Campin & Goosse advective bbl 
    !!             -   !  2010-06  (C. Ethe, G. Madec)  merge TRA-TRC
+   !!            4.0  !  2017-04  (G. Madec)  ln_trabbl namelist variable instead of a CPP key
    !!----------------------------------------------------------------------
-#if  defined key_top &&  defined key_trabbl 
+#if  defined key_top
    !!----------------------------------------------------------------------
-   !!   'key_trabbl                      diffusive or/and adevective bottom boundary layer
+   !!   'key_top'                                                TOP models
    !!----------------------------------------------------------------------
-   !!    trc_bbl       : update the tracer trends due to the bottom boundary layer (advective and/or diffusive)
+   !!    trc_bbl      : update the tracer trends due to the bottom boundary layer (advective and/or diffusive)
    !!----------------------------------------------------------------------
-   USE oce_trc             ! ocean dynamics and active tracers variables
-   USE trc                 ! ocean passive tracers variables
-   USE trabbl              ! 
-   USE prtctl_trc          ! Print control for debbuging
-   USE trd_oce
-   USE trdtra
+   USE oce_trc        ! ocean dynamics and active tracers variables
+   USE trc            ! ocean passive tracers variables
+   USE trd_oce        ! trends: ocean variables
+   USE trdtra         ! tracer trends
+   USE trabbl         ! bottom boundary layer 
+   USE prtctl_trc     ! Print control for debbuging
 
-   PUBLIC   trc_bbl       !  routine called by step.F90
+   PUBLIC   trc_bbl   !  routine called by trctrp.F90
 
    !!----------------------------------------------------------------------
-   !! NEMO/TOP 3.3 , NEMO Consortium (2010)
+   !! NEMO/TOP 4.0 , NEMO Consortium (2017)
    !! $Id$ 
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
-
 
    SUBROUTINE trc_bbl( kt )
@@ -73 +71 @@
          ENDIF
          !
-      END IF
+      ENDIF
 
       !* Advective bbl : bbl upstream advective trends added to the tracer trends
@@ -84 +82 @@
          ENDIF
          !
-      END IF
+      ENDIF
 
       IF( l_trdtrc )   THEN                      ! save the horizontal diffusive trends for further diagnostics
@@ -98 +96 @@
    END SUBROUTINE trc_bbl
 
-#else
-   !!----------------------------------------------------------------------
-   !!   Dummy module :                      No bottom boundary layer scheme
-   !!----------------------------------------------------------------------
-CONTAINS
-   SUBROUTINE trc_bbl( kt )              ! Empty routine
-      WRITE(*,*) 'tra_bbl: You should not have seen this print! error?', kt
-   END SUBROUTINE trc_bbl
 #endif