Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90 (modified) (7 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90

@@ -8 +8 @@
    !!   'key_floats'                                     float trajectories
    !!----------------------------------------------------------------------
-
-   !!----------------------------------------------------------------------
    !!    flotblk     : compute float trajectories with Blanke algorithme
    !!----------------------------------------------------------------------
-   !! * Modules used
    USE flo_oce         ! ocean drifting floats
    USE oce             ! ocean dynamics and tracers
@@ -23 +20 @@
    PRIVATE
 
-   !! * Accessibility
-   PUBLIC flo_blk      ! routine called by floats.F90
+   PUBLIC   flo_blk    ! routine called by floats.F90
 
    !! * Substitutions
 #  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
-   !!   OPA 9.0 , LOCEAN-IPSL (2005) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
-   !!----------------------------------------------------------------------
-
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
@@ -46 +41 @@
       !!      algorithm. We need to know the velocity field, the old positions
       !!      of the floats and the grid defined on the domain.
+      !!----------------------------------------------------------------------
+      INTEGER, INTENT( in  ) ::   kt ! ocean time step
       !!
-      !!----------------------------------------------------------------------
-      !! * arguments
-      INTEGER, INTENT( in  ) ::   kt ! ocean time step
-
-      !! * Local declarations
       INTEGER :: jfl              ! dummy loop arguments
       INTEGER :: ind, ifin, iloop
@@ -78 +70 @@
          zsurfz,                    &     ! surface of the face of the mesh 
          zind
-      REAL(wp), DIMENSION ( 2 )  ::   &
-         zsurfx, zsurfy                   ! surface of the face of the mesh
+      REAL(wp), DIMENSION ( 2 )  ::   zsurfx, zsurfy   ! surface of the face of the mesh
       !!---------------------------------------------------------------------
       
@@ -111 +102 @@
       iloop = 0
 222   DO jfl = 1, jpnfl
-# if   defined key_mpp_mpi   ||   defined key_mpp_shmem
+# if   defined key_mpp_mpi
          IF( (iil(jfl) >= (mig(nldi)-jpizoom+1)) .AND. (iil(jfl) <= (mig(nlei)-jpizoom+1)) .AND.   &
              (ijl(jfl) >= (mjg(nldj)-jpjzoom+1)) .AND. (ijl(jfl) <= (mjg(nlej)-jpjzoom+1)) ) THEN
@@ -327 +318 @@
             ! reinitialisation of the age of FLOAT
             zagefl(jfl) = zagenewfl(jfl)
-# if   defined key_mpp_mpi   ||   defined key_mpp_shmem
+# if   defined key_mpp_mpi
          ELSE
             ! we put zgifl, zgjfl, zgkfl, zagefl
@@ -413 +404 @@
          GO TO 222
       ENDIF
-
+      !
    END SUBROUTINE flo_blk