Changeset 2844

Timestamp:

2011-09-20T15:40:17+02:00 (13 years ago)

Author:

cbricaud

Message:

minor corrections

Location:

branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/NEMO/OPA_SRC/FLO

Files:

• flodom.F90 (modified) (2 diffs)
• florst.F90 (modified) (4 diffs)
• flowri.F90 (modified) (2 diffs)

branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/NEMO/OPA_SRC/FLO/flodom.F90

@@ -319 +319 @@
 
          jfl1=0
+         ierr=0
          CALL ctl_opn( inum, clname2, 'OLD', 'FORMATTED', 'SEQUENTIAL',  1, numout, .TRUE., 1 )
-         DO WHILE (ierr .GE. 0)
+         DO WHILE (ierr .EQ. 0)
             jfl1=jfl1+1
-            READ (inum,*, iostat=ierr)
+            READ(inum,*, iostat=ierr)
          END DO
          CLOSE(inum)
          IF( (jfl1-1) .NE. ifl )THEN 
-            WRITE(cltmp,'(A20,A20,A3,i4.4,A10,i4.4)')"the number of floats in",TRIM(clname2), &
+            WRITE(cltmp,'(A25,A20,A3,i4.4,A10,i4.4)')"the number of floats in ",TRIM(clname2), &
                                                      " = ",jfl1," is not equal to jfl= ",ifl
             CALL ctl_stop('STOP',TRIM(cltmp) )
@@ -437 +438 @@
       IF( ABS(dlx) > 1.0 ) dlx = 1.0
       !
-      dld = ATAN(DSQRT( ( 1-dlx )/( 1+dlx ) )) * 222.24 / dls
+      dld = ATAN(DSQRT( 1.d0 * ( 1.-dlx )/( 1.+dlx ) )) * 222.24 / dls
       dstnce = dld * 1000.
       !

branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/NEMO/OPA_SRC/FLO/florst.F90

@@ -17 +17 @@
    !! * Modules used
    USE flo_oce         ! ocean drifting floats
-   !USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
    USE lib_mpp         ! distribued memory computing library
    USE in_out_manager  ! I/O manager
-   !USE phycst          ! physic constants
-   !USE dianam          ! build name of file (routine)
-   !USE ioipsl
 
    IMPLICIT NONE
@@ -29 +25 @@
 
    PUBLIC flo_rst      ! routine called by floats.F90
-
-   !INTEGER :: jfl      ! number of floats
-   !INTEGER :: numfl   ! logical unit for floats netcdf output
 
    !! * Substitutions
@@ -45 +38 @@
    SUBROUTINE flo_rst( kt )
       !!---------------------------------------------------------------------
-      !!                  ***  ROUTINE flo_wri ***
+      !!                  ***  ROUTINE flo_rst ***
       !!             
       !! ** Purpose :  
@@ -85 +78 @@
          END DO
 
-         CALL ctl_opn( inum, clname, 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
-         REWIND inum
+         inum=0
+         IF( lwp )THEN
+            CALL ctl_opn( inum, clname, 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE. )
+            REWIND inum
+         ENDIF
          !
          DO jpn = 1, jpnij

branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90

@@ -52 +52 @@
 CONTAINS
 
-   INTEGER FUNCTION flo_wri_alloc
+   INTEGER FUNCTION flo_wri_alloc()
       !!-------------------------------------------------------------------
       !!                ***  FUNCTION flo_wri_alloc  ***
@@ -220 +220 @@
 
 #if defined key_iomput
-         IF(lwp)WRITE(numout,*)"zlon ",zlon ; call FLUSH(numout)
          CALL iom_put( "traj_lon"     , zlon )
          CALL iom_put( "traj_lat"     , zlat )