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

trunk/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

@@ -51 +51 @@
    USE thd_ice          ! LIM thermodynamics
    USE in_out_manager   ! I/O manager
-   USE lib_mpp         ! MPP library
+   USE lib_mpp          ! MPP library
+   USE wrk_nemo         ! work arrays
 
    IMPLICIT NONE
@@ -297 +298 @@
       !! ** References : Vancoppenolle et al., 2007 (in preparation)
       !!------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   wrk_3d_3, wrk_3d_4 
       INTEGER  ::   ji, jj, jk, jl   ! dummy loop index
       REAL(wp) ::   dummy_fac0, dummy_fac1, dummy_fac, zsal      ! local scalar
       REAL(wp) ::   zind0, zind01, zindbal, zargtemp , zs_zero   !   -      -
-      !
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   z_slope_s, zalpha   ! 3D pointer
       !!------------------------------------------------------------------
 
-      IF( wrk_in_use( 3, 3,4 ) ) THEN
-         CALL ctl_stop( 'lim_var_salprof: requested workspace arrays unavailable' )   ;   RETURN
-      END IF
-
-      z_slope_s => wrk_3d_3(:,:,1:jpl)   ! slope of the salinity profile
-      zalpha    => wrk_3d_4(:,:,1:jpl)   ! weight factor for s between s_i_0 and s_i_1
+      CALL wrk_alloc( jpi, jpj, jpl, z_slope_s, zalpha )
 
       !---------------------------------------
@@ -390 +383 @@
       ENDIF ! num_sal
       !
-      IF( wrk_not_released(3, 3,4) )   CALL ctl_stop('lim_var_salprof: failed to release workspace arrays.')
+      CALL wrk_dealloc( jpi, jpj, jpl, z_slope_s, zalpha )
       !
    END SUBROUTINE lim_var_salprof
@@ -433 +426 @@
       !!                Works with 1d vectors and is used by thermodynamic modules
       !!-------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   wrk_1d_4
       INTEGER, INTENT(in) ::   kideb, kiut   ! thickness category index
       !
@@ -445 +436 @@
       !!---------------------------------------------------------------------
 
-      IF(  wrk_in_use(1, 4)  ) THEN
-         CALL ctl_stop('lim_var_salprof1d : requestead workspace arrays unavailable.')   ;   RETURN
-      END IF
-      ! Set-up pointers to sub-arrays of workspace arrays
-      z_slope_s  =>  wrk_1d_4 (1:jpij)
+      CALL wrk_alloc( jpij, z_slope_s )
 
       !---------------------------------------
@@ -514 +501 @@
       ENDIF
       !
-      IF( wrk_not_released(1, 4) )   CALL ctl_stop( 'lim_var_salprof1d : failed to release workspace arrays' )
+      CALL wrk_dealloc( jpij, z_slope_s )
       !
    END SUBROUTINE lim_var_salprof1d