Changeset 10032


Ignore:
Timestamp:
2018-08-03T15:27:24+02:00 (2 years ago)
Author:
davestorkey
Message:

UKMO NEMO4_beta_mirror branch : merging in changes up to revision 10031 of the trunk.

Location:
NEMO/branches/UKMO/NEMO4_beta_mirror/src/OCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO4_beta_mirror/src/OCE/IOM/iom.F90

    r10011 r10032  
    696696      ! do we read the overlap  
    697697      ! ugly patch SM+JMM+RB to overwrite global definition in some cases 
    698       !llnoov = (jpni * jpnj ) == jpnij .AND. .NOT. lk_agrif 
    699       !llnoov = .true. 
    700       llnoov = .NOT. lk_agrif 
     698      llnoov = (jpni * jpnj ) == jpnij .AND. .NOT. lk_agrif 
    701699      ! create the file name by added, if needed, TRIM(Agrif_CFixed()) and TRIM(clsuffix) 
    702700      ! ============= 
  • NEMO/branches/UKMO/NEMO4_beta_mirror/src/OCE/TRA/traadv_fct.F90

    r9950 r10032  
    311311            IF( l_hst )   CALL dia_ar5_hst( jn, 'adv', ztrdx(:,:,:), ztrdy(:,:,:) ) 
    312312            ! 
    313             DEALLOCATE( ztrdx, ztrdy, ztrdz ) 
    314313         ENDIF 
    315314         IF( l_ptr ) THEN              ! "Poleward" transports 
    316315            zptry(:,:,:) = zptry(:,:,:) + zwy(:,:,:)  ! <<< add anti-diffusive fluxes 
    317316            CALL dia_ptr_hst( jn, 'adv', zptry(:,:,:) ) 
    318             DEALLOCATE( zptry ) 
    319317         ENDIF 
    320318         ! 
    321319      END DO                     ! end of tracer loop 
     320      ! 
     321      IF( l_trd .OR. l_hst ) THEN  
     322         DEALLOCATE( ztrdx, ztrdy, ztrdz ) 
     323      ENDIF 
     324      IF( l_ptr ) THEN  
     325         DEALLOCATE( zptry ) 
     326      ENDIF 
    322327      ! 
    323328   END SUBROUTINE tra_adv_fct 
Note: See TracChangeset for help on using the changeset viewer.