Changeset 2104 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zprod.F90

Timestamp:

2010-09-17T14:35:46+02:00 (14 years ago)

Author:

cetlod

Message:

update DEV_r2006_merge_TRA_TRC according to review

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/PISCES/p4zprod.F90 (modified) (9 diffs)

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

@@ -27 +27 @@
    PRIVATE
 
-   PUBLIC   p4z_prod    ! called in p4zbio.F90
+   PUBLIC   p4z_prod         ! called in p4zbio.F90
+   PUBLIC   p4z_prod_init    ! called in trcsms_pisces.F90
 
    !! * Shared module variables
@@ -47 +48 @@
       texcret                    ,  &  !: 1 - excret 
       texcret2                   ,  &  !: 1 - excret2        
-      rpis180                    ,  &  !: rpi / 180
       tpp                              !: Total primary production
 
@@ -78 +78 @@
       REAL(wp) ::   zmxltst, zmxlday, zlim1
       REAL(wp) ::   zpislopen  , zpislope2n
-      REAL(wp) ::   zrum, zcodel, zargu, zvol
+      REAL(wp) ::   zrum, zcodel, zargu, zval, zvol
 #if defined key_diatrc
       REAL(wp) ::   zrfact2
@@ -91 +91 @@
       !!---------------------------------------------------------------------
 
-
-      IF( ( kt * jnt ) == nittrc000  )   CALL p4z_prod_init      ! Initialization (first time-step only)
-
-
       zprorca (:,:,:) = 0.0
       zprorcad(:,:,:) = 0.0
@@ -125 +121 @@
          zrum = FLOAT( nday_year - 80 ) / 365.
       ENDIF
-      zcodel = ASIN(  SIN( zrum * rpi * 2. ) * SIN( rpis180 * 23.5 )  )
+      zcodel = ASIN(  SIN( zrum * rpi * 2. ) * SIN( rad * 23.5 )  )
 
       ! day length in hours
@@ -131 +127 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            zargu = TAN( zcodel ) * TAN( gphit(ji,jj) * rpis180 )
+            zargu = TAN( zcodel ) * TAN( gphit(ji,jj) * rad )
             zargu = MAX( -1., MIN(  1., zargu ) )
-            zstrn(ji,jj) = MAX( 0.0, 24. - 2. * ACOS( zargu ) / rpis180 / 15. )
+            zval  = MAX( 0.0, 24. - 2. * ACOS( zargu ) / rad / 15. )
+            IF( zval < 1.e0 )   zval = 24.
+            zstrn(ji,jj) = 24. / zval
          END DO
       END DO
@@ -227 +225 @@
       END DO
 
-
-      WHERE( zstrn(:,:) < 1.e0 ) zstrn(:,:) = 24.
-      zstrn(:,:) = 24. / zstrn(:,:)
 
 !CDIR NOVERRCHK
@@ -396 +391 @@
       !!
       !! ** Method  :   Read the nampisprod namelist and check the parameters
-      !!      called at the first timestep (nittrc000)
+      !!      called at the first timestep (nit000)
       !!
       !! ** input   :   Namelist nampisprod
@@ -426 +421 @@
       nspyr  = INT( nyear_len(1) * rday / rdt )
 
-      rpis180   = rpi / 180.
       texcret   = 1.0 - excret
       texcret2  = 1.0 - excret2