Changeset 2423 for trunk/NEMO/TOP_SRC/C14b/trcctl_c14b.F90

Timestamp:

2010-11-24T16:37:34+01:00 (13 years ago)

Author:

cetlod

Message:

v3.2:use of standard print control in TOP

File:

• trunk/NEMO/TOP_SRC/C14b/trcctl_c14b.F90 (modified) (4 diffs)

trunk/NEMO/TOP_SRC/C14b/trcctl_c14b.F90

@@ -33 +33 @@
       !! ** Purpose :   control the cpp options, namelist and files 
       !!----------------------------------------------------------------------
-
       IF(lwp) THEN
           WRITE(numout,*) ' C14 bomb Model '
@@ -41 +40 @@
       ! Check number of tracers
       ! -----------------------   
-      IF( jp_c14b > 1) THEN 
-          IF(lwp) THEN 
-              WRITE (numout,*) ' ===>>>> : w a r n i n g '
-              WRITE (numout,*) ' =======   ============= '
-              WRITE (numout,*)                             &
-              &   ' STOP, change jp_c14b to 1 in par_C14b module '  
-          END IF 
-          STOP 'TRC_CTL'
-      END IF 
+      IF( jp_c14b > 1) CALL ctl_stop( ' Change jp_c14b to be equal 1 in par_c14b.F90' )
 
       ! Check tracer names
       ! ------------------
-      IF ( ctrcnm(jpc14) /= 'C14B' ) THEN 
+      IF ( ctrcnm(jpc14) /= 'C14B' ) THEN
            ctrcnm(jpc14)  = 'C14B'
            ctrcnl(jpc14)  = 'Bomb C14 concentration'
@@ -59 +50 @@
 
       IF(lwp) THEN
-         WRITE (numout,*) ' ===>>>> : w a r n i n g '
-         WRITE (numout,*) ' =======   ============= '
-         WRITE (numout,*) ' we force tracer names'
+         CALL ctl_warn( ' we force tracer names' )
          WRITE(numout,*) ' tracer nb: ',jpc14,' name = ',ctrcnm(jpc14), ctrcnl(jpc14)
          WRITE(numout,*) ' '
-      ENDIF 
-
+      ENDIF
 
       ! Check tracer units
@@ -72 +60 @@
           ctrcun(jpc14) = 'ration'
           IF(lwp) THEN
-             WRITE (numout,*) ' ===>>>> : w a r n i n g '
-             WRITE (numout,*) ' =======   ============= '
-             WRITE (numout,*) ' we force tracer unit'
+             CALL ctl_warn( ' we force tracer unit' )
              WRITE(numout,*) ' tracer  ',ctrcnm(jpc14), 'UNIT= ',ctrcun(jpc14)
              WRITE(numout,*) ' '
-          ENDIF 
-       ENDIF 
+          ENDIF
+       ENDIF
       !
    END SUBROUTINE trc_ctl_c14b