Changeset 2617 for branches

Timestamp:

2011-02-26T11:34:33+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; zdfbfr allocation in zdf_bfr_init

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC

Files:

• ZDF/zdfbfr.F90 (modified) (3 diffs)
• nemogcm.F90 (modified) (2 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -28 +28 @@
    PUBLIC   zdf_bfr         ! called by step.F90
    PUBLIC   zdf_bfr_init    ! called by opa.F90
-   PUBLIC   zdf_bfr_alloc   ! called by nemogcm.F90
 
    !                                    !!* Namelist nambfr: bottom friction namelist *
@@ -39 +38 @@
    
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::  bfrcoef2d   ! 2D bottom drag coefficient
-                                                               ! Now initialised in zdf_bfr_alloc()
+
    !! * Substitutions
 #  include "vectopt_loop_substitute.h90"
@@ -155 +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 '

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -558 +558 @@
 #endif
       USE wrk_nemo,     ONLY: wrk_alloc
-      USE zdfbfr,       ONLY: zdf_bfr_alloc
 
       INTEGER :: ierr
@@ -658 +657 @@
 #endif
       ierr = ierr + wrk_alloc()
-      ierr = ierr + zdf_bfr_alloc()
 
       IF( lk_mpp    )   CALL mpp_sum( ierr )