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

trunk/NEMOGCM/NEMO/OFF_SRC/dommsk.F90

@@ -14 +14 @@
    USE lib_mpp         ! MPP library
    USE in_out_manager  ! I/O manager
+   USE wrk_nemo  
 
    IMPLICIT NONE
@@ -20 +21 @@
    PUBLIC   dom_msk    ! routine called by inidom.F90
 
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   facvol   !: volume for degraded regions
+   REAL(wp)        :: rn_shlat   = 2.   ! type of lateral boundary condition on velocity
+   LOGICAL, PUBLIC :: ln_vorlat  = .false.   !  consistency of vorticity boundary condition 
 
    !! * Substitutions
@@ -45 +47 @@
       !!               tpol     : ???
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   iwrk_in_use, iwrk_not_released
-      USE wrk_nemo, ONLY:   imsk => iwrk_2d_1
       !
       INTEGER  ::   ji, jk                   ! dummy loop indices
       INTEGER  ::   iif, iil, ijf, ijl       ! local integers
+      INTEGER, POINTER, DIMENSION(:,:) ::  imsk 
+      !
       !!---------------------------------------------------------------------
+      
+      CALL wrk_alloc( jpi, jpj, imsk )
       !
-      IF( iwrk_in_use(2, 1) ) THEN
-         CALL ctl_stop('dom_msk: requested workspace arrays unavailable')   ;   RETURN
-      END IF
-      !
-#if defined key_degrad
-      IF( dom_msk_alloc() /= 0 )   CALL ctl_stop('STOP','dom_msk: unable to allocate arrays')
-#endif
-
       ! Interior domain mask (used for global sum)
       ! --------------------
@@ -101 +97 @@
       ENDIF
       !
-      IF( iwrk_not_released(2, 1) )   CALL ctl_stop('dom_msk: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi, jpj, imsk )
       !
    END SUBROUTINE dom_msk
-
-
-   INTEGER FUNCTION dom_msk_alloc()
-      !!---------------------------------------------------------------------
-      !!                 ***  FUNCTION dom_msk_alloc  ***
-      !!---------------------------------------------------------------------
-      ALLOCATE( facvol(jpi,jpj,jpk) , STAT=dom_msk_alloc )
-      IF( dom_msk_alloc /= 0 )   CALL ctl_warn('dom_msk_alloc : failed to allocate facvol array')
-      !
-   END FUNCTION dom_msk_alloc
-
    !!======================================================================
 END MODULE dommsk