Changeset 2979

Timestamp:

2011-10-24T10:47:03+02:00 (12 years ago)

Author:

cetlod

Message:

dev_LOCEAN_2011:minor bug correction to avoid compilation errors, see ticket #877

Location:

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC

Files:

• PISCES/p4zmort.F90 (modified) (2 diffs)
• PISCES/p4zprod.F90 (modified) (2 diffs)
• PISCES/trcnam_pisces.F90 (modified) (2 diffs)
• trcrst.F90 (modified) (1 diff)

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zmort.F90

@@ -25 +25 @@
    PUBLIC   p4z_mort    
    PUBLIC   p4z_mort_init    
-   PUBLIC   p4z_mort_alloc    
 
    !! * Shared module variables
@@ -208 +207 @@
       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
              
    END SUBROUTINE p4z_diat

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zprod.F90

@@ -182 +182 @@
                       ! Computation of production function for Carbon
                       !  ---------------------------------------------
-                      zpislopen  = zpislopead (ji,jj,jk) / ( ( r1_rday + bresp * r1_day / chlcnm ) * rday + rtrn)
-                      zpislope2n = zpislopead2(ji,jj,jk) / ( ( r1_rday + bresp * r1_day / chlcdm ) * rday + rtrn)
+                      zpislopen  = zpislopead (ji,jj,jk) / ( ( r1_rday + bresp * r1_rday / chlcnm ) * rday + rtrn)
+                      zpislope2n = zpislopead2(ji,jj,jk) / ( ( r1_rday + bresp * r1_rday / chlcdm ) * rday + rtrn)
                       zprbio(ji,jj,jk) = zprbio(ji,jj,jk) * ( 1.- EXP( -zpislopen  * znanotot )  )
                       zprdia(ji,jj,jk) = zprdia(ji,jj,jk) * ( 1.- EXP( -zpislope2n * zdiattot )  )
@@ -487 +487 @@
          WRITE(numout,*) '    excretion ratio of nanophytoplankton      excret       =', excret
          WRITE(numout,*) '    excretion ratio of diatoms                excret2      =', excret2
-         IF( ln_newprod )
+         IF( ln_newprod )  THEN
             WRITE(numout,*) '    basal respiration in phytoplankton        bresp        =', bresp
             WRITE(numout,*) '    Maximum Chl/C in phytoplankton            chlcmin      =', chlcmin

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/trcnam_pisces.F90

@@ -51 +51 @@
       TYPE(DIAG), DIMENSION(jp_pisces_3d) :: pisdia3d
       !!
-      NAMELIST/nampisbio/ part, nrdttrc, wsbio, xkmort, ferat3, wsbio2
+      NAMELIST/nampisbio/ nrdttrc, wsbio, xkmort, ferat3, wsbio2
 #if defined key_kriest
       NAMELIST/nampiskrp/ xkr_eta, xkr_zeta, xkr_mass_min, xkr_mass_max
@@ -74 +74 @@
       IF(lwp) THEN                         ! control print
          WRITE(numout,*) ' Namelist : nampisbio'
-         WRITE(numout,*) '    part of calcite not dissolved in guts     part      =', part
          WRITE(numout,*) '    frequence pour la biologie                nrdttrc   =', nrdttrc
          WRITE(numout,*) '    POC sinking speed                         wsbio     =', wsbio

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -294 +294 @@
       !
       DO jn = 1, jptra
-         zdiag_var    = glob_sum( trn(:,:,:,jn) * cvol(:,:,:)   )
-         zdiag_varmin = MINVAL( trn(:,:,:,jn), mask= ((tmask*SPREAD(tmask_i,DIM=3,NCOPIES=jpk).NE.0.)) )
-         zdiag_varmax = MAXVAL( trn(:,:,:,jn), mask= ((tmask*SPREAD(tmask_i,DIM=3,NCOPIES=jpk).NE.0.)) )
+         ztraf = glob_sum( trn(:,:,:,jn) * cvol(:,:,:) )
+         zmin  = MINVAL( trn(:,:,:,jn), mask= ((tmask*SPREAD(tmask_i,DIM=3,NCOPIES=jpk).NE.0.)) )
+         zmax  = MAXVAL( trn(:,:,:,jn), mask= ((tmask*SPREAD(tmask_i,DIM=3,NCOPIES=jpk).NE.0.)) )
          IF( lk_mpp ) THEN
             CALL mpp_min( zmin )      ! min over the global domain