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

trunk/NEMOGCM/NEMO/LIM_SRC_3/limthd_ent.F90

@@ -27 +27 @@
    USE limvar           ! LIM variables
    USE in_out_manager   ! I/O manager
-   USE wrk_nemo         ! workspace manager
    USE lib_mpp          ! MPP library
+   USE wrk_nemo         ! work arrays
 
    IMPLICIT NONE
    PRIVATE
 
-   PUBLIC   lim_thd_ent     ! called by lim_thd
+   PUBLIC   lim_thd_ent         ! called by lim_thd
 
    REAL(wp) ::   epsi20 = 1e-20_wp   ! constant values
@@ -48 +48 @@
    !!----------------------------------------------------------------------
 CONTAINS
-
+ 
    SUBROUTINE lim_thd_ent( kideb, kiut, jl )
       !!-------------------------------------------------------------------
@@ -97 +97 @@
          zdiscrim              !: dummy factor
 
-      INTEGER, DIMENSION(jpij) :: &
-         snswi          ,   &  !  snow switch
-         nbot0          ,   &  !  old layer bottom index
-         icsuind        ,   &  !  ice surface index
-         icsuswi        ,   &  !  ice surface switch
-         icboind        ,   &  !  ice bottom index
-         icboswi        ,   &  !  ice bottom switch
-         snicind        ,   &  !  snow ice index
-         snicswi        ,   &  !  snow ice switch
-         snind                 !  snow index
-      !
-      REAL(wp), DIMENSION(jpij,0:jkmax+3) ::   zm0       !  old layer-system vertical cotes
-      REAL(wp), DIMENSION(jpij,0:jkmax+3) ::   qm0       !  old layer-system heat content
-      REAL(wp), DIMENSION(jpij,0:jkmax+3) ::   z_s       !  new snow system vertical cotes
-      REAL(wp), DIMENSION(jpij,0:jkmax+3) ::   z_i       !  new ice system vertical cotes
-      REAL(wp), DIMENSION(jpij,0:jkmax+3) ::   zthick0   !  old ice thickness
-      REAL(wp), DIMENSION(jpij,0:jkmax+3) ::   zhl0      ! old and new layer thicknesses
-      !
-      REAL(wp), DIMENSION(0:jkmax+3,0:jkmax+3) ::   zrl01
-      !
-      REAL(wp), POINTER, DIMENSION(:) ::   zh_i, zqsnow , zqti_in, zqti_fin
-      REAL(wp), POINTER, DIMENSION(:) ::   zh_s, zdeltah, zqts_in, zqts_fin
+      INTEGER, POINTER, DIMENSION(:) ::   snswi     !  snow switch
+      INTEGER, POINTER, DIMENSION(:) ::   nbot0     !  old layer bottom index
+      INTEGER, POINTER, DIMENSION(:) ::   icsuind   !  ice surface index
+      INTEGER, POINTER, DIMENSION(:) ::   icsuswi   !  ice surface switch
+      INTEGER, POINTER, DIMENSION(:) ::   icboind   !  ice bottom index
+      INTEGER, POINTER, DIMENSION(:) ::   icboswi   !  ice bottom switch
+      INTEGER, POINTER, DIMENSION(:) ::   snicind   !  snow ice index
+      INTEGER, POINTER, DIMENSION(:) ::   snicswi   !  snow ice switch
+      INTEGER, POINTER, DIMENSION(:) ::   snind     !  snow index
+      !
+      REAL(wp), POINTER, DIMENSION(:) ::   zh_i   ! thickness of an ice layer
+      REAL(wp), POINTER, DIMENSION(:) ::   zh_s          ! thickness of a snow layer
+      REAL(wp), POINTER, DIMENSION(:) ::   zqsnow        ! enthalpy of the snow put in snow ice    
+      REAL(wp), POINTER, DIMENSION(:) ::   zdeltah       ! temporary variable
+      REAL(wp), POINTER, DIMENSION(:) ::   zqti_in, zqts_in
+      REAL(wp), POINTER, DIMENSION(:) ::   zqti_fin, zqts_fin
+
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zm0       !  old layer-system vertical cotes 
+      REAL(wp), POINTER, DIMENSION(:,:) ::   qm0       !  old layer-system heat content 
+      REAL(wp), POINTER, DIMENSION(:,:) ::   z_s       !  new snow system vertical cotes 
+      REAL(wp), POINTER, DIMENSION(:,:) ::   z_i       !  new ice system vertical cotes 
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zthick0   !  old ice thickness 
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zhl0      ! old and new layer thicknesses 
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zrl01
       !!-------------------------------------------------------------------
 
-      IF( wrk_in_use(1, 1,2,3,4,5,6,7,8) ) THEN
-         CALL ctl_stop('lim_thd_ent : requestead workspace arrays unavailable')   ;   RETURN
-      END IF
-
-      ! Set-up pointers to sub-arrays of workspace arrays
-      zh_i      =>  wrk_1d_1 (1:jpij)   ! thickness of an ice layer
-      zh_s      =>  wrk_1d_2 (1:jpij)   ! thickness of a snow layer
-      zqsnow    =>  wrk_1d_3 (1:jpij)   ! enthalpy of the snow put in snow ice
-      zdeltah   =>  wrk_1d_4 (1:jpij)   ! temporary variable
-      zqti_in   =>  wrk_1d_5 (1:jpij)   ! Energy conservation
-      zqts_in   =>  wrk_1d_6 (1:jpij)   !    -         -
-      zqti_fin  =>  wrk_1d_7 (1:jpij)   !    -         -
-      zqts_fin  =>  wrk_1d_8 (1:jpij)   !    -         -
+      CALL wrk_alloc( jpij, snswi, nbot0, icsuind, icsuswi, icboind, icboswi, snicind, snicswi, snind )   ! integer
+      CALL wrk_alloc( jpij, zh_i, zh_s, zqsnow, zdeltah, zqti_in, zqts_in, zqti_fin, zqts_fin )           ! real
+      CALL wrk_alloc( jpij,jkmax+4, zm0, qm0, z_s, z_i, zthick0, zhl0, kjstart = 0 )
+      CALL wrk_alloc( jkmax+4,jkmax+4, zrl01, kistart = 0, kjstart = 0 )
 
       zthick0(:,:) = 0._wp
@@ -687 +680 @@
       END DO !jk
       !
-      IF( wrk_not_released(1, 1,2,3,4,5,6,7,8) )   CALL ctl_stop( 'lim_thd_ent : failed to release workspace arrays' )
+      CALL wrk_dealloc( jpij, snswi, nbot0, icsuind, icsuswi, icboind, icboswi, snicind, snicswi, snind )   ! integer
+      CALL wrk_dealloc( jpij, zh_i, zh_s, zqsnow, zdeltah, zqti_in, zqts_in, zqti_fin, zqts_fin )           ! real
+      CALL wrk_dealloc( jpij,jkmax+4, zm0, qm0, z_s, z_i, zthick0, zhl0, kjstart = 0 )
+      CALL wrk_dealloc( jkmax+4,jkmax+4, zrl01, kistart = 0, kjstart = 0 )
       !
    END SUBROUTINE lim_thd_ent