Changeset 2839 for branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90

Timestamp:

2011-09-15T08:41:58+02:00 (13 years ago)

Author:

cbricaud

Message:

modified routine for netcdf output

File:

• branches/2011/dev_r2802_MERCATOR9_floats/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90 (modified) (2 diffs)

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

@@ -24 +24 @@
    !! float parameters
    !! ----------------
-   INTEGER, PUBLIC, PARAMETER ::   jpnfl     = 23                  !: total number of floats during the run
-   INTEGER, PUBLIC, PARAMETER ::   jpnnewflo =  0                  !: number of floats added in a new run
-   INTEGER, PUBLIC, PARAMETER ::   jpnrstflo = jpnfl - jpnnewflo   !: number of floats for the restart
+   INTEGER, PUBLIC ::   jpnfl       !: total number of floats during the run
+   INTEGER, PUBLIC ::   jpnnewflo   !: number of floats added in a new run
+   INTEGER, PUBLIC ::   jpnrstflo   !: number of floats for the restart
 
    !! float variables
    !! ---------------
-   INTEGER , PUBLIC, DIMENSION(jpnfl) ::   nisobfl   !: =0 for a isobar float , =1 for a float following the w velocity
-   INTEGER , PUBLIC, DIMENSION(jpnfl) ::   ngrpfl    !: number to identify searcher group
+   INTEGER , PUBLIC, ALLOCATABLE, DIMENSION(:) ::   nisobfl   !: =0 for a isobar float , =1 for a float following the w velocity
+   INTEGER , PUBLIC, ALLOCATABLE, DIMENSION(:) ::   ngrpfl    !: number to identify searcher group
+   INTEGER , PUBLIC, ALLOCATABLE, DIMENSION(:) ::   nfloat    !: number to identify searcher group
 
-   REAL(wp), PUBLIC, DIMENSION(jpnfl) ::   flxx , flyy , flzz    !: long, lat, depth of float (decimal degree, m >0)
-   REAL(wp), PUBLIC, DIMENSION(jpnfl) ::   tpifl, tpjfl, tpkfl   !: (i,j,k) indices of float position
+   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:) ::   flxx , flyy , flzz    !: long, lat, depth of float (decimal degree, m >0)
+   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:) ::   tpifl, tpjfl, tpkfl   !: (i,j,k) indices of float position
 
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   wb   !: vertical velocity at previous time step (m s-1).
    
-   !                                            !!! * namelist namflo : langrangian floats *
-   LOGICAL, PUBLIC  ::   ln_rstflo  = .FALSE.    !: T/F float restart 
-   LOGICAL, PUBLIC  ::   ln_argo    = .FALSE.    !: T/F argo type floats
-   LOGICAL, PUBLIC  ::   ln_flork4  = .FALSE.    !: T/F 4th order Runge-Kutta
-   INTEGER, PUBLIC  ::   nn_writefl = 150        !: frequency of float output file 
-   INTEGER, PUBLIC  ::   nn_stockfl = 450        !: frequency of float restart file
+   !                                                 !!! * namelist namflo : langrangian floats *
+   LOGICAL, PUBLIC  ::   ln_rstflo      = .FALSE.    !: T/F float restart 
+   LOGICAL, PUBLIC  ::   ln_argo        = .FALSE.    !: T/F argo type floats
+   LOGICAL, PUBLIC  ::   ln_flork4      = .FALSE.    !: T/F 4th order Runge-Kutta
+   LOGICAL, PUBLIC  ::   ln_ariane      = .FALSE.    !: handle ariane input/output convention
+   LOGICAL, PUBLIC  ::   ln_flo_ascii   = .FALSE.    !: write in ascii (T) or in Netcdf (F)
+
+   INTEGER, PUBLIC  ::   nn_writefl     = 150        !: frequency of float output file 
+   INTEGER, PUBLIC  ::   nn_stockfl     = 450        !: frequency of float restart file
 
    !!----------------------------------------------------------------------
@@ -56 +60 @@
       !!                 ***  FUNCTION flo_oce_alloc  ***
       !!----------------------------------------------------------------------
-      ALLOCATE( wb(jpi,jpj,jpk)   , STAT=flo_oce_alloc )
+      ALLOCATE( wb(jpi,jpj,jpk) , nfloat(jpnfl) , nisobfl(jpnfl) , ngrpfl(jpnfl) , &
+                flxx(jpnfl)     , flyy(jpnfl)   , flzz(jpnfl)    ,                 & 
+                tpifl(jpnfl)    , tpjfl(jpnfl)  , tpkfl(jpnfl)   , STAT=flo_oce_alloc )
       !
       IF( lk_mpp             )   CALL mpp_sum ( flo_oce_alloc )