Changeset 2715 for trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.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/ZDF/zdfbfr.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -28 +28 @@
    PUBLIC   zdf_bfr         ! called by step.F90
    PUBLIC   zdf_bfr_init    ! called by opa.F90
-   
+
    !                                    !!* Namelist nambfr: bottom friction namelist *
    INTEGER  ::   nn_bfr    = 0           ! = 0/1/2/3 type of bottom friction 
@@ -37 +37 @@
    LOGICAL  ::   ln_bfr2d  = .false.     ! logical switch for 2D enhancement
    
-   REAL(wp), DIMENSION(jpi,jpj) ::   bfrcoef2d = 1.e-3_wp   ! 2D bottom drag coefficient
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  bfrcoef2d   ! 2D bottom drag coefficient
 
    !! * Substitutions
@@ -43 +43 @@
 #  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 zdf_bfr_alloc()
+      !!----------------------------------------------------------------------
+      !!                ***  FUNCTION zdf_bfr_alloc  ***
+      !!----------------------------------------------------------------------
+      ALLOCATE( bfrcoef2d(jpi,jpj), STAT=zdf_bfr_alloc )
+      !
+      IF( lk_mpp             )   CALL mpp_sum ( zdf_bfr_alloc )
+      IF( zdf_bfr_alloc /= 0 )   CALL ctl_warn('zdf_bfr_alloc: failed to allocate arrays.')
+   END FUNCTION zdf_bfr_alloc
+
 
    SUBROUTINE zdf_bfr( kt )
@@ -143 +154 @@
       IF(lwp) WRITE(numout,*) '   Namelist nam_bfr : set bottom friction parameters'
 
+      !                              ! allocate zdfbfr arrays
+      IF( zdf_bfr_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'zdf_bfr_init : unable to allocate arrays' )
+
       SELECT CASE (nn_bfr)
-
+      !
       CASE( 0 )
          IF(lwp) WRITE(numout,*) '      free-slip '
@@ -165 +179 @@
             CALL iom_get (inum, jpdom_data, 'bfr_coef',bfrcoef2d,1) ! bfrcoef2d is used as tmp array
             CALL iom_close(inum)
-            bfrcoef2d(:,:)= rn_bfri1 * ( 1 + rn_bfrien * bfrcoef2d(:,:) )
+            bfrcoef2d(:,:) = rn_bfri1 * ( 1 + rn_bfrien * bfrcoef2d(:,:) )
          ENDIF
          bfrua(:,:) = - bfrcoef2d(:,:)