Changeset 2625 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90

Timestamp:

2011-02-27T17:36:24+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; OPA_SRC mpp compilation: suppression of the USE in_out_manager in lib_mpp + style in DYN

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_cen2.F90 (modified) (4 diffs)

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

@@ -29 +29 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
+   !! NEMO/OPA 4.0 , NEMO Consortium (2011)
    !! $Id$
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -47 +46 @@
       !! ** Action  :   (ua,va) updated with the now vorticity term trend
       !!----------------------------------------------------------------------
-      USE oce, ONLY:   zfu => ta   ! use ta as 3D workspace
-      USE oce, ONLY:   zfv => sa   ! use sa as 3D workspace
-      USE wrk_nemo, ONLY: zfu_t => wrk_3d_1, & ! 3D workspaces
-                          zfu_f => wrk_3d_2, &
-                          zfu_uw =>wrk_3d_3, &
-                          zfv_t => wrk_3d_4, & 
-                          zfv_f => wrk_3d_5, & 
-                          zfv_vw =>wrk_3d_6, &
-                          zfw   => wrk_3d_7, &
-                          wrk_use, wrk_release
-      IMPLICIT none
+      USE wrk_nemo, ONLY:   wrk_use, wrk_release
+      USE oce     , ONLY:   zfu   => ta       ! use ta as 3D workspace
+      USE oce     , ONLY:   zfv   => sa       ! use sa as 3D workspace
+      USE wrk_nemo, ONLY:   zfu_t => wrk_3d_1 , zfv_t => wrk_3d_4 , zfu_uw =>wrk_3d_6   ! 3D workspaces
+      USE wrk_nemo, ONLY:   zfu_f => wrk_3d_2 , zfv_f => wrk_3d_5 , zfv_vw =>wrk_3d_7
+      USE wrk_nemo, ONLY:   zfw   => wrk_3d_3 
       !!
       INTEGER, INTENT( in ) ::   kt   ! ocean time-step index
@@ -65 +59 @@
       !!----------------------------------------------------------------------
 
-      IF( kt == nit000 ) THEN
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'dyn_adv_cen2 : 2nd order flux form momentum advection'
-         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
+      IF( kt == nit000 .AND. lwp ) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'dyn_adv_cen2 : 2nd order flux form momentum advection'
+         WRITE(numout,*) '~~~~~~~~~~~~'
       ENDIF
 
       ! Check that global workspace arrays aren't already in use
-      IF( .not. wrk_use(3, 1, 2, 3, 4, 5, 6, 7) )THEN
-         IF(lwp) WRITE(numout, *) 'dyn_adv_cen2 : run-time error - global workspace arrays already in use.'
-         CALL ctl_stop('dyn_adv_cen2 : run-time error - global workspace arrays already in use.')
+      IF( .not. wrk_use(3, 1,2,3,4,5,6,7) ) THEN
+         CALL ctl_stop('dyn_adv_cen2 : requested workspace array unavailable')   ;   RETURN
       END IF
 
@@ -169 +162 @@
          &                       tab3d_2=va, clinfo2=           ' Va: ', mask2=vmask, clinfo3='dyn' )
       !
-      ! Flag that the global workspace arrays are no longer in use
-      IF( .not. wrk_release(3, 1, 2, 3, 4, 5, 6, 7) )THEN
-         IF(lwp) WRITE(numout, *) 'dyn_adv_cen2 : run-time error - failed to release global workspace arrays.'
-      END IF
+      IF( .not. wrk_release(3, 1,2,3,4,5,6,7) )   CALL ctl_stop('dyn_adv_cen2 : failed to release workspace array')
       !
    END SUBROUTINE dyn_adv_cen2