Changeset 2072 for branches/devmercator2010/NEMO/TOP_SRC/CFC/trcctl_cfc.F90

Timestamp:

2010-09-08T16:29:38+02:00 (14 years ago)

Author:

cbricaud

Message:

add change from DEV_r1784_3DF

File:

• branches/devmercator2010/NEMO/TOP_SRC/CFC/trcctl_cfc.F90 (modified) (4 diffs)

branches/devmercator2010/NEMO/TOP_SRC/CFC/trcctl_cfc.F90

@@ -44 +44 @@
       IF( jp_cfc > 2) THEN 
           IF(lwp) THEN 
-              WRITE (numout,*) ' ===>>>> : w a r n i n g <<<<==='
+              WRITE (numout,*) ' ===>>>> : w a r n i n g '
+              WRITE (numout,*) ' =======   ============= '
               WRITE (numout,*)                             &
               &   ' STOP, change jp_cfc to 1 or 2 in par_CFC module '  
@@ -53 +54 @@
       ! Check tracer names
       ! ------------------
-      ctrcnm(jpc11) = 'CFC11'
-      ctrcnl(jpc11) = 'Chlorofuorocarbone 11 concentration'
-
-      IF ( jp_cfc == 2 ) THEN
-          ctrcnm(jpc12) = 'CFC12'
-          ctrcnl(jpc12) = 'Chlorofuorocarbone 12 concentration'
+      IF ( ctrcnm(jpc11) /= 'CFC11' .OR. ctrcnm(jpc12) /= 'CFC12' ) THEN 
+            ctrcnm(jpc11) = 'CFC11'
+            ctrcnl(jpc11) = 'Chlorofuorocarbone 11 concentration'
+            ctrcnm(jpc12) = 'CFC12'
+            ctrcnl(jpc12) = 'Chlorofuorocarbone 12 concentration' 
       ENDIF
 
@@ -70 +70 @@
          END DO
          WRITE(numout,*) ' '
-      ENDIF
+      ENDIF 
 
 
@@ -80 +80 @@
             ctrcun(jn) = 'mole/m3'
             IF(lwp) THEN
-               WRITE (numout,*) ' ===>>>> : w a r n i n g <<<<==='
+               WRITE (numout,*) ' ===>>>> : w a r n i n g '
+               WRITE (numout,*) ' =======   ============= '
                WRITE (numout,*) ' we force tracer unit'
                WRITE(numout,*) ' tracer  ',ctrcnm(jn), 'UNIT= ',ctrcun(jn)