Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.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/SBC/albedo.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90

@@ -19 +19 @@
    USE in_out_manager  ! I/O manager
    USE lib_mpp         ! MPP library
+   USE wrk_nemo        ! work arrays
 
    IMPLICIT NONE
@@ -65 +66 @@
       !! References :   Shine and Hendersson-Sellers 1985, JGR, 90(D1), 2243-2250.
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   wrk_3d_6 , wrk_3d_7    ! 3D workspace
-      !!
       REAL(wp), INTENT(in   ), DIMENSION(:,:,:) ::   pt_ice      !  ice surface temperature (Kelvin)
       REAL(wp), INTENT(in   ), DIMENSION(:,:,:) ::   ph_ice      !  sea-ice thickness
@@ -91 +89 @@
       ijpl = SIZE( pt_ice, 3 )                     ! number of ice categories
 
-      IF( wrk_in_use(3, 6,7) ) THEN
-         CALL ctl_stop('albedo_ice: requested workspace arrays are unavailable')   ;   RETURN
-      ENDIF
-      ! Associate pointers with sub-arrays of workspace arrays
-      zalbfz  =>   wrk_3d_6(:,:,1:ijpl)
-      zficeth =>   wrk_3d_7(:,:,1:ijpl)
+      CALL wrk_alloc( jpi,jpj,ijpl, zalbfz, zficeth )
 
       IF( albd_init == 0 )   CALL albedo_init      ! initialization 
@@ -173 +166 @@
       pa_ice_os(:,:,:) = pa_ice_cs(:,:,:) + rn_cloud       ! Oberhuber correction
       !
-      IF( wrk_not_released(3, 6,7) )   CALL ctl_stop('albedo_ice: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi,jpj,ijpl, zalbfz, zficeth )
       !
    END SUBROUTINE albedo_ice