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

trunk/NEMOGCM/NEMO/LIM_SRC_2/limrhg_2.F90

@@ -27 +27 @@
    USE lbclnk         ! lateral boundary condition - MPP exchanges
    USE lib_mpp        ! MPP library
+   USE wrk_nemo       ! work arrays
    USE in_out_manager ! I/O manager
    USE prtctl         ! Print control
@@ -34 +35 @@
 
    PUBLIC   lim_rhg_2         ! routine called by lim_dyn
-   PUBLIC   lim_rhg_alloc_2   ! routine called by lim_dyn_alloc_2
 
    REAL(wp) ::   rzero   = 0._wp   ! constant value: zero
    REAL(wp) ::   rone    = 1._wp   !            and  one
-
-   ! 2D workspaces for lim_rhg_2. Can't use wrk_nemo module for them because
-   ! extent in 2nd dimension is > jpj.
-   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:) ::   zu0, zv0
-   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:) ::   zu_n, zv_n
-   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:) ::   zu_a, zv_a
-   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:) ::   zviszeta, zviseta
-   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:) ::   zzfrld, zztms
-   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:) ::   zi1, zi2, zmasst, zpresh
 
    !! * Substitutions
@@ -56 +47 @@
    !!----------------------------------------------------------------------
 CONTAINS
-
-   INTEGER FUNCTION lim_rhg_alloc_2()
-      !!-------------------------------------------------------------------
-      !!               ***  FUNCTION lim_rhg_alloc_2  ***
-      !!-------------------------------------------------------------------
-      ALLOCATE( zu0(jpi,0:jpj+1),      zv0(jpi,0:jpj+1),     &
-         &      zu_n(jpi,0:jpj+1),     zv_n(jpi,0:jpj+1),    &
-         &      zu_a(jpi,0:jpj+1),     zv_a(jpi,0:jpj+1),    &
-         &      zviszeta(jpi,0:jpj+1), zviseta(jpi,0:jpj+1), &
-         &      zzfrld(jpi,0:jpj+1),   zztms(jpi,0:jpj+1),   &
-         &      zi1(jpi,0:jpj+1),      zi2(jpi,0:jpj+1),     &
-         &      zmasst(jpi,0:jpj+1),   zpresh(jpi,0:jpj+1),  &
-         &      Stat=lim_rhg_alloc_2)
-         !
-      IF( lim_rhg_alloc_2 /= 0 )   CALL ctl_warn('lim_rhg_alloc_2 : failed to allocate arrays')
-      !
-   END FUNCTION lim_rhg_alloc_2
-
 
    SUBROUTINE lim_rhg_2( k_j1, k_jpj )
@@ -87 +60 @@
       !!              at I-point
       !!-------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: zfrld => wrk_2d_1, zmass => wrk_2d_2, zcorl => wrk_2d_3
-      USE wrk_nemo, ONLY: za1ct => wrk_2d_4, za2ct => wrk_2d_5, zresr => wrk_2d_6
-      USE wrk_nemo, ONLY: zc1u  => wrk_2d_7, zc1v  => wrk_2d_8, zc2u => wrk_2d_9
-      USE wrk_nemo, ONLY: zc2v  => wrk_2d_10, zsang => wrk_2d_11
-      !!
       INTEGER, INTENT(in) ::   k_j1    ! southern j-index for ice computation
       INTEGER, INTENT(in) ::   k_jpj   ! northern j-index for ice computation
@@ -113 +80 @@
       REAL(wp) ::   zs21_11, zs21_12, zs21_21, zs21_22
       REAL(wp) ::   zs22_11, zs22_12, zs22_21, zs22_22
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zfrld, zmass, zcorl
+      REAL(wp), POINTER, DIMENSION(:,:) ::   za1ct, za2ct, zresr
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zc1u, zc1v, zc2u, zc2v
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zsang
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zu0, zv0
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zu_n, zv_n
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zu_a, zv_a
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zviszeta, zviseta
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zzfrld, zztms
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zi1, zi2, zmasst, zpresh
       !!-------------------------------------------------------------------
       
+      CALL wrk_alloc( jpi,jpj, zfrld, zmass, zcorl, za1ct, za2ct, zresr )
+      CALL wrk_alloc( jpi,jpj, zc1u , zc1v , zc2u , zc2v , zsang )
+      CALL wrk_alloc( jpi,jpj+2, zu0, zv0, zu_n, zv_n, zu_a, zv_a, zviszeta, zviseta, kjstart = 0 )
+      CALL wrk_alloc( jpi,jpj+2, zzfrld, zztms, zi1, zi2, zmasst, zpresh, kjstart = 0 )
+
       !  Store initial velocities
       !  ----------------
@@ -592 +574 @@
       ENDIF
 
+      CALL wrk_dealloc( jpi,jpj, zfrld, zmass, zcorl, za1ct, za2ct, zresr )
+      CALL wrk_dealloc( jpi,jpj, zc1u , zc1v , zc2u , zc2v , zsang )
+      CALL wrk_dealloc( jpi,jpj+2, zu0, zv0, zu_n, zv_n, zu_a, zv_a, zviszeta, zviseta, kjstart = 0 )
+      CALL wrk_dealloc( jpi,jpj+2, zzfrld, zztms, zi1, zi2, zmasst, zpresh, kjstart = 0 )
+
    END SUBROUTINE lim_rhg_2