Changeset 14072 for NEMO/trunk/src/OCE/TRA/tradmp.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/tradmp.F90 (modified) (5 diffs)

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

@@ -11 +11 @@
    !!  NEMO      1.0  ! 2002-08  (G. Madec, E. Durand)  free form + modules
    !!            3.2  ! 2009-08  (G. Madec, C. Talandier)  DOCTOR norm for namelist parameter
-   !!            3.3  ! 2010-06  (C. Ethe, G. Madec) merge TRA-TRC 
+   !!            3.3  ! 2010-06  (C. Ethe, G. Madec) merge TRA-TRC
    !!            3.4  ! 2011-04  (G. Madec, C. Ethe) Merge of dtatem and dtasal + suppression of CPP keys
    !!            3.6  ! 2015-06  (T. Graham)  read restoring coefficient in a file
@@ -26 +26 @@
    USE c1d            ! 1D vertical configuration
    USE trd_oce        ! trends: ocean variables
-   USE trdtra         ! trends manager: tracers 
+   USE trdtra         ! trends manager: tracers
    USE zdf_oce        ! ocean: vertical physics
    USE phycst         ! physical constants
@@ -55 +55 @@
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
-   !! $Id$ 
+   !! $Id$
    !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
@@ -75 +75 @@
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE tra_dmp  ***
-      !!                  
+      !!
       !! ** Purpose :   Compute the tracer trend due to a newtonian damping
       !!      of the tracer field towards given data field and add it to the
       !!      general tracer trends.
       !!
-      !! ** Method  :   Newtonian damping towards t_dta and s_dta computed 
+      !! ** Method  :   Newtonian damping towards t_dta and s_dta computed
       !!      and add to the general tracer trends:
       !!                     ta = ta + resto * (t_dta - tb)
@@ -158 +158 @@
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE tra_dmp_init  ***
-      !! 
-      !! ** Purpose :   Initialization for the newtonian damping 
+      !!
+      !! ** Purpose :   Initialization for the newtonian damping
       !!
       !! ** Method  :   read the namtra_dmp namelist and check the parameters
       !!----------------------------------------------------------------------
-      INTEGER ::   ios, imask   ! local integers 
+      INTEGER ::   ios, imask   ! local integers
       !
       NAMELIST/namtra_dmp/ ln_tradmp, nn_zdmp, cn_resto