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

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

@@ -22 +22 @@
    USE in_out_manager  ! I/O manager
    USE lib_mpp         ! distribued memory computing library
+   USE wrk_nemo        ! work arrays
+   USE timing          ! Timing
    USE lbclnk          ! ocean lateral boundary conditions
    USE lib_fortran
@@ -58 +60 @@
       !!                   & spread out over erp area depending its sign
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   ztmsk_neg      => wrk_2d_1 , ztmsk_pos => wrk_2d_2
-      USE wrk_nemo, ONLY:   ztmsk_tospread => wrk_2d_3
-      USE wrk_nemo, ONLY:   z_wgt          => wrk_2d_4 , zerp_cor  => wrk_2d_5
-      !
       INTEGER, INTENT( in ) ::   kt       ! ocean time-step index
       INTEGER, INTENT( in ) ::   kn_fsbc  ! 
@@ -70 +67 @@
       REAL(wp) ::   z_fwf, z_fwf_nsrf, zsum_fwf, zsum_erp   ! local scalars
       REAL(wp) ::   zsurf_neg, zsurf_pos, zsurf_tospread    !   -      -
+      REAL(wp), POINTER, DIMENSION(:,:) ::   ztmsk_neg, ztmsk_pos, ztmsk_tospread, z_wgt, zerp_cor
       !!----------------------------------------------------------------------
       !
-      IF( wrk_in_use(2, 1,2,3,4,5) ) THEN
-         CALL ctl_stop('sbc_fwb: requested workspace arrays are unavailable')   ;   RETURN
-      ENDIF
+      IF( nn_timing == 1 )  CALL timing_start('sbc_fwb')
+      !
+      CALL wrk_alloc( jpi,jpj, ztmsk_neg, ztmsk_pos, ztmsk_tospread, z_wgt, zerp_cor )
       !
       IF( kt == nit000 ) THEN
@@ -195 +193 @@
       END SELECT
       !
-      IF( wrk_not_released(2, 1,2,3,4,5) )   CALL ctl_stop('sbc_fwb: failed to release workspace arrays')
+      CALL wrk_dealloc( jpi,jpj, ztmsk_neg, ztmsk_pos, ztmsk_tospread, z_wgt, zerp_cor )
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('sbc_fwb')
       !
    END SUBROUTINE sbc_fwb