Changeset 1264 for trunk/NEMO/TOP_SRC/PISCES/p4zsink.F90

Timestamp:

2009-01-13T19:54:08+01:00 (16 years ago)

Author:

cetlod

Message:

clean TOP model routines to avoid warning when compiling, see ticket:303

File:

• trunk/NEMO/TOP_SRC/PISCES/p4zsink.F90 (modified) (12 diffs)

trunk/NEMO/TOP_SRC/PISCES/p4zsink.F90

@@ -32 +32 @@
      sinkfer                   !: Small BFe sinking flux
 
+   REAL(wp) ::   &
+     xstep , xstep2            !: Time step duration for biology
+
 #if  defined key_kriest
    REAL(wp)          ::       &   
@@ -92 +95 @@
       REAL(wp) :: zdiv , zdiv1, zdiv2, zdiv3, zdiv4, zdiv5
       REAL(wp) :: zval1, zval2, zval3, zval4
-      REAL(wp) :: zstep
 #if defined key_trc_dia3d
       REAL(wp) ::   zrfact2
@@ -101 +103 @@
       !!---------------------------------------------------------------------
 
-      IF( ( kt * jnt ) == nittrc000  )   CALL p4z_sink_init   ! Initialization (first time-step only)
-
-       zstep = rfact2 / rjjss      ! Time step duration for biology
-
+      IF( ( kt * jnt ) == nittrc000  )  THEN 
+          CALL p4z_sink_init   ! Initialization (first time-step only)
+          xstep  = rfact2 / rjjss      ! Time step duration for biology
+          xstep2 = rfact2 /  2.
+      ENDIF
 
 !     Initialisation of variables used to compute Sinking Speed
@@ -252 +255 @@
                      &    )
 
-                  zaggsi = ( zagg4 + zagg5 ) * zstep / 10.
+                  zaggsi = ( zagg4 + zagg5 ) * xstep / 10.
 
                   zagg = 0.5 * xkr_stick * ( zaggsh + zaggsi )
@@ -260 +263 @@
 
                   zaggdoc = ( 0.4 * trn(ji,jj,jk,jpdoc)               &
-                     &        + 1018.  * trn(ji,jj,jk,jppoc)  ) * zstep    &
+                     &        + 1018.  * trn(ji,jj,jk,jppoc)  ) * xstep    &
 # if defined key_off_degrad
                      &        * facvol(ji,jj,jk)                              &
@@ -450 +453 @@
       REAL(wp) ::   zagg1, zagg2, zagg3, zagg4
       REAL(wp) ::   zagg , zaggfe, zaggdoc, zaggdoc2
-      REAL(wp) ::   zfact, zstep, zwsmax
+      REAL(wp) ::   zfact, zwsmax
 #if defined key_trc_dia3d
       REAL(wp) ::   zrfact2
@@ -457 +460 @@
       !!---------------------------------------------------------------------
 
-       zstep = rfact2 / rjjss      ! Timestep duration for biology
-
+      IF( ( kt * jnt ) == nittrc000  )  THEN
+          xstep  = rfact2 / rjjss      ! Timestep duration for biology
+          xstep2 = rfact2 /  2.
+      ENDIF
 
 !    Sinking speeds of detritus is increased with depth as shown
@@ -490 +495 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zwsmax = 0.8 * fse3t(ji,jj,jk) / zstep
+               zwsmax = 0.8 * fse3t(ji,jj,jk) / xstep
                wsbio4(ji,jj,jk) = MIN( wsbio4(ji,jj,jk), zwsmax )
                wsbio3(ji,jj,jk) = MIN( wsbio3(ji,jj,jk), zwsmax )
@@ -527 +532 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               zfact = zstep * xdiss(ji,jj,jk)
+               zfact = xstep * xdiss(ji,jj,jk)
 
 !    Part I : Coagulation dependent on turbulence
@@ -549 +554 @@
 
 # if defined key_off_degrad
-               zagg3 = 0.66 * zstep * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jpgoc) * facvol(ji,jj,jk)
+               zagg3 = 0.66 * xstep * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jpgoc) * facvol(ji,jj,jk)
 # else
-               zagg3 = 0.66 * zstep * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jpgoc)
-# endif
-
-# if defined key_off_degrad
-               zagg4 = 0.e0 * zstep * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jppoc) * facvol(ji,jj,jk)
+               zagg3 = 0.66 * xstep * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jpgoc)
+# endif
+
+# if defined key_off_degrad
+               zagg4 = 0.e0 * xstep * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jppoc) * facvol(ji,jj,jk)
 # else
-               zagg4 = 0.e0 * zstep * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jppoc)
+               zagg4 = 0.e0 * xstep * trn(ji,jj,jk,jppoc) * trn(ji,jj,jk,jppoc)
 # endif
 
@@ -627 +632 @@
       !!
       INTEGER  ::   ji, jj, jk, jn
-      REAL(wp) ::   zigma,zew,zstep,zign, zflx
+      REAL(wp) ::   zigma,zew,zign, zflx
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::  ztraz, zakz
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::  zwsink2
       !!---------------------------------------------------------------------
 
-      zstep  = rfact2 / 2.
 
       ztraz(:,:,:) = 0.e0
@@ -680 +684 @@
             DO jj = 1, jpj      
                DO ji = 1, jpi    
-                  zigma = zwsink2(ji,jj,jk+1) * zstep / fse3w(ji,jj,jk+1)
+                  zigma = zwsink2(ji,jj,jk+1) * xstep2 / fse3w(ji,jj,jk+1)
                   zew   = zwsink2(ji,jj,jk+1)
-                  psinkflx(ji,jj,jk+1) = -zew * ( trn(ji,jj,jk,jp_tra) - 0.5 * ( 1 + zigma ) * zakz(ji,jj,jk) ) * zstep
+                  psinkflx(ji,jj,jk+1) = -zew * ( trn(ji,jj,jk,jp_tra) - 0.5 * ( 1 + zigma ) * zakz(ji,jj,jk) ) * xstep2
                END DO
             END DO