Changeset 2335 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90

Timestamp:

2010-10-29T09:39:51+02:00 (13 years ago)

Author:

gm

Message:

v3.3beta: Suppress obsolete key_mpp_shmem

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified) (8 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90

@@ -8 +8 @@
    !!   NEMO      1.0  ! 2002-11  (G. Madec, A. Bozec)  F90: Free form and module
    !!----------------------------------------------------------------------
-
 #if   defined key_floats   ||   defined key_esopa
    !!----------------------------------------------------------------------
@@ -34 +33 @@
    !! 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
 
@@ -52 +50 @@
       CHARACTER (len=21) ::  clname
       INTEGER ::   inum   ! temporary logical unit for restart file
-      INTEGER ::   iafl, ibfl, icfl, ia1fl, ib1fl, ic1fl, jfl, irecflo,   &
+      INTEGER ::   iafl, ibfl, icfl, ia1fl, ib1fl, ic1fl, jfl, irecflo
       INTEGER ::   iafloc, ibfloc, ia1floc, ib1floc, iafln, ibfln
       INTEGER  ::    ic, jc , jpn
-      INTEGER, DIMENSION ( jpnij )  :: iproc
-
-      REAL(wp) :: zafl,zbfl,zcfl,zdtj
-      REAL(wp) :: zxxu, zxxu_01,zxxu_10, zxxu_11
-      REAL(wp), DIMENSION (jpk,jpnfl) :: ztemp, zsal
+      INTEGER, DIMENSION ( jpnij )  ::   iproc
+      REAL(wp) ::   zafl,zbfl,zcfl,zdtj
+      REAL(wp) ::   zxxu, zxxu_01,zxxu_10, zxxu_11
+      REAL(wp), DIMENSION (jpk,jpnfl) ::   ztemp, zsal   ! 2D workspace
       !!---------------------------------------------------------------------
       
@@ -74 +71 @@
          ! open the file numflo 
          CALL ctl_opn( numflo, 'trajec_float', 'REPLACE', 'UNFORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
-         !      REWIND numflo
 
          IF( kt == nit000 ) THEN
@@ -80 +76 @@
             IF(lwp) WRITE(numflo)cexper,no,irecflo,jpnfl,nn_writefl
          ENDIF
-         zdtj = rdt / 86400.      !!bug   use of 86400 instead of the phycst parameter
+         zdtj = rdt / 86400._wp
 
          ! translation of index position in geographical position
@@ -195 +191 @@
       !         iafln=NINT(tpifl(jfl))
       !         ibfln=NINT(tpjfl(jfl))
-      !# if defined key_mpp_mpi   ||   defined key_mpp_shmem
+      !# if defined key_mpp_mpi   
       !        IF ( (iafl >= (mig(nldi)-jpizoom+1)) .AND.
       !     $       (iafl <= (mig(nlei)-jpizoom+1)) .AND.
@@ -214 +210 @@
       !         ztemp(jfl)=tn(iafloc,ibfloc,jk)
       !         zsal(jfl)=sn(iaflo!,ibfloc,jk)
-      !# if defined key_mpp_mpi   ||   defined key_mpp_shmem
+      !# if defined key_mpp_mpi   
       !        ELSE
       !         ztemp(jfl) = 0.
@@ -298 +294 @@
 
       IF( kt == nitend )   CLOSE( numflo ) 
-    
+      !
    END SUBROUTINE flo_wri