Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

Timestamp:

2010-08-02T12:57:40+02:00 (14 years ago)

Author:

cetlod

Message:

Apply the merge to passive tracers, see ticket:693

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcsms_cfc.F90 (modified) (6 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

@@ -18 +18 @@
    USE par_trc      ! TOP parameters
    USE trc          ! TOP variables
-   USE trdmld_trc_oce
-   USE trdmld_trc
+   USE trdmod_oce
+   USE trdmod_trc
    USE iom
 
@@ -32 +32 @@
    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
@@ -156 +156 @@
                ! trn in pico-mol/l idem qtr; ak in en m/s
                qtr_cfc(ji,jj,jl) = -zak_cfc * ( trb(ji,jj,1,jn) - zca_cfc )   &
-#if defined key_off_degrad
+#if defined key_degrad
                   &                         * facvol(ji,jj,1)                           &
 #endif
@@ -173 +173 @@
       !                                                     !----------------!
 
-#if defined key_trc_diaadd 
+#if defined key_diatrc 
       ! Save diagnostics , just for CFC11
 # if ! defined key_iomput
@@ -187 +187 @@
           DO jn = jp_cfc0, jp_cfc1
             ztrcfc(:,:,:) = tra(:,:,:,jn)
-            CALL trd_mod_trc( ztrcfc, jn, jptrc_trd_sms, kt )   ! save trends
+            CALL trd_mod_trc( ztrcfc, jn, jptra_trd_sms, kt )   ! save trends
           END DO
       END IF