Changeset 3051 for branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90

Timestamp:

2011-11-07T16:03:29+01:00 (12 years ago)

Author:

cbricaud

Message:

add changes from dev_r2802_MERCATOR9_floats

File:

• branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 (modified) (5 diffs)

branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90

@@ -19 +19 @@
    USE flodom          ! initialisation Module 
    USE flowri          ! float output                     (flo_wri routine)
+   USE florst          ! float restart                    (flo_rst routine)
    USE flo4rk          ! Trajectories, Runge Kutta scheme (flo_4rk routine)
    USE floblk          ! Trajectories, Blanke scheme      (flo_blk routine)
@@ -56 +57 @@
       IF( lk_mpp )   CALL mppsync   ! synchronization of all the processor
       !
-      IF( kt == nit000 .OR. MOD( kt, nn_writefl ) == 0 )   CALL flo_wri( kt )      ! trajectories file 
-      IF( kt == nitend .OR. MOD( kt, nn_stockfl ) == 0 )   CALL flo_wri( kt )      ! restart file 
+      CALL flo_wri( kt )      ! trajectories ouput 
+      !
+      CALL flo_rst( kt )      ! trajectories restart
       !
       wb(:,:,:) = wn(:,:,:)         ! Save the old vertical velocity field
@@ -70 +72 @@
       !! ** Purpose :   Read the namelist of floats
       !!----------------------------------------------------------------------
-      NAMELIST/namflo/ ln_rstflo, nn_writefl, nn_stockfl, ln_argo, ln_flork4 
+      INTEGER :: jfl
+      !
+      NAMELIST/namflo/ jpnfl, jpnnewflo, ln_rstflo, nn_writefl, nn_stockfl, ln_argo, ln_flork4, ln_ariane, ln_flo_ascii
       !!---------------------------------------------------------------------
       !
@@ -83 +87 @@
          WRITE(numout,*)
          WRITE(numout,*) '         Namelist floats :'
-         WRITE(numout,*) '            restart                          ln_rstflo  = ', ln_rstflo
-         WRITE(numout,*) '            frequency of float output file   nn_writefl = ', nn_writefl
-         WRITE(numout,*) '            frequency of float restart file  nn_stockfl = ', nn_stockfl
-         WRITE(numout,*) '            Argo type floats                 ln_argo    = ', ln_argo
-         WRITE(numout,*) '            Computation of T trajectories    ln_flork4  = ', ln_flork4
+         WRITE(numout,*) '            number of floats                      jpnfl        = ', jpnfl
+         WRITE(numout,*) '            number of new floats                  jpnflnewflo  = ', jpnnewflo
+         WRITE(numout,*) '            restart                               ln_rstflo    = ', ln_rstflo
+         WRITE(numout,*) '            frequency of float output file        nn_writefl   = ', nn_writefl
+         WRITE(numout,*) '            frequency of float restart file       nn_stockfl   = ', nn_stockfl
+         WRITE(numout,*) '            Argo type floats                      ln_argo      = ', ln_argo
+         WRITE(numout,*) '            Computation of T trajectories         ln_flork4    = ', ln_flork4
+         WRITE(numout,*) '            Use of ariane convention              ln_ariane    = ', ln_ariane
+         WRITE(numout,*) '            ascii output (T) or netcdf output (F) ln_flo_ascii = ', ln_flo_ascii
+
       ENDIF
       !
@@ -93 +102 @@
       IF( flo_oce_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'flo_init : unable to allocate arrays' )
       !
+      !                             ! allocate flodom arrays
+      IF( flo_dom_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'flo_dom : unable to allocate arrays' )
+      !
       !                             ! allocate flowri arrays
       IF( flo_wri_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'flo_wri : unable to allocate arrays' )
+      !
+      !                             ! allocate florst arrays
+      IF( flo_rst_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'flo_rst : unable to allocate arrays' )
+      !
+      !memory allocation 
+      jpnrstflo = jpnfl-jpnnewflo
+
+      !vertical axe for netcdf IOM ouput
+      DO jfl=1,jpnfl ; nfloat(jfl)=jfl ; ENDDO
+
       !
       CALL flo_dom                  ! compute/read initial position of floats