Changeset 2636 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.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/ZDF/zdfddm.F90 (modified) (4 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90

@@ -21 +21 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE prtctl          ! Print control
+   USE lib_mpp            ! MPP library
 
    IMPLICIT NONE
@@ -56 +57 @@
       IF( zdf_ddm_alloc /= 0 )   CALL ctl_warn('zdf_ddm_alloc: failed to allocate arrays')
    END FUNCTION zdf_ddm_alloc
+
 
    SUBROUTINE zdf_ddm( kt )
@@ -89 +91 @@
       !! References :   Merryfield et al., JPO, 29, 1124-1142, 1999.
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: zmsks  => wrk_2d_1,  &
-                          zmskf  => wrk_2d_2,  &
-                          zmskd1 => wrk_2d_3,  &
-                          zmskd2 => wrk_2d_4,  &
-                          zmskd3 => wrk_2d_5
-      IMPLICIT none
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY:   zmsks  => wrk_2d_1 , zmskf  => wrk_2d_2 , zmskd1 => wrk_2d_3   ! 2D workspace
+      USE wrk_nemo, ONLY:   zmskd2 => wrk_2d_4 , zmskd3 => wrk_2d_5                        !  -      -
+      !
       INTEGER, INTENT(in) ::   kt   ! ocean time-step indexocean time step
-      !!
+      !
       INTEGER  ::   ji, jj , jk     ! dummy loop indices
       REAL(wp) ::   zinr, zrr       ! temporary scalars
@@ -105 +104 @@
 
       IF( wrk_in_use(2, 1,2,3,4,5) ) THEN
-         CALL ctl_stop('zdf_ddm: Requested workspace arrays already in use.')   ;   RETURN
+         CALL ctl_stop('zdf_ddm: Requested workspace arrays already in use')   ;   RETURN
       END IF