Changeset 2959 for branches

Timestamp:

2011-10-19T11:14:09+02:00 (13 years ago)

Author:

cetlod

Message:

dev_r2787_PISCES_improvment:minor corrections

Location:

branches/2011/dev_r2787_PISCES_improvment/NEMOGCM/NEMO/TOP_SRC

Files:

• PISCES/trcsms_pisces.F90 (modified) (2 diffs)
• trcini.F90 (modified) (2 diffs)
• trcrst.F90 (modified) (3 diffs)

branches/2011/dev_r2787_PISCES_improvment/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90

@@ -145 +145 @@
 
       REAL(wp) :: zarea, zalksum, zpo4sum, zno3sum, zsilsum
-      REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: zvolume     ! volume of ocean
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zvolume     ! volume of ocean
       !!---------------------------------------------------------------------
 
@@ -156 +156 @@
          !                                                    ! --------------------------- !
          ! set total alkalinity, phosphate, nitrate & silicate
-         ALLOCATE( zvolume(ji,jj,jk) )
+         ALLOCATE( zvolume(jpi,jpj,jpk) )
          !                                                              ! masked grid volume
-         zvolume(:,:,:) = e1e2t(:,:)  * fse3t(:,:,jk) * tmask(:,:,jk)   
+         DO jk = 1, jpk
+            zvolume(:,:,jk) = e1e2t(:,:)  * fse3t(:,:,jk) * tmask(:,:,jk)   
+         ENDDO 
 #if defined key_degrad
          zvolume(:,:,:) = zvolume(:,:,:) * facvol(:,:,:)

branches/2011/dev_r2787_PISCES_improvment/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -69 +69 @@
       CALL top_alloc()              ! allocate TOP arrays
 
-      ALLOCATE( zvolume(ji,jj,jk) )
+      ALLOCATE( zvolume(jpi,jpj,jpk) )
 
       CALL trc_nam                  ! read passive tracers namelists
@@ -140 +140 @@
 
       !                                                              ! masked grid volume
-      zvolume(:,:,:) = e1e2t(:,:)  * fse3t(:,:,jk) * tmask(:,:,jk)   
+      DO jk = 1, jpk
+         zvolume(:,:,jk) = e1e2t(:,:)  * fse3t(:,:,jk) * tmask(:,:,jk)   
+      ENDDO
 #if defined key_degrad
       zvolume(:,:,:) = zvolume(:,:,:) * facvol(:,:,:)

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

@@ -286 +286 @@
       INTEGER  :: jn
       REAL(wp) :: zdiag_var, zdiag_varmin, zdiag_varmax, zdiag_tot
-      REAL(wp) :: zder
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zvolume     ! volume of ocean
+      REAL(wp) :: zareatot, zder
       !!----------------------------------------------------------------------
 
@@ -295 +296 @@
          WRITE(numout,*) 
       ENDIF
-      
+      !                                                              ! masked grid volume
+      ALLOCATE( zvolume(jpi,jpj,jpk) )
+      DO jk = 1, jpk
+         zvolume(:,:,jk) = e1e2t(:,:)  * fse3t(:,:,jk) * tmask(:,:,jk)
+      ENDDO 
+#if defined key_degrad
+      zvolume(:,:,:) = zvolume(:,:,:) * facvol(:,:,:)
+#endif
+      zareatot       = glob_sum( zvolume(:,:,:) )                    ! total volume of ocean
+      !
       zdiag_tot = 0.e0
       DO jn = 1, jptra
-#  if defined key_degrad
-         zdiag_var = glob_sum( trn(:,:,:,jn) * e1e2t(:,:) * fse3t(:,:,:) * tmask(:,:,:) * facvol(:,:,:) )
-#  else
-         zdiag_var = glob_sum( trn(:,:,:,jn) * e1e2t(:,:) * fse3t(:,:,:) * tmask(:,:,:)   )
-#  endif
+         zdiag_var    = glob_sum( trn(:,:,:,jn) * zvolume(:,:,:)   )
          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.)) )
@@ -310 +316 @@
          END IF
          zdiag_tot = zdiag_tot + zdiag_var
-         zdiag_var = zdiag_var / areatot
+         zdiag_var = zdiag_var / zareatot
          IF(lwp) WRITE(numout,*) '   MEAN NO ', jn, ctrcnm(jn), ' = ', zdiag_var,   &
             &                    ' MIN = ', zdiag_varmin, ' MAX = ', zdiag_varmax