Changeset 2690 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

2011-03-15T16:27:46+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; homogeneization of the coding style associated with dyn allocation

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -48 +48 @@
       !!----------------------------------------------------------------------
       !
-      ALLOCATE( mut (jpi,jpj,jpk) , muu (jpi,jpj,jpk) , muv (jpi,jpj,jpk) , muf (jpi,jpj,jpk) ,    &
-         &      ee_t(jpi,jpj)     , ee_u(jpi,jpj)     , ee_v(jpi,jpj)     , ee_f(jpi,jpj)     ,    &
-         &      r2dt(jpk)                                                                     , STAT=dom_vvl_alloc)
+      ALLOCATE( mut (jpi,jpj,jpk) , muu (jpi,jpj,jpk) , muv (jpi,jpj,jpk) , muf (jpi,jpj,jpk) ,     &
+         &      ee_t(jpi,jpj)     , ee_u(jpi,jpj)     , ee_v(jpi,jpj)     , ee_f(jpi,jpj)     ,     &
+         &      r2dt        (jpk)                                                             , STAT=dom_vvl_alloc )
          !
       IF( lk_mpp             )   CALL mpp_sum ( dom_vvl_alloc )
@@ -66 +66 @@
       !!----------------------------------------------------------------------
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zs_t   => wrk_2d_1, zs_u_1 => wrk_2d_2
-      USE wrk_nemo, ONLY:   zs_v_1 => wrk_2d_3
-      !!
-      INTEGER  ::   ji, jj, jk
+      USE wrk_nemo, ONLY:   zs_t   => wrk_2d_1 , zs_u_1 => wrk_2d_2 , zs_v_1 => wrk_2d_3     ! 2D workspace
+      !
+      INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   zcoefu , zcoefv   , zcoeff                   ! local scalars
       REAL(wp) ::   zv_t_ij, zv_t_ip1j, zv_t_ijp1, zv_t_ip1jp1   !   -      -
       !!----------------------------------------------------------------------
 
-      IF(wrk_in_use(2, 1,2,3))THEN
-         CALL ctl_stop('dom_vvl: ERROR - requested workspace arrays unavailable.')   ;   RETURN
-      END IF
+      IF( wrk_in_use(2, 1,2,3) ) THEN
+         CALL ctl_stop('dom_vvl: requested workspace arrays unavailable')   ;   RETURN
+      ENDIF
 
       IF(lwp) THEN
@@ -190 +189 @@
       fse3v_b(:,:,:) = fse3v_b(:,:,:) + fse3v_0(:,:,:)
       !
-      IF(wrk_not_released(2, 1,2,3))THEN
-         CALL ctl_stop('dom_vvl: ERROR - failed to release workspace arrays.')
-      END IF
+      IF( wrk_not_released(2, 1,2,3) )   CALL ctl_stop('dom_vvl: failed to release workspace arrays')
       !
    END SUBROUTINE dom_vvl