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

trunk/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90

@@ -23 +23 @@
    USE lbclnk
    USE lib_mpp         ! MPP library
+   USE wrk_nemo        ! work arrays
    USE par_ice
 
@@ -48 +49 @@
    REAL(wp)  ::   epsi16 = 1e-16_wp
    REAL(wp)  ::   zzero  = 0._wp
-   REAL(wp)  ::   zone   = 1._wp
-
-   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   zcmo, zcmoa   ! additional fields
-      
+   REAL(wp)  ::   zone   = 1._wp      
    !!----------------------------------------------------------------------
    !! NEMO/LIM3 4.0 , UCL - NEMO Consortium (2011)
@@ -73 +71 @@
       !!  modif : 03/06/98
       !!-------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_not_released, wrk_in_use
-      USE wrk_nemo, ONLY:   zfield => wrk_2d_1             ! 2D workspace
-      USE wrk_nemo, ONLY:   wrk_3d_3, wrk_3d_4, wrk_3d_5   ! 3D workspace
-      !
       INTEGER, INTENT(in) ::   kindic   ! if kindic < 0 there has been an error somewhere
       !
@@ -83 +77 @@
       REAL(wp),DIMENSION(1) ::   zdept
       REAL(wp) ::  zsto, zjulian, zout, zindh, zinda, zindb
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zcmo, zcmoa
+      REAL(wp), POINTER, DIMENSION(:,:  ) ::   zfield
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   zmaskitd, zoi, zei
 
@@ -93 +89 @@
       !!-------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 3,4,5) ) THEN
-         CALL ctl_stop( 'lim_wri : requested workspace arrays unavailable' )   ;   RETURN
-      ENDIF
+      CALL wrk_alloc( jpi, jpj, zfield )
+      CALL wrk_alloc( jpi, jpj, jpnoumax, zcmo, zcmoa )
+      CALL wrk_alloc( jpi, jpj, jpl, zmaskitd, zoi, zei )
 
       ipl = jpl
 
-      zmaskitd => wrk_3d_3(:,:,1:jpl)
-      zoi      => wrk_3d_4(:,:,1:jpl)
-      zei      => wrk_3d_5(:,:,1:jpl)
-
-
       IF( numit == nstart ) THEN 
 
-         ALLOCATE( ndex51(jpij), ndexitd(jpij*jpl), zcmo(jpi,jpj,jpnoumax), zcmoa(jpi,jpj,jpnoumax), STAT=ierr )
+         ALLOCATE( ndex51(jpij), ndexitd(jpij*jpl), STAT=ierr )
          IF( lk_mpp    )   CALL mpp_sum ( ierr )
          IF( ierr /= 0 ) THEN
@@ -354 +345 @@
       ENDIF
 
-      IF( wrk_not_released(2, 1) .OR. wrk_not_released(3, 3,4,5) )   &
-         CALL ctl_stop( 'lim_wri: failed to release workspace arrays' )
+      CALL wrk_dealloc( jpi, jpj, zfield )
+      CALL wrk_dealloc( jpi, jpj, jpnoumax, zcmo, zcmoa )
+      CALL wrk_dealloc( jpi, jpj, jpl, zmaskitd, zoi, zei )
       
    END SUBROUTINE lim_wri