Changeset 8638 for branches/UKMO/dev_r5518_GO6_package

Timestamp:

2017-10-19T10:20:59+02:00 (7 years ago)

Author:

frrh

Message:

Applied fix from Tim Graham's branh: branches/UKMO/dev_r5518_GO6_package_msfeiv_fix
at revision 8635.

Met Office GMED ticket 356 refers.

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -84 +84 @@
       REAL(wp), DIMENSION(jpi,jpj)     ::  z2d   ! 2D workspace
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::  z3d   ! 3D workspace
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::  zvn   ! 3D workspace
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::  zmask   ! 3D workspace
       REAL(wp), DIMENSION(jpi,jpj,jpk,jpts) ::  zts   ! 3D workspace
@@ -405 +406 @@
             ENDIF
             IF( iom_use("zomsfeivglo") ) THEN
-               z3d(1,:,:) = ptr_sjk( v_eiv(:,:,:) )  ! zonal cumulative effective transport
+               DO jk=1,jpk
+                  DO jj=1,jpj
+                     DO ji=1,jpi
+                        zvn(ji,jj,jk) = v_eiv(ji,jj,jk) * fse3v(ji,jj,jk) * e1v(ji,jj)
+                     ENDDO
+                  ENDDO
+               ENDDO
+               z3d(1,:,:) = ptr_sjk( zvn(:,:,:) )  ! zonal cumulative effective transport
                DO jk = jpkm1,1,-1
                  z3d(1,:,jk) = z3d(1,:,jk+1) - z3d(1,:,jk)   ! effective j-Stream-Function (MSF)
@@ -416 +424 @@
                IF( ln_subbas ) THEN
                   DO jn = 2, nptr                                    ! by sub-basins
-                     z3d(1,:,:) =  ptr_sjk( v_eiv(:,:,:), btmsk(:,:,jn) ) 
+                     z3d(1,:,:) =  ptr_sjk( zvn(:,:,:), btmsk(:,:,jn) ) 
                      DO jk = jpkm1,1,-1
                         z3d(1,:,jk) = z3d(1,:,jk+1) - z3d(1,:,jk)    ! effective j-Stream-Function (MSF)