Changeset 7554


Ignore:
Timestamp:
2017-01-13T12:53:52+01:00 (4 years ago)
Author:
davestorkey
Message:

Bug fixes for tracer trends:

  1. Bug fix for zdfp trend - fix to use avt rather than avt_k ie. include the convection in this diagnostic.
  2. Bug fix for Asselin filter trend.
Location:
branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

    r7549 r7554  
    127127 
    128128      ! trends computation initialisation 
    129       IF( l_trdtra )   THEN                    ! store now fields before applying the Asselin filter 
     129      IF( l_trdtra )   THEN                     
    130130         CALL wrk_alloc( jpi, jpj, jpk, ztrdt, ztrds ) 
    131          ! Asselin filter trend 
    132          ztrdt(:,:,:) = tsn(:,:,:,jp_tem)  
    133          ztrds(:,:,:) = tsn(:,:,:,jp_sal) 
     131         ztrdt(:,:,jk) = 0._wp 
     132         ztrds(:,:,jk) = 0._wp 
    134133         IF( ln_traldf_iso ) THEN              ! diagnose the "pure" Kz diffusive trend  
    135134            CALL trd_tra( kt, 'TRA', jp_tem, jptra_zdfp, ztrdt ) 
     
    137136         ENDIF 
    138137         ! total trend for the non-time-filtered variables.  
    139          ztrdt(:,:,:) = 0._wp 
    140          ztrds(:,:,:) = 0._wp 
    141138         DO jk = 1, jpkm1 
    142139            zfact = 1.0 / rdttra(jk) 
     
    146143         CALL trd_tra( kt, 'TRA', jp_tem, jptra_tot, ztrdt ) 
    147144         CALL trd_tra( kt, 'TRA', jp_sal, jptra_tot, ztrds ) 
     145         ! Store now fields before applying the Asselin filter  
     146         ! in order to calculate Asselin filter trend later. 
     147         ztrdt(:,:,:) = tsn(:,:,:,jp_tem)  
     148         ztrds(:,:,:) = tsn(:,:,:,jp_sal) 
    148149      ENDIF 
    149150 
  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/TRD/trdtra.F90

    r7197 r7554  
    130130            zwt(:,:,jpk) = 0._wp   ;   zws(:,:,jpk) = 0._wp 
    131131            DO jk = 2, jpk 
    132                zwt(:,:,jk) = avt_k(:,:,jk) * ( tsa(:,:,jk-1,jp_tem) - tsa(:,:,jk,jp_tem) ) / fse3w(:,:,jk) * tmask(:,:,jk) 
     132               zwt(:,:,jk) = avt(:,:,jk) * ( tsa(:,:,jk-1,jp_tem) - tsa(:,:,jk,jp_tem) ) / fse3w(:,:,jk) * tmask(:,:,jk) 
    133133               zws(:,:,jk) = fsavs(:,:,jk) * ( tsa(:,:,jk-1,jp_sal) - tsa(:,:,jk,jp_sal) ) / fse3w(:,:,jk) * tmask(:,:,jk) 
    134134            END DO 
Note: See TracChangeset for help on using the changeset viewer.