Changeset 3148 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

Timestamp:

2011-11-17T17:28:07+01:00 (12 years ago)

Author:

smasson

Message:

dev_NEMO_MERGE_2011: new dynamical allocation in LIM3

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) (3 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

@@ -25 +25 @@
    USE lbclnk           ! lateral boundary condition - MPP exchanges
    USE lib_mpp          ! MPP library
+   USE wrk_nemo_2       ! work arrays
 
    IMPLICIT NONE
@@ -62 +63 @@
       !!                or from arbitrary sea-ice conditions
       !!-------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   wrk_1d_1, wrk_1d_2, wrk_1d_3, wrk_1d_4
-      USE wrk_nemo, ONLY:   zidto => wrk_2d_1   ! ice indicator
-      !
       INTEGER  ::   ji, jj, jk, jl             ! dummy loop indices
       REAL(wp) ::   zeps6, zeps, ztmelts, epsi06   ! local scalars
       REAL(wp) ::   zvol, zare, zh, zh1, zh2, zh3, zan, zbn, zas, zbs 
-      REAL(wp), POINTER, DIMENSION(:) ::   zgfactorn, zhin 
-      REAL(wp), POINTER, DIMENSION(:) ::   zgfactors, zhis
-      !--------------------------------------------------------------------
-
-      IF(  wrk_in_use(2, 1) .OR.  wrk_in_use(1, 1,2,3,4)  ) THEN
-         CALL ctl_stop( 'lim_istate: requested workspace arrays unavailable' )   ;   RETURN
-      ENDIF
-      zgfactorn => wrk_1d_1(1:jpm)   ;   zhin => wrk_1d_3(1:jpm)   ! Set-up pointers to sub-arrays of workspaces
-      zgfactors => wrk_1d_2(1:jpm)   ;   zhis => wrk_1d_4(1:jpm)
+      REAL(wp), POINTER, DIMENSION(:)   ::   zgfactorn, zhin 
+      REAL(wp), POINTER, DIMENSION(:)   ::   zgfactors, zhis
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zidto      ! ice indicator
+      !--------------------------------------------------------------------
+
+      CALL wrk_alloc( jpm, zgfactorn, zgfactors, zhin, zhis )
+      CALL wrk_alloc( jpi, jpj, zidto )
 
       !--------------------------------------------------------------------
@@ -517 +512 @@
       CALL lbc_lnk( fsbbq  , 'T', 1. )
       !
-      IF( wrk_not_released(2, 1) .OR. wrk_not_released(1, 1,2,3,4) )   &
-         &   CALL ctl_stop('lim_istate : failed to release workspace arrays')
+      CALL wrk_dealloc( jpm, zgfactorn, zgfactors, zhin, zhis )
+      CALL wrk_dealloc( jpi, jpj, zidto )
       !
    END SUBROUTINE lim_istate