Changeset 2715 for trunk/NEMOGCM/NEMO/OPA_SRC/SOL/solsor.F90

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/SOL/solsor.F90 (modified) (3 diffs)

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

@@ -32 +32 @@
    !! 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
       
@@ -58 +57 @@
       !!                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:
       !                                    ! the model is stopped in step (set to zero before the call of solsor)
       !!
-      INTEGER  ::   ji, jj, jn               ! dummy loop indices
-      INTEGER  ::   ishift, icount
-      INTEGER  ::   ijmppodd, ijmppeven, ijpr2d
-      REAL(wp) ::   ztmp, zres, zres2
-      REAL(wp), DIMENSION(jpi,jpj) ::ztab
+      INTEGER  ::   ji, jj, jn       ! dummy loop indices
+      INTEGER  ::   ishift, icount, ijmppodd, ijmppeven, ijpr2d   ! local integers
+      REAL(wp) ::   ztmp, zres, zres2                             ! local scalars
       !!----------------------------------------------------------------------
       
+      IF( wrk_in_use(2, 1) )THEN
+         CALL ctl_stop('sol_sor: requested workspace array is unavailable')   ;   RETURN
+      ENDIF
+
       ijmppeven = MOD( nimpp+njmpp+jpr2di+jpr2dj   , 2 )
       ijmppodd  = MOD( nimpp+njmpp+jpr2di+jpr2dj+1 , 2 )
@@ -163 +167 @@
       !  -------------
       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')
       !
    END SUBROUTINE sol_sor