Changeset 2528 for trunk/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

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

trunk/NEMOGCM/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
 
@@ -34 +34 @@
    INTEGER , PUBLIC    ::   npyear         ! Number of years read in CFC1112 file
    
-   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(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 
@@ -52 +52 @@
 #  include "top_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
+   !! NEMO/TOP 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -93 +93 @@
       !!----------------------------------------------------------------------
 
-      IF( kt == nittrc000 )   CALL trc_cfc_cst
+      IF( kt == nit000 )   CALL trc_cfc_cst
 
       ! Temporal interpolation
@@ -129 +129 @@
                ! coefficient for solubility for CFC-11/12 in  mol/l/atm
                IF( tmask(ji,jj,1) .GE. 0.5 ) THEN
-                  ztap  = ( tn(ji,jj,1) + 273.16 ) * 0.01
+                  ztap  = ( tsn(ji,jj,1,jp_tem) + 273.16 ) * 0.01
                   zdtap = sob(1,jl) + ztap * ( sob(2,jl) + ztap * sob(3,jl) ) 
                   zsol  =  EXP( soa(1,jl) + soa(2,jl) / ztap + soa(3,jl) * LOG( ztap )   &
-                     &                    + soa(4,jl) * ztap * ztap + sn(ji,jj,1) * zdtap ) 
+                     &                    + soa(4,jl) * ztap * ztap + tsn(ji,jj,1,jp_sal) * zdtap ) 
                ELSE
                   zsol  = 0.e0
@@ -143 +143 @@
                ! Computation of speed transfert
                !    Schmidt number
-               zt1  = tn(ji,jj,1)
+               zt1  = tsn(ji,jj,1,jp_tem)
                zt2  = zt1 * zt1 
                zt3  = zt1 * zt2
@@ -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