Changeset 3802

Timestamp:

2013-02-12T09:20:05+01:00 (11 years ago)

Author:

flavoni

Message:

change control of allocation of array ze3f in dyn_vor routine, see ticket: #1039

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (1 diff)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -595 +595 @@
          IF(lwp) WRITE(numout,*) 'dyn:vor_een : vorticity term: energy and enstrophy conserving scheme'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
-         IF( .NOT.lk_vvl .AND. .NOT.ALLOCATED(ze3f) ) THEN
+#if ! defined key_vvl
+         IF( .NOT.ALLOCATED(ze3f) ) THEN
             ALLOCATE( ze3f(jpi,jpj,jpk) , STAT=ierr )
             IF( lk_mpp    )   CALL mpp_sum ( ierr )
             IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'dyn:vor_een : unable to allocate arrays' )
          ENDIF
+#endif
       ENDIF