Changeset 2047 for trunk/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

Timestamp:

2010-08-13T09:58:59+02:00 (14 years ago)

Author:

cetlod

Message:

Improve CFC and Bomb C14 models, see ticket:700

File:

• trunk/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) (2 diffs)

trunk/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

@@ -27 +27 @@
    PUBLIC   trc_sms_cfc       ! called in ???    
 
-   INTEGER , PUBLIC, PARAMETER ::   jpyear = 100   ! temporal parameter 
+   INTEGER , PUBLIC, PARAMETER ::   jpyear = 150   ! temporal parameter 
    INTEGER , PUBLIC, PARAMETER ::   jphem  =   2   ! parameter for the 2 hemispheres
    INTEGER , PUBLIC    ::   ndate_beg      ! initial calendar date (aammjj) for CFC
    INTEGER , PUBLIC    ::   nyear_res      ! restoring time constant (year)
    INTEGER , PUBLIC    ::   nyear_beg      ! initial year (aa) 
+   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          
@@ -96 +97 @@
       ! Temporal interpolation
       ! ----------------------
-      iyear_beg = nyear + ( nyear_res - 1900 - nyear_beg  )
+      iyear_beg = nyear - 1900
       IF ( nmonth <= 6 ) THEN
-         iyear_beg = iyear_beg - 2 + nyear_beg
+         iyear_beg = iyear_beg - 1
          im1       =  6 - nmonth + 1
          im2       =  6 + nmonth - 1
       ELSE
-         iyear_beg = iyear_beg - 1 + nyear_beg
          im1       = 12 - nmonth + 7
          im2       =      nmonth - 7