Changeset 4276 for branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90

Timestamp:

2013-11-20T10:35:28+01:00 (11 years ago)

Author:

cbricaud

Message:

merge changes from 3856 to 4119 from trunk in dev_r3856_MERCATOR3_QSRMEAN24

File:

• branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90 (modified) (7 diffs)

branches/2013/dev_r3856_MERCATOR3_QSRMEAN24H/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90

@@ -13 +13 @@
    !!   trc_nam_trp  : read the passive tracer namelist for transport
    !!----------------------------------------------------------------------
-   USE trc                 ! ocean passive tracers variables
+   USE oce_trc              ! shared ocean passive tracers variables
+   USE trc                 ! passive tracers variables
    USE in_out_manager      ! ocean dynamics and active tracers variables
 
@@ -48 +49 @@
    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
@@ -57 +56 @@
    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
 
    !!----------------------------------------------------------------------
@@ -82 +80 @@
       NAMELIST/namtrc_zdf/ ln_trczdf_exp  , nn_trczdf_exp
       NAMELIST/namtrc_rad/ ln_trcrad
-#if defined key_trcdmp
-      NAMELIST/namtrc_dmp/ ln_trcdmp, nn_hdmp_tr, nn_zdmp_tr, rn_surf_tr, &
+      NAMELIST/namtrc_dmp/ nn_hdmp_tr, nn_zdmp_tr, rn_surf_tr, &
         &                  rn_bot_tr , rn_dep_tr , nn_file_tr
-#endif
       !!----------------------------------------------------------------------
 
@@ -148 +144 @@
 
 
-# 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
@@ -158 +153 @@
          WRITE(numout,*) '~~~~~~~'
          WRITE(numout,*) '   Namelist namtrc_dmp : set damping parameter'
-         WRITE(numout,*) '      add a damping term or not      ln_trcdmp = ', ln_trcdmp
          WRITE(numout,*) '      tracer damping option          nn_hdmp_tr = ', nn_hdmp_tr
          WRITE(numout,*) '      mixed layer damping option     nn_zdmp_tr = ', nn_zdmp_tr, '(zoom: forced to 0)'
@@ -166 +160 @@
          WRITE(numout,*) '      create a damping.coeff file    nn_file_tr = ', nn_file_tr
       ENDIF
-#endif
       !
    END SUBROUTINE trc_nam_trp