Changeset 14072 for NEMO/trunk/src/OCE/TRA/traldf.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/OCE/TRA/traldf.F90 (modified) (4 diffs)

NEMO/trunk/src/OCE/TRA/traldf.F90

@@ -2 +2 @@
    !!======================================================================
    !!                       ***  MODULE  traldf  ***
-   !! Ocean Active tracers : lateral diffusive trends 
+   !! Ocean Active tracers : lateral diffusive trends
    !!=====================================================================
    !! History :  9.0  ! 2005-11  (G. Madec)  Original code
-   !!  NEMO      3.0  ! 2008-01  (C. Ethe, G. Madec)  merge TRC-TRA 
+   !!  NEMO      3.0  ! 2008-01  (C. Ethe, G. Madec)  merge TRC-TRA
    !!            3.7  ! 2013-12  (G. Madec) remove the optional computation from T & S anomaly profiles and traldf_bilapg
    !!             -   ! 2013-12  (F. Lemarie, G. Madec)  triad operator (Griffies) + Method of Stabilizing Correction
@@ -37 +37 @@
    PRIVATE
 
-   PUBLIC   tra_ldf        ! called by step.F90 
-   PUBLIC   tra_ldf_init   ! called by nemogcm.F90 
+   PUBLIC   tra_ldf        ! called by step.F90
+   PUBLIC   tra_ldf_init   ! called by nemogcm.F90
 
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
-   !! $Id$ 
+   !! $Id$
    !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
@@ -50 +50 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_ldf  ***
-      !! 
+      !!
       !! ** Purpose :   compute the lateral ocean tracer physics.
       !!----------------------------------------------------------------------
@@ -120 +120 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_ldf_init  ***
-      !! 
+      !!
       !! ** Purpose :   Choice of the operator for the lateral tracer diffusion
       !!
       !! ** Method  :   set nldf_tra from the namtra_ldf logicals
       !!----------------------------------------------------------------------
-      INTEGER ::   ioptio, ierr   ! temporary integers 
+      INTEGER ::   ioptio, ierr   ! temporary integers
       !!----------------------------------------------------------------------
       !