Changeset 2636 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SOL/solpcg.F90

Timestamp:

2011-03-01T20:04:06+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; move ctl_stop & warn in lib_mpp to avoid a circular dependency + ctl_stop improvment

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SOL/solpcg.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SOL/solpcg.F90

@@ -26 +26 @@
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
@@ -83 +83 @@
       !!        !  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-
-      !                                      ! gence is not reached: the model is
-      !                                      ! stopped in step
-      !                                      ! set to zero before the call of solpcg
-      !!
-      INTEGER ::   ji, jj, jn                ! dummy loop indices
-      REAL(wp) ::  zgcad                     ! temporary scalars
-      REAL(wp), DIMENSION(2) :: zsum
+      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-
+      !                                    ! gence is not reached: the model is stopped in step
+      !                                    ! set to zero before the call of solpcg
+      !!
+      INTEGER  ::   ji, jj, jn   ! dummy loop indices
+      REAL(wp) ::   zgcad        ! temporary scalars
+      REAL(wp), DIMENSION(2) ::   zsum
       !!----------------------------------------------------------------------
       
       IF( wrk_in_use(2, 1) )THEN
-         CALL ctl_stop('sol_pcg: requested workspace array is unavailable')
-         RETURN
-      END IF
+         CALL ctl_stop('sol_pcg: requested workspace array is unavailable')   ;   RETURN
+      ENDIF
 
       ! Initialization of the algorithm with standard PCG
       ! -------------------------------------------------
-      zgcr = 0.e0 
-      gcr  = 0.e0 
+      zgcr = 0._wp
+      gcr  = 0._wp
 
       CALL lbc_lnk( gcx, c_solver_pt, 1. )   ! lateral boundary condition
@@ -207 +205 @@
       END DO                                           !    End Loop
       !                                                !================
-     
 999   CONTINUE
-     
-     
-      ! Output in gcx with lateral b.c. applied
-      ! ---------------------------------------
-     
-      CALL lbc_lnk( gcx, c_solver_pt, 1. )
-     
+          
+      CALL lbc_lnk( gcx, c_solver_pt, 1. )      ! Output in gcx with lateral b.c. applied
       ! 
-      IF( wrk_not_released(2, 1) )THEN
-         CALL ctl_stop('sol_pcg: failed to release workspace array')
-      END IF
+      IF( wrk_not_released(2, 1) )   CALL ctl_stop('sol_pcg: failed to release workspace array')
       !
    END SUBROUTINE sol_pcg