Changeset 3294 for trunk/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.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_2/limthd_2.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_2/limthd_2.F90

@@ -22 +22 @@
    USE in_out_manager  ! I/O manager
    USE lib_mpp
+   USE wrk_nemo        ! work arrays
    USE iom             ! IOM library
    USE ice_2           ! LIM sea-ice variables
@@ -75 +76 @@
       !! References :   Goosse et al. 1996, Bul. Soc. Roy. Sc. Liege, 65, 87-90
       !!---------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: ztmp    => wrk_2d_1, & ! 2D workspace
-                          zqlbsbq => wrk_2d_2, & ! link with lead energy budget qldif
-                          zlicegr => wrk_2d_3    ! link with lateral ice growth 
-      USE wrk_nemo, ONLY: zmsk => wrk_3d_4       ! 3D workspace
-      USE wrk_nemo, ONLY: zdvosif => wrk_2d_4, & !: Variation of volume at surface
-                          zdvobif => wrk_2d_5, & !: Variation of ice volume at the bottom ice     (outputs only)
-                          zdvolif => wrk_2d_6, & !: Total variation of ice volume                 (outputs only)
-                          zdvonif => wrk_2d_7, & !: Surface accretion Snow to Ice transformation  (outputs only)
-                          zdvomif => wrk_2d_8, & !: Bottom variation of ice volume due to melting (outputs only)
-                          zu_imasstr =>wrk_2d_9, & !: Sea-ice transport along i-axis at U-point     (outputs only) 
-                          zv_imasstr =>wrk_2d_10   !: Sea-ice transport along j-axis at V-point     (outputs only) 
-      !!
       INTEGER, INTENT(in) ::   kt     ! number of iteration
       !!
@@ -110 +98 @@
       REAL(wp) ::   zrhoij, zrhoijm1     ! temporary scalars
       REAL(wp) ::   zztmp                ! temporary scalars within a loop
-!!$      REAL(wp), DIMENSION(jpi,jpj) ::   firic         !: IR flux over the ice            (outputs only)
-!!$      REAL(wp), DIMENSION(jpi,jpj) ::   fcsic         !: Sensible heat flux over the ice (outputs only)
-!!$      REAL(wp), DIMENSION(jpi,jpj) ::   fleic         !: Latent heat flux over the ice   (outputs only)
-!!$      REAL(wp), DIMENSION(jpi,jpj) ::   qlatic        !: latent flux                     (outputs only)
+      REAL(wp), POINTER, DIMENSION(:,:)     ::   ztmp      ! 2D workspace
+      REAL(wp), POINTER, DIMENSION(:,:)     ::   zqlbsbq   ! link with lead energy budget qldif
+      REAL(wp), POINTER, DIMENSION(:,:)     ::   zlicegr   ! link with lateral ice growth 
+!!$      REAL(wp), DIMENSION(:,:) ::   firic         ! IR flux over the ice            (outputs only)
+!!$      REAL(wp), DIMENSION(:,:) ::   fcsic         ! Sensible heat flux over the ice (outputs only)
+!!$      REAL(wp), DIMENSION(:,:) ::   fleic         ! Latent heat flux over the ice   (outputs only)
+!!$      REAL(wp), DIMENSION(:,:) ::   qlatic        ! latent flux                     (outputs only)
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zdvosif       ! Variation of volume at surface                (outputs only)
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zdvobif       ! Variation of ice volume at the bottom ice     (outputs only)
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zdvolif       ! Total variation of ice volume                 (outputs only)
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zdvonif       ! Surface accretion Snow to Ice transformation  (outputs only)
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zdvomif       ! Bottom variation of ice volume due to melting (outputs only)
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zu_imasstr    ! Sea-ice transport along i-axis at U-point     (outputs only) 
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zv_imasstr    ! Sea-ice transport along j-axis at V-point     (outputs only) 
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zmsk        ! 3D workspace
       !!-------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 1,2,3,4,5,6,7,8,9,10)   .OR.  &
-          wrk_in_use(3, 4)                    ) THEN
-         CALL ctl_stop('lim_thd_2 : requested workspace arrays unavailable')   ;   RETURN
-      ENDIF
+      CALL wrk_alloc( jpi, jpj, ztmp, zqlbsbq, zlicegr, zdvosif, zdvobif, zdvolif, zdvonif, zdvomif, zu_imasstr, zv_imasstr )
+      CALL wrk_alloc( jpi, jpj, jpk, zmsk )
 
       IF( kt == nit000 )   CALL lim_thd_init_2  ! Initialization (first time-step only)
@@ -520 +517 @@
       ENDIF
        !
-      IF( wrk_not_released(2, 1,2,3,4,5,6,7,8,9,10)   .OR.  &
-          wrk_not_released(3, 4)                    ) THEN
-         CALL ctl_stop('lim_thd_2 : failed to release workspace arrays')
-      ENDIF
+      CALL wrk_dealloc( jpi, jpj, ztmp, zqlbsbq, zlicegr, zdvosif, zdvobif, zdvolif, zdvonif, zdvomif, zu_imasstr, zv_imasstr )
+      CALL wrk_dealloc( jpi, jpj, jpk, zmsk )
       !
     END SUBROUTINE lim_thd_2