Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zmeso.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/PISCES/p4zmeso.F90 (modified) (9 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zmeso.F90

@@ -74 +74 @@
       REAL(wp),DIMENSION(jpi,jpj,jpk) :: zgrazfff,zgrazffe
       CHARACTER (len=25) :: charout
-#if defined key_trc_diaadd && defined key_trc_dia3d && defined key_iomput
+#if defined key_diatrc && defined key_iomput
       REAL(wp) :: zrfact2
 #endif
@@ -102 +102 @@
 
                zcompam = MAX( ( trn(ji,jj,jk,jpmes) - 1.e-9 ), 0.e0 )
-# if defined key_off_degrad
+# if defined key_degrad
                zfact   = zstep * tgfunc(ji,jj,jk) * zcompam * facvol(ji,jj,jk)
 # else
@@ -140 +140 @@
 
                zgraze2 = grazrat2 * zstep * Tgfunc2(ji,jj,jk) * zdenom    &
-# if defined key_off_degrad
+# if defined key_degrad
                   &     * facvol(ji,jj,jk)          &
 # endif
@@ -168 +168 @@
 !    ----------------------------------
 # if ! defined key_kriest
-#   if ! defined key_off_degrad
+#   if ! defined key_degrad
                zgrazffe(ji,jj,jk) = grazflux * zstep * wsbio4(ji,jj,jk)          &
                   &                 * tgfunc2(ji,jj,jk) * trn(ji,jj,jk,jpgoc) * trn(ji,jj,jk,jpmes)
@@ -181 +181 @@
 !!               zgrazffe(ji,jj,jk) = 0.5 * 1.3e-2 / 5.5e-7 * 0.3 * zstep * wsbio3(ji,jj,jk)     &
 !!                  &     * tgfunc(ji,jj,jk) * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jpmes)    &
-#  if defined key_off_degrad
+#  if defined key_degrad
 !!                  &     * facvol(ji,jj,jk)          &
 #  endif
@@ -187 +187 @@
 !!--------------------------- KRIEST3 -------------------------------------------
 
-#  if ! defined key_off_degrad
+#  if ! defined key_degrad
               zgrazffe(ji,jj,jk) = grazflux * zstep * wsbio3(ji,jj,jk)     &
                   &                * tgfunc2(ji,jj,jk) * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jpmes)
@@ -202 +202 @@
       END DO
       
-#if defined key_trc_dia3d
+#if defined key_diatrc
       ! Total grazing ( grazing by microzoo is already computed in p4zmicro ) 
       grazing(:,:,:) = grazing(:,:,:) + (  zgrazd  (:,:,:) + zgrazz  (:,:,:) + zgrazn(:,:,:) &
@@ -281 +281 @@
 
                zprcaca = xfracal(ji,jj,jk) * unass2 * zgrazn(ji,jj,jk)
-#if defined key_trc_dia3d
+#if defined key_diatrc
                prodcal(ji,jj,jk) = prodcal(ji,jj,jk) + zprcaca  ! prodcal=prodcal(nanophy)+prodcal(microzoo)+prodcal(mesozoo)
 #endif
@@ -314 +314 @@
       END DO
       !
-#if defined key_trc_diaadd && defined key_trc_dia3d && defined key_iomput
+#if defined key_diatrc && defined key_iomput
       zrfact2 = 1.e3 * rfact2r
       ! Total grazing of phyto by zoo