Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/SOL

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/SOL

Files:

• solmat.F90 (modified) (3 diffs)
• solpcg.F90 (modified) (4 diffs)
• solsor.F90 (modified) (4 diffs)
• solver.F90 (modified) (3 diffs)

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

@@ -31 +31 @@
    USE lib_mpp         ! distributed memory computing
    USE in_out_manager  ! I/O manager
+   USE timing          ! timing
 
    IMPLICIT NONE
@@ -64 +65 @@
       REAL(wp) ::   z2dt, zcoef
       !!----------------------------------------------------------------------
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('sol_mat')
+      !
       
       ! 1. Construction of the matrix
@@ -297 +300 @@
       gccd (:,:) = 0.e0
       ! 
+      IF( nn_timing == 1 )  CALL timing_stop('sol_mat')
+      !
    END SUBROUTINE sol_mat
 

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

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

@@ -22 +22 @@
    USE lib_mpp         ! distributed memory computing
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-   USE lib_fortran
+   USE lib_fortran     ! Fortran routines library
+   USE wrk_nemo        ! Memory allocation
+   USE timing          ! Timing
 
    IMPLICIT NONE
@@ -57 +59 @@
       !!                Beare and Stevens 1997 Ann. Geophysicae 15, 1369-1377
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   ztab => wrk_2d_1    ! 2D workspace
       !!
       INTEGER, INTENT(inout) ::   kindic   ! solver indicator, < 0 if the convergence is not reached:
@@ -66 +66 @@
       INTEGER  ::   ishift, icount, ijmppodd, ijmppeven, ijpr2d   ! local integers
       REAL(wp) ::   ztmp, zres, zres2                             ! local scalars
+      REAL(wp), POINTER, DIMENSION(:,:) ::   ztab                 ! 2D workspace
       !!----------------------------------------------------------------------
-      
-      IF( wrk_in_use(2, 1) )THEN
-         CALL ctl_stop('sol_sor: requested workspace array is unavailable')   ;   RETURN
-      ENDIF
-
+      !
+      IF( nn_timing == 1 )  CALL timing_start('sol_sor')
+      !
+      CALL wrk_alloc( jpi, jpj, ztab )
+      !
       ijmppeven = MOD( nimpp+njmpp+jpr2di+jpr2dj   , 2 )
       ijmppodd  = MOD( nimpp+njmpp+jpr2di+jpr2dj+1 , 2 )
@@ -167 +168 @@
       !  -------------
       CALL lbc_lnk_e( gcx, c_solver_pt, 1. )    ! boundary conditions
-      ! 
-      IF( wrk_not_released(2, 1) )   CALL ctl_stop('sol_sor: failed to release workspace array')
+      !
+      CALL wrk_dealloc( jpi, jpj, ztab )
+      !
+      IF( nn_timing == 1 )  CALL timing_stop('sol_sor')
       !
    END SUBROUTINE sol_sor

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

@@ -23 +23 @@
    USE dynspg_oce      ! choice/control of key cpp for surface pressure gradient
    USE solmat          ! matrix of the solver
-   USE obc_oce         ! Lateral open boundary condition
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp         ! MPP library
+   USE timing          ! timing
 
    IMPLICIT NONE
@@ -54 +54 @@
       NAMELIST/namsol/ nn_solv, nn_sol_arp, nn_nmin, nn_nmax, nn_nmod, rn_eps, rn_resmax, rn_sor
       !!----------------------------------------------------------------------
+      !
+      IF( nn_timing == 1 )  CALL timing_start('solver_init')
+      !
 
       IF(lwp) THEN                  !* open elliptic solver statistics file (only on the printing processors)
@@ -111 +114 @@
       CALL sol_mat( kt )            !* Construction of the elliptic system matrix
       !
+      IF( nn_timing == 1 )  CALL timing_stop('solver_init')
+      !
    END SUBROUTINE solver_init
 #endif