Changeset 6060 for branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2015-12-16T10:25:22+01:00 (8 years ago)

Author:

timgraham

Message:

Merged dev_r5836_noc2_VVL_BY_DEFAULT into branch

File:

• branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (2 diffs)

branches/2015/dev_merge_2015/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -32 +32 @@
    PUBLIC   trc_init   ! called by opa
 
-    !! * Substitutions
-#  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/TOP 4.0 , NEMO Consortium (2011)
@@ -119 +117 @@
       !                                                              ! masked grid volume
       DO jk = 1, jpk
-         cvol(:,:,jk) = e1e2t(:,:) * fse3t(:,:,jk) * tmask(:,:,jk)
+         cvol(:,:,jk) = e1e2t(:,:) * e3t_n(:,:,jk) * tmask(:,:,jk)
       END DO
-      IF( lk_degrad ) cvol(:,:,:) = cvol(:,:,:) * facvol(:,:,:)      ! degrad option: reduction by facvol
+      IF( lk_degrad )   cvol(:,:,:) = cvol(:,:,:) * facvol(:,:,:)    ! degrad option: reduction by facvol
       !                                                              ! total volume of the ocean 
       areatot = glob_sum( cvol(:,:,:) )