Changeset 3881 for branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90

Timestamp:

2013-04-22T12:05:52+02:00 (11 years ago)

Author:

cetlod

Message:

v3_4_stable: fix on passive tracer damping, see ticket #1083

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90 (modified) (6 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90

@@ -13 +13 @@
    !!   trc_nam_trp  : read the passive tracer namelist for transport
    !!----------------------------------------------------------------------
+   USE oce_trc
    USE trc                 ! ocean passive tracers variables
    USE in_out_manager      ! ocean dynamics and active tracers variables
@@ -46 +47 @@
    INTEGER , PUBLIC ::   nn_trczdf_exp = 3             !: number of sub-time step (explicit time stepping)
 
-
-#if defined key_trcdmp
    !                                                 !!: ** newtonian damping namelist (nam_trcdmp) **
    INTEGER , PUBLIC ::   nn_hdmp_tr      =   -1       ! = 0/-1/'latitude' for damping over passive tracer
@@ -55 +54 @@
    REAL(wp), PUBLIC ::   rn_dep_tr       =  800.      ! depth of transition between rn_surf and rn_bot [meters]
    INTEGER , PUBLIC ::   nn_file_tr      =    2       ! = 1 create a damping.coeff NetCDF file 
-#endif
 
    !!----------------------------------------------------------------------
@@ -80 +78 @@
       NAMELIST/namtrc_zdf/ ln_trczdf_exp  , nn_trczdf_exp
       NAMELIST/namtrc_rad/ ln_trcrad
-#if defined key_trcdmp
       NAMELIST/namtrc_dmp/ nn_hdmp_tr, nn_zdmp_tr, rn_surf_tr, &
         &                  rn_bot_tr , rn_dep_tr , nn_file_tr
-#endif
       !!----------------------------------------------------------------------
 
@@ -146 +142 @@
 
 
-# if defined key_trcdmp
       REWIND ( numnat )                  ! Read Namelist namtra_dmp : temperature and salinity damping term
       READ   ( numnat, namtrc_dmp )
-      IF( lzoom )   nn_zdmp_trc = 0           ! restoring to climatology at closed north or south boundaries
+      IF( lzoom )   nn_zdmp_tr = 0           ! restoring to climatology at closed north or south boundaries
 
       IF(lwp) THEN                       ! Namelist print
@@ -163 +158 @@
          WRITE(numout,*) '      create a damping.coeff file    nn_file_tr = ', nn_file_tr
       ENDIF
-#endif
       !
    END SUBROUTINE trc_nam_trp