Changeset 2618 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

Timestamp:

2011-02-26T13:31:38+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; move dyn allocation from nemogcm to module when possible (continuation)

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (7 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -39 +39 @@
    PUBLIC   dyn_vor        ! routine called by step.F90
    PUBLIC   dyn_vor_init   ! routine called by opa.F90
-   PUBLIC   dyn_vor_alloc  ! routine called by nemogcm.F90
 
    !                                             !!* Namelist namdyn_vor: vorticity term
@@ -51 +50 @@
    INTEGER ::   nrvm = 2   ! =2 relative vorticity ; =3 metric term
    INTEGER ::   ntot = 4   ! =4 total vorticity (relative + planetary) ; =5 coriolis + metric term
-
-!!$#if defined key_vvl
-!!$   REAL(wp), DIMENSION(jpi,jpj,jpk)       ::   ze3f 
-!!$#else
-!!$   REAL(wp), ALLOCATABLE, DIMENSION(jpi,jpj,jpk), SAVE ::   ze3f
-!!$#endif
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   ze3f
 
    !! * Substitutions
@@ -67 +59 @@
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
-
-   FUNCTION dyn_vor_alloc()
-      !!----------------------------------------------------------------------
-      !!              *** Routine dyn_vor_alloc ***
-      !!----------------------------------------------------------------------
-      IMPLICIT none
-      INTEGER :: dyn_vor_alloc
-      !!----------------------------------------------------------------------
-
-      ALLOCATE(ze3f(jpi,jpj,jpk), Stat=dyn_vor_alloc)
-
-      IF(dyn_vor_alloc /= 0 )THEN
-         CALL ctl_warn('dyn_vor_alloc: failed to allocate array ze3f.')
-      END IF
-
-   END FUNCTION dyn_vor_alloc
-
 
    SUBROUTINE dyn_vor( kt )
@@ -584 +558 @@
       !! References : Arakawa and Lamb 1980, Mon. Wea. Rev., 109, 18-36
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_use, wrk_release
-      USE wrk_nemo, ONLY: zwx => wrk_2d_1,  zwy => wrk_2d_2,  zwz => wrk_2d_3 
-      USE wrk_nemo, ONLY: ztnw => wrk_2d_4, ztne => wrk_2d_5, &
-                          ztsw => wrk_2d_6, ztse => wrk_2d_7
-      !!
+      USE wrk_nemo, ONLY:   wrk_use, wrk_release
+      USE wrk_nemo, ONLY:   zwx  => wrk_2d_1 , zwy  => wrk_2d_2 ,  zwz => wrk_2d_3 
+      USE wrk_nemo, ONLY:   ztnw => wrk_2d_4 , ztne => wrk_2d_5 
+      USE wrk_nemo, ONLY:   ztsw => wrk_2d_6 , ztse => wrk_2d_7
+#if defined key_vvl
+      USE wrk_nemo, ONLY:   ze3f => wrk_3d_1
+#endif
+      !
       INTEGER , INTENT(in   )                         ::   kt     ! ocean time-step index
       INTEGER , INTENT(in   )                         ::   kvor   ! =ncor (planetary) ; =ntot (total) ;
@@ -596 +573 @@
       !!
       INTEGER  ::   ji, jj, jk         ! dummy loop indices
-      REAL(wp) ::   zfac12, zua, zva   ! temporary scalars
-      !!----------------------------------------------------------------------
-
-      IF(.NOT. wrk_use(2, 1,2,3,4,5,6,7))THEN
-         CALL ctl_stop('dyn:vor_een : requested workspace arrays unavailable.')
-         RETURN
+      INTEGER  ::   ierr               ! local integer
+      REAL(wp) ::   zfac12, zua, zva   ! local scalars
+#if ! defined key_vvl
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:), SAVE ::   ze3f
+#endif
+      !!----------------------------------------------------------------------
+
+      IF(.NOT. wrk_use(2, 1,2,3,4,5,6,7) .AND. .NOT. wrk_use(3, 1) ) THEN
+         CALL ctl_stop('dyn:vor_een : requested workspace arrays unavailable.')   ;   RETURN
       END IF
 
@@ -608 +588 @@
          IF(lwp) WRITE(numout,*) 'dyn:vor_een : vorticity term: energy and enstrophy conserving scheme'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
+         IF( .NOT.lk_vvl ) 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
 
@@ -696 +681 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF(.NOT. wrk_release(2, 1,2,3,4,5,6,7))THEN
-         CALL ctl_stop('dyn:vor_een : failed to release workspace arrays.')
-      END IF
+      IF(.NOT. wrk_release(2, 1,2,3,4,5,6,7) .AND.   &
+         .NOT. wrk_release(3, 1)  )   CALL ctl_stop('dyn:vor_een : failed to release workspace arrays')
       !
    END SUBROUTINE vor_een