Changeset 2690 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.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/TRA/traadv_eiv.F90 (modified) (6 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_eiv.F90

@@ -25 +25 @@
    USE phycst          ! physical constants
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
-   USE diaar5, ONLY :   lk_diaar5
+   USE diaar5, ONLY:   lk_diaar5
 # endif  
 
@@ -41 +41 @@
    !! 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
 
@@ -64 +63 @@
       !! ** Action  : - add to p.n the eiv component
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: zu_eiv => wrk_2d_1, zv_eiv => wrk_2d_2, &
-                          zw_eiv => wrk_2d_3
-# if defined key_diaeiv 
-      USE wrk_nemo, ONLY: z2d => wrk_2d_4
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY:   zu_eiv => wrk_2d_1 , zv_eiv => wrk_2d_2 , zw_eiv => wrk_2d_3   ! 2D workspace
+# if defined key_diaeiv 
+      USE wrk_nemo, ONLY:   z2d => wrk_2d_4   ! 2D workspace
 #endif
       INTEGER                         , INTENT(in   ) ::   kt       ! ocean time-step index
@@ -85 +83 @@
 
 # if defined key_diaeiv 
-      IF(wrk_in_use(2, 1,2,3,4))THEN
-#else
-      IF(wrk_in_use(2, 1,2,3))THEN
-#endif
-         CALL ctl_stop('tra_adv_eiv: ERROR: requested workspace arrays are unavailable.')
-         RETURN
-      END IF
+      IF( wrk_in_use(2, 1,2,3,4) ) THEN
+# else
+      IF( wrk_in_use(2, 1,2,3)   ) THEN
+# endif
+         CALL ctl_stop('tra_adv_eiv: requested workspace arrays are unavailable')   ;   RETURN
+      ENDIF
 
       IF( kt == nit000 )  THEN
@@ -194 +191 @@
       ! 
 # if defined key_diaeiv 
-      IF(wrk_not_released(2, 1,2,3,4))THEN
-#else
-      IF(wrk_not_released(2, 1,2,3))THEN
-#endif
-         CALL ctl_stop('tra_adv_eiv: ERROR: failed to release workspace arrays.')
-      END IF
+      IF( wrk_not_released(2, 1,2,3,4) )   CALL ctl_stop('tra_adv_eiv: failed to release workspace arrays')
+# else
+      IF( wrk_not_released(2, 1,2,3)   )   CALL ctl_stop('tra_adv_eiv: failed to release workspace arrays')
+# endif
       !
     END SUBROUTINE tra_adv_eiv
@@ -212 +207 @@
       CHARACTER(len=3) ::   cdtype
       REAL, DIMENSION(:,:,:) ::   pun, pvn, pwn
-      WRITE(*,*) 'tra_adv_eiv: You should not have seen this print! error?', kt, cdtype
-      WRITE(*,*) 'tra_adv_eiv: You should not have seen this print! error?', pun(1,1,1), pvn(1,1,1), pwn(1,1,1)
+      WRITE(*,*) 'tra_adv_eiv: You should not have seen this print! error?', kt, cdtype, pun(1,1,1), pvn(1,1,1), pwn(1,1,1)
    END SUBROUTINE tra_adv_eiv
 #endif