Changeset 2423 for trunk/NEMO/TOP_SRC/CFC

Timestamp:

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

Author:

cetlod

Message:

v3.2:use of standard print control in TOP

Location:

trunk/NEMO/TOP_SRC/CFC

Files:

• trcctl_cfc.F90 (modified) (3 diffs)
• trcsms_cfc.F90 (modified) (1 diff)

trunk/NEMO/TOP_SRC/CFC/trcctl_cfc.F90

@@ -42 +42 @@
       ! Check number of tracers
       ! -----------------------   
-      IF( jp_cfc > 2) THEN 
-          IF(lwp) THEN 
-              WRITE (numout,*) ' ===>>>> : w a r n i n g <<<<==='
-              WRITE (numout,*)                             &
-              &   ' STOP, change jp_cfc to 1 or 2 in par_CFC module '  
-          END IF 
-          STOP 'TRC_CTL'
-      END IF 
+      IF( jp_cfc > 2 ) CALL ctl_stop( ' change jp_cfc to 1 or 2 in par_cfc.F90.' )
 
       ! Check tracer names
@@ -62 +55 @@
 
       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 ' )
          DO jl = 1, jp_cfc
             jn = jp_cfc0 + jl - 1
@@ -80 +71 @@
             ctrcun(jn) = 'mole/m3'
             IF(lwp) THEN
-               WRITE (numout,*) ' ===>>>> : w a r n i n g <<<<==='
-               WRITE (numout,*) ' we force tracer unit'
+               CALL ctl_warn( ' We force tracer units ' )
                WRITE(numout,*) ' tracer  ',ctrcnm(jn), 'UNIT= ',ctrcun(jn)
                WRITE(numout,*) ' '

trunk/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

@@ -34 +34 @@
    INTEGER , PUBLIC    ::   npyear         ! Number of years read in CFC1112 file
    
-   REAL(wp), PUBLIC, DIMENSION(jpyear,jphem, jp_cfc) ::   p_cfc    ! partial hemispheric pressure for CFC          
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)              ::   xphem    ! spatial interpolation factor for patm
+   REAL(wp), PUBLIC, DIMENSION(jpyear,jphem,2     ) ::   p_cfc    ! partial hemispheric pressure for CFC          
+   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)             ::   xphem    ! spatial interpolation factor for patm
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj     ,jp_cfc) ::   qtr_cfc  ! flux at surface
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj     ,jp_cfc) ::   qint_cfc ! cumulative flux 
 
-   REAL(wp), DIMENSION(4,jp_cfc) ::   soa   ! coefficient for solubility of CFC [mol/l/atm]
-   REAL(wp), DIMENSION(3,jp_cfc) ::   sob   !    "               "
-   REAL(wp), DIMENSION(4,jp_cfc) ::   sca   ! coefficients for schmidt number in degre Celcius
+   REAL(wp), DIMENSION(4,2) ::   soa   ! coefficient for solubility of CFC [mol/l/atm]
+   REAL(wp), DIMENSION(3,2) ::   sob   !    "               "
+   REAL(wp), DIMENSION(4,2) ::   sca   ! coefficients for schmidt number in degre Celcius
       
    !                          ! coefficients for conversion