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

trunk/NEMOGCM/NEMO/OPA_SRC/SOL/solpcg.F90

@@ -14 +14 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE in_out_manager  ! I/O manager
-   USE lib_fortran
+   USE lib_fortran     ! Fortran routines library
+   USE wrk_nemo        ! Memory allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -83 +85 @@
       !!        !  08-01  (R. Benshila) mpp optimization
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zgcr => wrk_2d_1
       !!
       INTEGER, INTENT(inout) ::   kindic   ! solver indicator, < 0 if the conver-
@@ -93 +93 @@
       REAL(wp) ::   zgcad        ! temporary scalars
       REAL(wp), DIMENSION(2) ::   zsum
+      REAL(wp), POINTER, DIMENSION(:,:) ::   zgcr
       !!----------------------------------------------------------------------
-      
-      IF( wrk_in_use(2, 1) )THEN
-         CALL ctl_stop('sol_pcg: requested workspace array is unavailable')   ;   RETURN
-      ENDIF
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('sol_pcg')
+      !
+      CALL wrk_alloc( jpi, jpj, zgcr )
+      !
       ! Initialization of the algorithm with standard PCG
       ! -------------------------------------------------
@@ -209 +210 @@
       CALL lbc_lnk( gcx, c_solver_pt, 1. )      ! Output in gcx with lateral b.c. applied
       ! 
-      IF( wrk_not_released(2, 1) )   CALL ctl_stop('sol_pcg: failed to release workspace array')
+      CALL wrk_dealloc( jpi, jpj, zgcr )
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('sol_pcg')
       !
    END SUBROUTINE sol_pcg