Changeset 2715 for trunk/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.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/flowri.F90 (modified) (2 diffs)

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

@@ -23 +23 @@
    PRIVATE
 
-   PUBLIC   flo_wri    ! routine called by floats.F90
+   PUBLIC   flo_wri         ! routine called by floats.F90
+   PUBLIC   flo_wri_alloc   ! routine called by floats.F90
 
    INTEGER ::   jfl      ! number of floats
    INTEGER ::   numflo   ! logical unit for drifting floats
 
+   ! Following are only workspace arrays but shape is not (jpi,jpj) and
+   ! therefore make them module arrays rather than replacing with wrk_nemo
+   ! member arrays.
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ztemp, zsal   ! 2D workspace
+
    !! * Substitutions
 #  include "domzgr_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+   !! NEMO/OPA 4.0 , NEMO Consortium (2011)
    !! $Id$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 CONTAINS
+
+   INTEGER FUNCTION flo_wri_alloc
+      !!-------------------------------------------------------------------
+      !!                ***  FUNCTION 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
+
 
    SUBROUTINE flo_wri( kt )
@@ -54 +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
-      REAL(wp), DIMENSION (jpk,jpnfl) ::   ztemp, zsal   ! 2D workspace
       !!---------------------------------------------------------------------
       
-      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