Changeset 6903

Timestamp:

2016-09-01T10:28:08+02:00 (8 years ago)

Author:

timgraham

Message:

Bug fixes as pointed out by reviewer

File:

• branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (4 diffs)

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

@@ -9 +9 @@
    !!            3.3  ! 2010-10  (G. Madec)  dynamical allocation
    !!            3.6  ! 2014-12  (C. Ethe) use of IOM
+   !!            3.6  ! 2016-06  (T. Graham) Addition of diagnostics for CMIP6
    !!----------------------------------------------------------------------
 
@@ -131 +132 @@
                      zvfc = e1v(ji,jj) * fse3v(ji,jj,jk)
                      zmask(ji,jj,jk)      = vmask(ji,jj,jk)      * zvfc
-                     zts(ji,jj,jk,jp_tem) = (tsn(ji,jj,jk,jp_tem)+tsn(ji,jj,jk,jp_tem)) * 0.5 * zvfc  !Tracers averaged onto V grid
-                     zts(ji,jj,jk,jp_sal) = (tsn(ji,jj,jk,jp_sal)+tsn(ji,jj,jk,jp_sal)) * 0.5 * zvfc
+                     zts(ji,jj,jk,jp_tem) = (tsn(ji,jj,jk,jp_tem)+tsn(ji,jj+1,jk,jp_tem)) * 0.5 * zvfc  !Tracers averaged onto V grid
+                     zts(ji,jj,jk,jp_sal) = (tsn(ji,jj,jk,jp_sal)+tsn(ji,jj+1,jk,jp_sal)) * 0.5 * zvfc
                      zvn(ji,jj,jk)        = vn(ji,jj,jk)         * zvfc
                   ENDDO
@@ -197 +198 @@
              WHERE( sjk(:,1,1) /= 0._wp )   r1_sjk(:,1,1) = 1._wp / sjk(:,1,1)
             
-            htr_btr(:,1) = ptr_sj( zvn(:,:,:)) * ptr_sj( zts(:,:,:,jp_tem) ) * r1_sjk(:,1,1)
-            str_btr(:,1) = ptr_sj( zvn(:,:,:)) * ptr_sj( zts(:,:,:,jp_sal) ) * r1_sjk(:,1,1)
+            htr_btr(:,1) = ptr_sj( zvn(:,:,:), btmsk(:,:,1)) * ptr_sj( zts(:,:,:,jp_tem), btmsk(:,:,1) ) * r1_sjk(:,1,1)
+            str_btr(:,1) = ptr_sj( zvn(:,:,:), btmsk(:,:,1)) * ptr_sj( zts(:,:,:,jp_sal), btmsk(:,:,1) ) * r1_sjk(:,1,1)
             z2d(1,:) = htr_btr(:,1) * rc_pwatt        !  (conversion in PW)
             DO ji = 1, jpi
@@ -216 +217 @@
                     r1_sjk(:,1,jn) = 0._wp
                     WHERE( sjk(:,1,jn) /= 0._wp )   r1_sjk(:,1,jn) = 1._wp / sjk(:,1,jn)
-                    htr_btr(:,jn) = ptr_sj( zvn(:,:,:)) * ptr_sj( zts(:,:,:,jp_tem) ) * r1_sjk(:,1,jn)
-                    str_btr(:,jn) = ptr_sj( zvn(:,:,:)) * ptr_sj( zts(:,:,:,jp_sal) ) * r1_sjk(:,1,jn)
+                    htr_btr(:,jn) = ptr_sj( zvn(:,:,:), btmsk(:,:,jn) ) * ptr_sj( zts(:,:,:,jp_tem), btmsk(:,:,jn) )*r1_sjk(:,1,jn)
+                    str_btr(:,jn) = ptr_sj( zvn(:,:,:), btmsk(:,:,jn) ) * ptr_sj( zts(:,:,:,jp_sal), btmsk(:,:,jn) )*r1_sjk(:,1,jn)
                     z2d(1,:) = htr_btr(:,jn) * rc_pwatt !  (conversion in PW)
                     DO ji = 1, jpi