Changeset 3294 for trunk/NEMOGCM/NEMO/OFF_SRC/domrea.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/OFF_SRC/domrea.F90 (modified) (7 diffs)

trunk/NEMOGCM/NEMO/OFF_SRC/domrea.F90

@@ -16 +16 @@
    USE dommsk          ! domain: masks
    USE lbclnk          ! lateral boundary condition - MPP exchanges
+   USE trc_oce         ! shared ocean/biogeochemical variables
    USE lib_mpp 
    USE in_out_manager
-   USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
+   USE wrk_nemo  
 
    IMPLICIT NONE
@@ -55 +56 @@
       !!----------------------------------------------------------------------
       USE iom
-      USE wrk_nemo, ONLY: zmbk => wrk_2d_1, zprt => wrk_2d_2, zprw => wrk_2d_3
       !!
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       INTEGER  ::   ik, inum0 , inum1 , inum2 , inum3 , inum4   ! local integers
       REAL(wp) ::   zrefdep         ! local real
+      REAL(wp), POINTER, DIMENSION(:,:) :: zmbk, zprt, zprw
       !!----------------------------------------------------------------------
 
@@ -66 +67 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~'
 
-      IF( wrk_in_use(2, 1,2,3)  ) THEN
-         CALL ctl_stop('dom_rea: ERROR: requested workspace arrays unavailable.') ; RETURN
-      END IF
+      CALL wrk_alloc( jpi, jpj, zmbk, zprt, zprw )
 
       zmbk(:,:) = 0._wp
@@ -330 +329 @@
       END SELECT
       !
-      IF( wrk_not_released(2, 1,2,3)  ) CALL ctl_stop('dom_rea:failed to release workspace arrays.')
+      CALL wrk_dealloc( jpi, jpj, zmbk, zprt, zprw )
       !
    END SUBROUTINE dom_rea
@@ -345 +344 @@
       !! ** Action  : - update mbathy: level bathymetry (in level index)
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: zmbk => wrk_2d_4
       !
       INTEGER ::   ji, jj   ! dummy loop indices
+      REAL(wp), POINTER, DIMENSION(:,:) :: zmbk
       !!----------------------------------------------------------------------
 
@@ -355 +354 @@
       IF(lwp) WRITE(numout,*) '    ~~~~~~~~~~~~~'
       !
-      IF( wrk_in_use(2, 4) ) THEN
-         CALL ctl_stop('dom_rea: ERROR: requested workspace arrays unavailable.')  ;  RETURN
-      END IF
+      CALL wrk_alloc( jpi, jpj, zmbk )
       !
       mbkt(:,:) = MAX( mbathy(:,:) , 1 )    ! bottom k-index of T-level (=1 over land)
@@ -371 +368 @@
       zmbk(:,:) = REAL( mbkv(:,:), wp )   ;   CALL lbc_lnk(zmbk,'V',1.)   ;   mbkv  (:,:) = MAX( INT( zmbk(:,:) ), 1 )
       !
-      IF( wrk_not_released(2, 4) ) CALL ctl_stop('dom_rea:failed to release workspace arrays.')
+      CALL wrk_dealloc( jpi, jpj, zmbk )
       !
    END SUBROUTINE zgr_bot_level