Changeset 7083 for branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

Timestamp:

2016-10-25T12:12:41+02:00 (8 years ago)

Author:

malcolmroberts

Message:

Merged in dev_r5518_GO6_package up to revision 7076

File:

• branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_MEDUSA_extra_CMIP6_diags/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -129 +129 @@
       IF( l_trdtra )   THEN                    ! store now fields before applying the Asselin filter
          CALL wrk_alloc( jpi, jpj, jpk, ztrdt, ztrds )
+         ! Asselin filter trend
          ztrdt(:,:,:) = tsn(:,:,:,jp_tem) 
          ztrds(:,:,:) = tsn(:,:,:,jp_sal)
@@ -135 +136 @@
             CALL trd_tra( kt, 'TRA', jp_sal, jptra_zdfp, ztrds )
          ENDIF
+         ! total trend (note slightly inaccurate because tsb is time-filtered and tsa isn't)
+         ztrdt(:,:,:) = 0._wp
+         ztrds(:,:,:) = 0._wp
+         DO jk = 1, jpkm1
+            ztrdt(:,:,jk) = ( tsa(:,:,jk,jp_tem) - tsb(:,:,jk,jp_tem) ) / r2dtra(jk) 
+            ztrds(:,:,jk) = ( tsa(:,:,jk,jp_sal) - tsb(:,:,jk,jp_sal) ) / r2dtra(jk) 
+         END DO
+         CALL trd_tra( kt, 'TRA', jp_tem, jptra_tot, ztrdt )
+         CALL trd_tra( kt, 'TRA', jp_sal, jptra_tot, ztrds )
       ENDIF