Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_bilap.F90

@@ -23 +23 @@
    USE trdmod_oce      ! ocean variables trends
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
+   USE wrk_nemo        ! Memory Allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -74 +76 @@
       !!               mixing trend.
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zcu => wrk_2d_1 , zcv => wrk_2d_2   ! 3D workspace
-      USE wrk_nemo, ONLY:   zuf => wrk_3d_3 , zut => wrk_3d_4   ! 3D workspace
-      USE wrk_nemo, ONLY:   zlu => wrk_3d_5 , zlv => wrk_3d_6
       !
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
@@ -83 +81 @@
       INTEGER  ::   ji, jj, jk                  ! dummy loop indices
       REAL(wp) ::   zua, zva, zbt, ze2u, ze2v   ! temporary scalar
+      REAL(wp), POINTER, DIMENSION(:,:  ) :: zcu, zcv
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: zuf, zut, zlu, zlv
       !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(2, 1,2) .OR. wrk_in_use(3, 3,4,5,6) ) THEN
-         CALL ctl_stop('dyn_ldf_bilap : requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('dyn_ldf_bilap')
+      !
+      CALL wrk_alloc( jpi, jpj,      zcu, zcv           )
+      CALL wrk_alloc( jpi, jpj, jpk, zuf, zut, zlu, zlv ) 
+      !
       IF( kt == nit000 .AND. lwp ) THEN
          WRITE(numout,*)
@@ -207 +208 @@
       END DO                                           !   End of slab
       !                                                ! ===============
-      IF( wrk_not_released(2, 1,2)     .OR.   &
-          wrk_not_released(3, 3,4,5,6) )   CALL ctl_stop('dyn_ldf_bilap: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi, jpj,      zcu, zcv           )
+      CALL wrk_dealloc( jpi, jpj, jpk, zuf, zut, zlu, zlv ) 
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('dyn_ldf_bilap')
       !
    END SUBROUTINE dyn_ldf_bilap