Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.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/flodom.F90 (modified) (12 diffs, 1 prop)

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

@@ -4 +4 @@
    !! Ocean floats :   domain
    !!======================================================================
+   !! History :  OPA  ! 1998-07 (Y.Drillet, CLIPPER)  Original code
+   !!----------------------------------------------------------------------
 #if   defined key_floats   ||   defined key_esopa
    !!----------------------------------------------------------------------
@@ -12 +14 @@
    !!   dstnce         : compute distance between face mesh and floats 
    !!----------------------------------------------------------------------
-   !! * Modules used
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
@@ -20 +21 @@
 
    IMPLICIT NONE
-
-   !! * Accessibility
-   PRIVATE  dstnce
-   PUBLIC flo_dom     ! routine called by floats.F90
+   PRIVATE
+
+   PUBLIC   flo_dom    ! 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
 
@@ -42 +41 @@
       !!
       !!  ** Method  :   We put the floats  in the domain with the latitude,
-      !!       the longitude (degree) and the depth (m).
-      !!
+      !!               the longitude (degree) and the depth (m).
       !!----------------------------------------------------------------------      
-      !! * Local declarations
-      LOGICAL  :: llinmesh
-      INTEGER  :: ji, jj, jk               ! DO loop index on 3 directions
-      INTEGER  :: jfl, jfl1                ! number of floats   
-      INTEGER  :: inum                     ! logical unit for file read
-      INTEGER, DIMENSION ( jpnfl    )  ::   &
-         iimfl, ijmfl, ikmfl,    &          ! index mesh of floats
-         idomfl,  ivtest, ihtest
-      REAL(wp) :: zdxab, zdyad
-      REAL(wp), DIMENSION ( jpnnewflo+1 )  :: zgifl, zgjfl,  zgkfl
+      LOGICAL  ::   llinmesh
+      INTEGER  ::   ji, jj, jk   ! DO loop index on 3 directions
+      INTEGER  ::   jfl, jfl1    ! number of floats   
+      INTEGER  ::   inum         ! logical unit for file read
+      INTEGER, DIMENSION(jpnfl) ::   iimfl, ijmfl, ikmfl       ! index mesh of floats
+      INTEGER, DIMENSION(jpnfl) ::   idomfl,  ivtest, ihtest   !   -             -
+      REAL(wp) ::   zdxab, zdyad
+      REAL(wp), DIMENSION(jpnnewflo+1)  :: zgifl, zgjfl,  zgkfl
       !!---------------------------------------------------------------------
       
@@ -102 +98 @@
                ivtest(jfl) = 0
                ikmfl(jfl) = 0
-# if   defined key_mpp_mpi   ||   defined key_mpp_shmem
+# if   defined key_mpp_mpi
                DO ji = MAX(nldi,2), nlei
                   DO jj = MAX(nldj,2), nlej   ! NO vector opt.
@@ -139 +135 @@
             
             ! A zero in the sum of the arrays "ihtest" and "ivtest"             
-# if   defined key_mpp_mpi   ||   defined key_mpp_shmem
+# if   defined key_mpp_mpi
             CALL mpp_sum(ihtest,jpnfl)
             CALL mpp_sum(ivtest,jpnfl)
@@ -233 +229 @@
             ivtest(jfl) = 0
             ikmfl(jfl) = 0
-# if   defined key_mpp_mpi   ||   defined key_mpp_shmem
+# if   defined key_mpp_mpi
             DO ji = MAX(nldi,2), nlei
                DO jj = MAX(nldj,2), nlej   ! NO vector opt.
@@ -357 +353 @@
       !!
       !! ** Method  : 
-      !!
-      !! History :
-      !!   8.0  !  98-07 (Y.Drillet)  Original code
       !!----------------------------------------------------------------------
-      !! * Arguments
       REAL(wp) ::   &
          pax, pay, pbx, pby,    &     ! ???
@@ -368 +360 @@
          ptx, pty                     ! ???
       LOGICAL ::  ldinmesh            ! ???
-
-      !! * local declarations
-      REAL(wp) ::   &
-         zabt, zbct, zcdt, zdat, zabpt, zbcpt, zcdpt, zdapt,  &
-         psax,psay,psbx,psby,psx,psy
-      REAL(wp) ::  fsline                ! Statement function
-
-      !! * Substitutions
-      fsline(psax, psay, psbx, psby, psx, psy) = psy  * ( psbx - psax )   &
-                                               - psx  * ( psby - psay )   &
-                                               + psax *   psby - psay * psbx
+      !!
+      REAL(wp) ::   zabt, zbct, zcdt, zdat, zabpt, zbcpt, zcdpt, zdapt
+      !!---------------------------------------------------------------------
+      !! Statement function
+      REAL(wp) ::   fsline
+      REAL(wp) ::   psax, psay, psbx, psby, psx, psy
+      fsline( psax, psay, psbx, psby, psx, psy ) = psy  * ( psbx - psax )   &
+         &                                       - psx  * ( psby - psay )   &
+         &                                       + psax *   psby - psay * psbx
       !!---------------------------------------------------------------------
       
@@ -411 +401 @@
          ldinmesh=.FALSE.
       ENDIF
-
+      !
    END SUBROUTINE findmesh
 
@@ -422 +412 @@
       !!                points
       !! ** Method  : 
-      !!         
       !!----------------------------------------------------------------------
-      !! * Arguments
       REAL(wp), INTENT(in) ::   pla1, phi1, pla2, phi2   ! ???
-
-      !! * Local variables
+      !!
       REAL(wp) ::   dly1, dly2, dlx1, dlx2, dlx, dls, dld, dpi
       REAL(wp) ::   dstnce
       !!---------------------------------------------------------------------
-      
+      !
       dpi  = 2.* ASIN(1.)
       dls  = dpi / 180.
@@ -438 +425 @@
       dlx1 = pla1 * dls
       dlx2 = pla2 * dls
-
+      !
       dlx = SIN(dly1) * SIN(dly2) + COS(dly1) * COS(dly2) * COS(dlx2-dlx1)
- 
+      !
       IF( ABS(dlx) > 1.0 ) dlx = 1.0
-
+      !
       dld = ATAN(DSQRT( ( 1-dlx )/( 1+dlx ) )) * 222.24 / dls
       dstnce = dld * 1000.
-
+      !
    END FUNCTION dstnce