Changeset 4148 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

Timestamp:

2013-11-04T13:54:28+01:00 (10 years ago)

Author:

cetlod

Message:

merge in trunk changes between r3853 and r3940 and commit the changes, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcnam.F90 (modified) (4 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

@@ -60 +60 @@
       !!
       NAMELIST/namtrc/ nn_dttrc, nn_writetrc, ln_rsttr, nn_rsttr, &
-         &             cn_trcrst_in, cn_trcrst_out, sn_tracer, ln_trcdta, ln_trcdmp, &
-         &             ln_top_euler
+         &             cn_trcrst_in, cn_trcrst_out, sn_tracer, ln_trcdta, &
+         &             ln_trcdmp, ln_trcdmp_clo, ln_top_euler
 #if defined key_trdmld_trc  || defined key_trdtrc
       NAMELIST/namtrc_trd/ nn_trd_trc, nn_ctls_trc, rn_ucf_trc, &
@@ -109 +109 @@
          WRITE(numout,*) '   Read inputs data from file (y/n)             ln_trcdta     = ', ln_trcdta
          WRITE(numout,*) '   Damping of passive tracer (y/n)              ln_trcdmp     = ', ln_trcdmp
+         WRITE(numout,*) '   Restoring of tracer on closed seas           ln_trcdmp_clo = ', ln_trcdmp_clo
          WRITE(numout,*) '   Use euler integration for TRC (y/n)          ln_top_euler  = ', ln_top_euler
          WRITE(numout,*) ' '
@@ -170 +171 @@
 
 
-      IF( ln_trcdmp .AND. .NOT.ln_trcdta ) THEN
-         CALL ctl_warn( 'trc_nam: passive tracer damping requires data from files we set ln_trcdta to TRUE' )
-         ln_trcdta = .TRUE.
-      ENDIF
+      IF( ln_rsttr )                      ln_trcdta = .FALSE.   ! restart : no need of clim data
       !
-      IF( ln_rsttr .AND. .NOT.ln_trcdmp .AND. ln_trcdta ) THEN
-          CALL ctl_warn( 'trc_nam: passive tracer restart and  data intialisation, ',   &
-             &           'we keep the restart values and set ln_trcdta to FALSE' )
-         ln_trcdta = .FALSE.
-      ENDIF
+      IF( ln_trcdmp .OR. ln_trcdmp_clo )  ln_trcdta = .TRUE.   ! damping : need to have clim data
       !
       IF( .NOT.ln_trcdta ) THEN
@@ -188 +182 @@
          IF( ln_rsttr ) THEN
             WRITE(numout,*)
-            WRITE(numout,*) '    read a restart file for passive tracer : ', TRIM( cn_trcrst_in )
-            WRITE(numout,*)
-         ELSE
-            IF( .NOT.ln_trcdta ) THEN
-                WRITE(numout,*)
-                WRITE(numout,*) '  All the passive tracers are initialised with constant values '
-                WRITE(numout,*)
-            ENDIF
+            WRITE(numout,*) '  Read a restart file for passive tracer : ', TRIM( cn_trcrst_in )
+            WRITE(numout,*)
+         ENDIF
+         IF( ln_trcdta .AND. .NOT.ln_rsttr ) THEN
+            WRITE(numout,*)
+            WRITE(numout,*) '  Some of the passive tracers are initialised from climatologies '
+            WRITE(numout,*)
+         ENDIF
+         IF( .NOT.ln_trcdta ) THEN
+            WRITE(numout,*)
+            WRITE(numout,*) '  All the passive tracers are initialised with constant values '
+            WRITE(numout,*)
          ENDIF
       ENDIF