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

Timestamp:

2011-02-18T13:49:27+01:00 (13 years ago)

Author:

trackstand2

Message:

Merge branch 'dynamic_memory' into master-svn-dyn

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90 (modified) (15 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
@@ -50 +51 @@
    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
@@ -61 +69 @@
 
 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 )
@@ -205 +230 @@
       !! References : Sadourny, r., 1975, j. atmos. sciences, 32, 680-689.
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: zwx => wrk_2d_1, zwy => wrk_2d_2, zwz => wrk_2d_3
+      !!
       INTEGER , INTENT(in   )                         ::   kt     ! ocean time-step index
       INTEGER , INTENT(in   )                         ::   kvor   ! =ncor (planetary) ; =ntot (total) ;
@@ -214 +242 @@
       REAL(wp) ::   zx1, zy1, zfact2   ! temporary scalars
       REAL(wp) ::   zx2, zy2           !    "         "
-      REAL(wp), DIMENSION(jpi,jpj) ::   zwx, zwy, zwz   ! temporary 2D workspace
-      !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+
+      IF(.NOT. wrk_use(2, 1,2,3))THEN
+         CALL ctl_stop('dyn:vor_ene: requested workspace arrays unavailable.')
+         RETURN
+      END IF
 
       IF( kt == nit000 ) THEN
@@ -280 +312 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+      IF(.NOT. wrk_release(2, 1,2,3))THEN
+         CALL ctl_stop('dyn:vor_ene: failed to release workspace arrays.')
+      END IF
+      !
    END SUBROUTINE vor_ene
 
@@ -314 +350 @@
       !! References : Sadourny, r., 1975, j. atmos. sciences, 32, 680-689.
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: zwx => wrk_2d_4, zwy => wrk_2d_5, &
+                          zwz => wrk_2d_6, zww => wrk_2d_7
+      !!
       INTEGER, INTENT(in) ::   kt   ! ocean timestep index
       !!
@@ -319 +359 @@
       REAL(wp) ::   zfact1, zua, zcua, zx1, zy1   ! temporary scalars
       REAL(wp) ::   zfact2, zva, zcva, zx2, zy2   !    "         "
-      REAL(wp), DIMENSION(jpi,jpj) ::   zwx, zwy, zwz, zww   ! temporary 3D workspace
-      !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+
+      IF(.NOT. wrk_use(2, 4,5,6,7))THEN
+         CALL ctl_stop('dyn:vor_mix: requested workspace arrays unavailable.')
+         RETURN
+      END IF
 
       IF( kt == nit000 ) THEN
@@ -392 +436 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+      IF(.NOT. wrk_release(2, 4,5,6,7))THEN
+         CALL ctl_stop('dyn:vor_mix: failed to release workspace arrays.')
+      END IF
+      !
    END SUBROUTINE vor_mix
 
@@ -421 +469 @@
       !! References : Sadourny, r., 1975, j. atmos. sciences, 32, 680-689.
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY: wrk_use, wrk_release
+      USE wrk_nemo, ONLY: zwx => wrk_2d_4, zwy => wrk_2d_5, zwz => wrk_2d_6
+      !!
       INTEGER , INTENT(in   )                         ::   kt     ! ocean time-step index
       INTEGER , INTENT(in   )                         ::   kvor   ! =ncor (planetary) ; =ntot (total) ;
@@ -429 +480 @@
       INTEGER  ::   ji, jj, jk           ! dummy loop indices
       REAL(wp) ::   zfact1, zuav, zvau   ! temporary scalars
-      REAL(wp), DIMENSION(jpi,jpj) ::   zwx, zwy, zwz   ! temporary 3D workspace
       !!----------------------------------------------------------------------
       
+      IF(.NOT. wrk_use(2, 4,5,6))THEN
+         CALL ctl_stop('dyn:vor_ens : requested workspace arrays unavailable.')
+         RETURN
+      END IF
+
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)
@@ -503 +558 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+      IF(.NOT. wrk_release(2, 4,5,6))THEN
+         CALL ctl_stop('dyn:vor_ens : failed to release workspace arrays.')
+      END IF
+      !
    END SUBROUTINE vor_ens
 
@@ -525 +584 @@
       !! 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
+      !!
       INTEGER , INTENT(in   )                         ::   kt     ! ocean time-step index
       INTEGER , INTENT(in   )                         ::   kvor   ! =ncor (planetary) ; =ntot (total) ;
@@ -533 +597 @@
       INTEGER  ::   ji, jj, jk         ! dummy loop indices
       REAL(wp) ::   zfac12, zua, zva   ! temporary scalars
-      REAL(wp), DIMENSION(jpi,jpj) ::   zwx, zwy, zwz            ! temporary 2D workspace
-      REAL(wp), DIMENSION(jpi,jpj) ::   ztnw, ztne, ztsw, ztse   ! temporary 3D workspace
-#if defined key_vvl
-      REAL(wp), DIMENSION(jpi,jpj,jpk)       ::   ze3f
-#else
-      REAL(wp), DIMENSION(jpi,jpj,jpk), SAVE ::   ze3f
-#endif
-      !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+
+      IF(.NOT. wrk_use(2, 1,2,3,4,5,6,7))THEN
+         CALL ctl_stop('dyn:vor_een : requested workspace arrays unavailable.')
+         RETURN
+      END IF
 
       IF( kt == nit000 ) THEN
@@ -634 +696 @@
       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
+      !
    END SUBROUTINE vor_een