Changeset 2715 for trunk/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/FLO/floats.F90 (modified) (3 diffs)

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

@@ -50 +50 @@
       !!----------------------------------------------------------------------
       !
-      IF( kt == nit000 ) THEN
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'flo_stp : call floats routine '
-         IF(lwp) WRITE(numout,*) '~~~~~~~'
-
-         CALL flo_dom            ! compute/read initial position of floats
-
-         wb(:,:,:) = wn(:,:,:)   ! set wb for computation of floats trajectories at the first time step
-      ENDIF
-      !
       IF( ln_flork4 ) THEN   ;   CALL flo_4rk( kt )        ! Trajectories using a 4th order Runge Kutta scheme
       ELSE                   ;   CALL flo_blk( kt )        ! Trajectories using Blanke' algorithme
@@ -83 +73 @@
       !!---------------------------------------------------------------------
       !
+      IF(lwp) WRITE(numout,*)
+      IF(lwp) WRITE(numout,*) 'flo_stp : call floats routine '
+      IF(lwp) WRITE(numout,*) '~~~~~~~'
+
       REWIND( numnam )              ! Namelist namflo : floats
       READ  ( numnam, namflo )
@@ -95 +89 @@
          WRITE(numout,*) '            Computation of T trajectories    ln_flork4  = ', ln_flork4
       ENDIF
+      !
+      !                             ! allocate floats arrays
+      IF( flo_oce_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'flo_init : unable to allocate arrays' )
+      !
+      !                             ! allocate flowri arrays
+      IF( flo_wri_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'flo_wri : unable to allocate arrays' )
+      !
+      CALL flo_dom                  ! compute/read initial position of floats
+
+      wb(:,:,:) = wn(:,:,:)         ! set wb for computation of floats trajectories at the first time step
       !
    END SUBROUTINE flo_init