Changeset 3294 for trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90 (modified) (9 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90

@@ -14 +14 @@
    !!   p4z_mort_init  :   Initialize the mortality params for phytoplankton
    !!----------------------------------------------------------------------
-   USE trc
-   USE oce_trc         !
-   USE trc         ! 
-   USE sms_pisces      ! 
-   USE p4zsink
-   USE prtctl_trc
+   USE oce_trc         !  shared variables between ocean and passive tracers
+   USE trc             !  passive tracers common variables 
+   USE sms_pisces      !  PISCES Source Minus Sink variables
+   USE p4zsink         !  vertical flux of particulate matter due to sinking
+   USE prtctl_trc      !  print control for debugging
 
    IMPLICIT NONE
@@ -27 +26 @@
    PUBLIC   p4z_mort_init    
 
-
    !! * Shared module variables
-   REAL(wp), PUBLIC ::   &
-     wchl   = 0.001_wp    ,  &  !:
-     wchld  = 0.02_wp     ,  &  !:
-     mprat  = 0.01_wp     ,  &  !:
-     mprat2 = 0.01_wp     ,  &  !:
-     mpratm = 0.01_wp           !:
+   REAL(wp), PUBLIC :: wchl   = 0.001_wp  !:
+   REAL(wp), PUBLIC :: wchld  = 0.02_wp   !:
+   REAL(wp), PUBLIC :: mprat  = 0.01_wp   !:
+   REAL(wp), PUBLIC :: mprat2 = 0.01_wp   !:
+   REAL(wp), PUBLIC :: mpratm = 0.01_wp   !:
 
 
@@ -80 +77 @@
       CHARACTER (len=25) :: charout
       !!---------------------------------------------------------------------
-
-
-#if defined key_diatrc
-     prodcal(:,:,:) = 0.  !: Initialisation of calcite production variable
-#endif
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('p4z_nano')
+      !
+      prodcal(:,:,:) = 0.  !: calcite production variable set to zero
       DO jk = 1, jpkm1
          DO jj = 1, jpj
             DO ji = 1, jpi
-
                zcompaph = MAX( ( trn(ji,jj,jk,jpphy) - 1e-8 ), 0.e0 )
-
+               zstep    = xstep
 # if defined key_degrad
-               zstep =  xstep * facvol(ji,jj,jk)  
-# else
-               zstep =  xstep  
+               zstep    = zstep * facvol(ji,jj,jk)
 # endif
                !     Squared mortality of Phyto similar to a sedimentation term during
@@ -117 +109 @@
                tra(ji,jj,jk,jpnfe) = tra(ji,jj,jk,jpnfe) - zmortp * zfactfe
                zprcaca = xfracal(ji,jj,jk) * zmortp
-#if defined key_diatrc
+               !
                prodcal(ji,jj,jk) = prodcal(ji,jj,jk) + zprcaca  ! prodcal=prodcal(nanophy)+prodcal(microzoo)+prodcal(mesozoo)
-#endif
+               !
                zfracal = 0.5 * xfracal(ji,jj,jk)
                tra(ji,jj,jk,jpdic) = tra(ji,jj,jk,jpdic) - zprcaca
@@ -143 +135 @@
          CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm)
        ENDIF
-
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('p4z_nano')
+      !
    END SUBROUTINE p4z_nano
 
@@ -158 +152 @@
       REAL(wp) ::  zrespp2, ztortp2, zmortp2, zstep
       CHARACTER (len=25) :: charout
- 
-      !!---------------------------------------------------------------------
-
+      !!---------------------------------------------------------------------
+      !
+      IF( nn_timing == 1 )  CALL timing_start('p4z_diat')
+      !
 
       !    Aggregation term for diatoms is increased in case of nutrient
@@ -177 +172 @@
                !    sticky and coagulate to sink quickly out of the euphotic zone
                !     ------------------------------------------------------------
-
+               zstep   = xstep
 # if defined key_degrad
-               zstep =  xstep * facvol(ji,jj,jk)  
-# else
-               zstep =  xstep  
+               zstep = zstep * facvol(ji,jj,jk)
 # endif
                !  Phytoplankton respiration 
@@ -219 +212 @@
       END DO
       !
-        IF(ln_ctl)   THEN  ! print mean trends (used for debugging)
+      IF(ln_ctl)   THEN  ! print mean trends (used for debugging)
          WRITE(charout, FMT="('diat')")
          CALL prt_ctl_trc_info(charout)
          CALL prt_ctl_trc(tab4d=tra, mask=tmask, clinfo=ctrcnm)
-       ENDIF
-             
+      ENDIF
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('p4z_diat')
+      !
    END SUBROUTINE p4z_diat
 
@@ -243 +238 @@
       NAMELIST/nampismort/ wchl, wchld, mprat, mprat2, mpratm
 
-      REWIND( numnat )                     ! read numnat
-      READ  ( numnat, nampismort )
+      REWIND( numnatp )                     ! read numnatp
+      READ  ( numnatp, nampismort )
 
       IF(lwp) THEN                         ! control print