Changeset 2690 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.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/DYN/dynnxt.F90 (modified) (5 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -50 +50 @@
    !! * Substitutions
 #  include "domzgr_substitute.h90"
-   !!-------------------------------------------------------------------------
+   !!----------------------------------------------------------------------
    !! 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
 
@@ -92 +91 @@
       !!               un,vn   now horizontal velocity of next time-step
       !!----------------------------------------------------------------------
-      USE oce, ONLY :   ze3u_f => ta   ! use ta as 3D workspace
-      USE oce, ONLY :   ze3v_f => sa   ! use sa as 3D workspace
-      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, &
-                          zs_v_1 => wrk_2d_3
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE oce     , ONLY:   ze3u_f => ta       , ze3v_f => sa       ! (ta,sa) used as 3D workspace
+      USE wrk_nemo, ONLY:   zs_t   => wrk_2d_1 , zs_u_1 => wrk_2d_2 , zs_v_1 => wrk_2d_3
+      !
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
-      !!
+      !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
 #if ! defined key_dynspg_flt
       REAL(wp) ::   z2dt         ! temporary scalar
 #endif
-      REAL(wp) ::   zue3a , zue3n , zue3b    ! temporary scalar
-      REAL(wp) ::   zve3a , zve3n , zve3b    !    -         -
-      REAL(wp) ::   zuf   , zvf              !    -         - 
-      REAL(wp) ::   zec                      !    -         - 
-      REAL(wp) ::   zv_t_ij  , zv_t_ip1j     !     -        -
-      REAL(wp) ::   zv_t_ijp1                !     -        -
+      REAL(wp) ::   zue3a, zue3n, zue3b, zuf    ! local scalars
+      REAL(wp) ::   zve3a, zve3n, zve3b, zvf    !   -      -
+      REAL(wp) ::   zec, zv_t_ij, zv_t_ip1j, zv_t_ijp1
       !!----------------------------------------------------------------------
 
@@ -163 +158 @@
       CALL obc_dyn( kt )
       !
-      IF ( lk_dynspg_exp .OR. lk_dynspg_ts ) THEN
+      IF( .NOT. lk_dynspg_flt ) THEN
          ! Flather boundary condition : - Update sea surface height on each open boundary
-         !                                       sshn   (= after ssh   ) for explicit case
-         !                                       sshn_b (= after ssha_b) for time-splitting case
+         !                                       sshn   (= after ssh   ) for explicit case (lk_dynspg_exp=T)
+         !                                       sshn_b (= after ssha_b) for time-splitting case (lk_dynspg_ts=T)
          !                              - Correct the barotropic velocities
          CALL obc_dyn_bt( kt )
@@ -180 +175 @@
 # elif defined key_bdy 
       !                                !* BDY open boundaries
-      IF( lk_dynspg_exp .OR. lk_dynspg_ts ) THEN       ! except for filtered option
-         CALL bdy_dyn_frs( kt )
-      ENDIF
+      IF( .NOT. lk_dynspg_flt )   CALL bdy_dyn_frs( kt )
 # endif
       !
@@ -325 +318 @@
          &                       tab3d_2=vn, clinfo2=' Vn: '       , mask2=vmask )
       ! 
-      IF( wrk_not_released(2, 1,2,3) )   CALL ctl_stop('dyn_nxt: failed to release workspace arrays.')
+      IF( wrk_not_released(2, 1,2,3) )   CALL ctl_stop('dyn_nxt: failed to release workspace arrays')
       !
    END SUBROUTINE dyn_nxt