Changeset 2528 for trunk/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.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/C14b/trcsms_c14b.F90 (modified) (9 diffs, 1 prop)

trunk/NEMOGCM/NEMO/TOP_SRC/C14b/trcsms_c14b.F90

@@ -17 +17 @@
    USE par_trc      ! TOP parameters
    USE trc          ! TOP variables
-   USE trdmld_trc_oce
-   USE trdmld_trc
+   USE trdmod_oce
+   USE trdmod_trc
    USE iom
 
@@ -126 +126 @@
        zpv  ,        &      !: piston velocity 
        zdemi, ztra
-#if defined key_trc_dia3d  && defined key_iomput
+#if defined key_diatrc  && defined key_iomput
       REAL(wp), DIMENSION(jpi,jpj,jpk) :: zw3d
 #endif
       !!----------------------------------------------------------------------
 
-      IF( kt == nittrc000 )  THEN
+      IF( kt == nit000 )  THEN
          ! Computation of decay coeffcient
          zdemi   = 5730.
@@ -234 +234 @@
             !  Computation of solubility  
             IF (tmask(ji,jj,1) >  0.) THEN
-               ztp  = ( tn(ji,jj,1) + 273.16 ) * 0.01
+               ztp  = ( tsn(ji,jj,1,jp_tem) + 273.16 ) * 0.01
                zsk  = 0.023517 + ztp * ( -0.023656 + 0.0047036 * ztp )
-               zsol = EXP( -60.2409 + 93.4517 / ztp  + 23.3585 * LOG( ztp ) + zsk * sn(ji,jj,1) )
+               zsol = EXP( -60.2409 + 93.4517 / ztp  + 23.3585 * LOG( ztp ) + zsk * tsn(ji,jj,1,jp_sal) )
                ! convert solubilities [mol/(l * atm)] -> [mol/(m^3 * ppm)]
                zsol = zsol * 1.0e-03
@@ -247 +247 @@
 
             ! Computes the Schmidt number of CO2 in seawater
-            zt   = tn(ji,jj,1)
+            zt   = tsn(ji,jj,1,jp_tem)
             zsch = 2073.1 + zt * ( -125.62 + zt * (3.6276 - 0.043219 * zt ) )
 
@@ -259 +259 @@
             qtr_c14(ji,jj) = -zpv * zsol * zpco2at                                   &
                  &                       * ( trb(ji,jj,1,jpc14) - zatmbc14(ji,jj) )  &
-#if defined key_off_degrad
+#if defined key_degrad
                  &                       * facvol(ji,jj,1)                           &
 #endif
@@ -270 +270 @@
             qint_c14(ji,jj) = qint_c14(ji,jj) + qtr_c14(ji,jj) * rdt
 
-# if defined key_trc_diaadd && ! defined key_iomput
+# if defined key_diatrc && ! defined key_iomput
             ! Save 2D diagnostics
             trc2d(ji,jj,jp_c14b0_2d    ) = qtr_c14 (ji,jj)
@@ -282 +282 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-#if ! defined key_off_degrad
+#if ! defined key_degrad
                ztra = trn(ji,jj,jk,jpc14) * xaccum
 #else
@@ -288 +288 @@
 #endif
                tra(ji,jj,jk,jpc14) = tra(ji,jj,jk,jpc14) - ztra / rdt
-#if defined key_trc_dia3d
+#if defined key_diatrc
                ! Save 3D diagnostics
 # if ! defined key_iomput
@@ -300 +300 @@
       END DO
 
-#if defined key_trc_diaadd  && defined key_iomput
+#if defined key_diatrc  && defined key_iomput
       CALL iom_put( "qtrC14b"  , qtr_c14  )
       CALL iom_put( "qintC14b" , qint_c14 )
 #endif
-#if defined key_trc_dia3d  && defined key_iomput
+#if defined key_diatrc  && defined key_iomput
       CALL iom_put( "fdecay" , zw3d )
 #endif
       IF( l_trdtrc ) THEN
-         CALL trd_mod_trc( tra(:,:,:,jpc14), jpc14, jptrc_trd_sms, kt )   ! save trends
+         CALL trd_mod_trc( tra(:,:,:,jpc14), jpc14, jptra_trd_sms, kt )   ! save trends
       END IF