Changeset 8333 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO

Timestamp:

2017-07-14T10:14:31+02:00 (7 years ago)

Author:

timgraham

Message:

GMED ticket #336 - fix for bug in Asselin filter trend when TOP is enabled

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (3 diffs)

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

@@ -334 +334 @@
       ENDIF
       !
-      IF( l_trdtra )   THEN
+      IF( ( l_trdtra .and. cdtype == 'TRA' ) .OR. ( l_trdtrc .and. cdtype == 'TRC' ) )   THEN
          CALL wrk_alloc( jpi, jpj, jpk, kjpt, ztrd_atf )
          ztrd_atf(:,:,:,:) = 0.0_wp
@@ -395 +395 @@
                      pta(ji,jj,jk,jn) = ze3t_d * ( ztc_n  + rbcp * ztc_d  )   ! ta <-- Brown & Campana average
                   ENDIF
-                  IF( l_trdtra ) THEN
+                  IF( ( l_trdtra .and. cdtype == 'TRA' ) .OR. ( l_trdtrc .and. cdtype == 'TRC' ) ) THEN
                      ztrd_atf(ji,jj,jk,jn) = (ztc_f - ztc_n) * zfact/ze3t_n
                   ENDIF
@@ -404 +404 @@
       END DO
       !
-      IF( l_trdtra ) THEN
-         CALL trd_tra( kt, 'TRA', jp_tem, jptra_atf, ztrd_atf(:,:,:,jp_tem) )
-         CALL trd_tra( kt, 'TRA', jp_sal, jptra_atf, ztrd_atf(:,:,:,jp_sal) )
+      IF( l_trdtra .and. cdtype == 'TRA' ) THEN 
+         CALL trd_tra( kt, cdtype, jp_tem, jptra_atf, ztrd_atf(:,:,:,jp_tem) )
+         CALL trd_tra( kt, cdtype, jp_sal, jptra_atf, ztrd_atf(:,:,:,jp_sal) )
+         CALL wrk_dealloc( jpi, jpj, jpk, kjpt, ztrd_atf )
+      ENDIF
+      IF( l_trdtrc .and. cdtype == 'TRC' ) THEN
+         DO jn = 1, kjpt
+            CALL trd_tra( kt, cdtype, jn, jptra_atf, ztrd_atf(:,:,:,jn) )
+         END DO
          CALL wrk_dealloc( jpi, jpj, jpk, kjpt, ztrd_atf )
       ENDIF