Changeset 10035

Timestamp:

2018-08-03T15:51:37+02:00 (6 years ago)

Author:

davestorkey

Message:

UKMO dev_r9950_old_tidal_mixing branch : merge in changes to rev 10032 of NEMO4_beta_mirror branch (=rev 10031 of trunk).

Location:

NEMO/branches/UKMO/dev_r9950_old_tidal_mixing/src/OCE

Files:

• IOM/iom.F90 (modified) (1 diff)
• TRA/traadv_fct.F90 (modified) (1 diff)

NEMO/branches/UKMO/dev_r9950_old_tidal_mixing/src/OCE/IOM/iom.F90

@@ -696 +696 @@
       ! do we read the overlap 
       ! ugly patch SM+JMM+RB to overwrite global definition in some cases
-      !llnoov = (jpni * jpnj ) == jpnij .AND. .NOT. lk_agrif
-      !llnoov = .true.
-      llnoov = .NOT. lk_agrif
+      llnoov = (jpni * jpnj ) == jpnij .AND. .NOT. lk_agrif
       ! create the file name by added, if needed, TRIM(Agrif_CFixed()) and TRIM(clsuffix)
       ! =============

NEMO/branches/UKMO/dev_r9950_old_tidal_mixing/src/OCE/TRA/traadv_fct.F90

@@ -311 +311 @@
             IF( l_hst )   CALL dia_ar5_hst( jn, 'adv', ztrdx(:,:,:), ztrdy(:,:,:) )
             !
-            DEALLOCATE( ztrdx, ztrdy, ztrdz )
          ENDIF
          IF( l_ptr ) THEN              ! "Poleward" transports
             zptry(:,:,:) = zptry(:,:,:) + zwy(:,:,:)  ! <<< add anti-diffusive fluxes
             CALL dia_ptr_hst( jn, 'adv', zptry(:,:,:) )
-            DEALLOCATE( zptry )
          ENDIF
          !
       END DO                     ! end of tracer loop
+      !
+      IF( l_trd .OR. l_hst ) THEN 
+         DEALLOCATE( ztrdx, ztrdy, ztrdz )
+      ENDIF
+      IF( l_ptr ) THEN 
+         DEALLOCATE( zptry )
+      ENDIF
       !
    END SUBROUTINE tra_adv_fct