Changeset 2618 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/FLO

Timestamp:

2011-02-26T13:31:38+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; move dyn allocation from nemogcm to module when possible (continuation)

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/FLO

Files:

• flo_oce.F90 (modified) (3 diffs)
• floats.F90 (modified) (3 diffs)
• floblk.F90 (modified) (1 diff)
• flowri.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/FLO/flo_oce.F90

@@ -12 +12 @@
    !!----------------------------------------------------------------------
    USE par_oce         ! ocean parameters
+   USE in_out_manager  ! I/O manager
+   USE lib_mpp         ! MPP library
 
    IMPLICIT NONE
    PUBLIC
 
-   PUBLIC   flo_oce_alloc   ! Routine called in nemogcm.F90
+   PUBLIC   flo_oce_alloc   ! Routine called in floats.F90
 
    LOGICAL, PUBLIC, PARAMETER ::   lk_floats = .TRUE.    !: float flag
@@ -44 +46 @@
 
    !!----------------------------------------------------------------------
+   !! NEMO/OPA 4.0 , NEMO Consortium (2011)
+   !! $Id$ 
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
 CONTAINS
 
-   FUNCTION flo_oce_alloc()
+   INTEGER FUNCTION flo_oce_alloc()
       !!----------------------------------------------------------------------
-      INTEGER :: flo_oce_alloc
+      !!                 ***  FUNCTION flo_oce_alloc  ***
       !!----------------------------------------------------------------------
+      ALLOCATE( wb(jpi,jpj,jpk), Stat=flo_oce_alloc )
       !
-      ALLOCATE(wb(jpi,jpj,jpk), Stat=flo_oce_alloc)
-      !
+      IF( lk_mpp             )   CALL mpp_sum ( flo_oce_alloc )
+      IF( flo_oce_alloc /= 0 )   CALL ctl_warn('flo_oce_alloc: failed to allocate arrays.')
    END FUNCTION flo_oce_alloc
 
@@ -62 +69 @@
 #endif
 
-   !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id$ 
-   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!======================================================================
 END MODULE flo_oce

branches/dev_r2586_dynamic_mem/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

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/FLO/floblk.F90

@@ -14 +14 @@
    USE dom_oce         ! ocean space and time domain
    USE phycst          ! physical constants
+   USE obc_par         ! open boundary condition parameters
    USE in_out_manager  ! I/O manager
    USE lib_mpp         ! distribued memory computing library

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

@@ -23 +23 @@
    PRIVATE
 
-   PUBLIC   flo_wri          ! routine called by floats.F90
-   PUBLIC   flo_wri_alloc   ! routine called by nemogcm.F90
+   PUBLIC   flo_wri         ! routine called by floats.F90
+   PUBLIC   flo_wri_alloc   ! routine called by floats.F90
 
    INTEGER ::   jfl      ! number of floats
@@ -43 +43 @@
 CONTAINS
 
-   FUNCTION flo_wri_alloc
+   INTEGER FUNCTION flo_wri_alloc
       !!-------------------------------------------------------------------
-      !!                ***  ROUTINE flo_wri_alloc  ***
+      !!                ***  FUNCTION flo_wri_alloc  ***
       !!-------------------------------------------------------------------
-      INTEGER :: flo_wri_alloc
-      !!-------------------------------------------------------------------
-      !
-      ALLOCATE(ztemp(jpk,jpnfl), zsal(jpk,jpnfl), Stat=flo_wri_alloc)
+      ALLOCATE( ztemp(jpk,jpnfl) , zsal(jpk,jpnfl) , STAT=flo_wri_alloc)
       !
       IF( lk_mpp             )   CALL mpp_sum ( flo_wri_alloc )
       IF( flo_wri_alloc /= 0 )   CALL ctl_warn('flo_wri_alloc: failed to allocate arrays.')
-      !
    END FUNCTION flo_wri_alloc
 
@@ -75 +71 @@
       INTEGER  ::    ic, jc , jpn
       INTEGER, DIMENSION ( jpnij )  ::   iproc
-      REAL(wp) ::   zafl,zbfl,zcfl,zdtj
+      REAL(wp) ::   zafl, zbfl, zcfl, zdtj
       REAL(wp) ::   zxxu, zxxu_01,zxxu_10, zxxu_11
       !!---------------------------------------------------------------------
       
-      IF( kt == nit000 .OR. MOD( kt,nn_writefl)== 0 ) THEN 
+      IF( kt == nit000 .OR. MOD( kt,nn_writefl) == 0 ) THEN 
 
          ! header of output floats file