Changeset 2682 for branches

Timestamp:

2011-03-10T18:22:51+01:00 (13 years ago)

Author:

trackstand2

Message:

key_bdy bug fix. Made arrays allocatable and added _alloc() routine plus call

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/BDY

Files:

• bdydta.F90 (modified) (3 diffs)
• bdyini.F90 (modified) (2 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90

@@ -35 +35 @@
    PUBLIC   bdy_dta_frs      ! routines called by step.F90
    PUBLIC   bdy_dta_fla 
+   PUBLIC   bdy_dta_alloc    ! routine called by bdy_init.F90
 
    INTEGER ::   numbdyt, numbdyu, numbdyv                      ! logical units for T-, U-, & V-points data file, resp.
@@ -47 +48 @@
    REAL(wp) ::  zoffset                                        ! time offset between time origin in file & start time of model run
 
-   REAL(wp), DIMENSION(jpbdim,jpk,2) ::   tbdydta, sbdydta     ! time interpolated values of T and S bdy data   
-   REAL(wp), DIMENSION(jpbdim,jpk,2) ::   ubdydta, vbdydta     ! time interpolated values of U and V bdy data 
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   tbdydta, sbdydta   ! time interpolated values of T and S bdy data   
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   ubdydta, vbdydta   ! time interpolated values of U and V bdy data 
    REAL(wp), DIMENSION(jpbdim,2)     ::   ubtbdydta, vbtbdydta ! Arrays used for time interpolation of bdy data   
    REAL(wp), DIMENSION(jpbdim,2)     ::   sshbdydta            ! bdy data of ssh
@@ -64 +65 @@
    !!----------------------------------------------------------------------
 CONTAINS
+
+  FUNCTION bdy_dta_alloc()
+     !!----------------------------------------------------------------------
+     USE lib_mpp, ONLY: ctl_warn, mpp_sum
+     !
+     INTEGER :: bdy_dta_alloc
+     !!----------------------------------------------------------------------
+     !
+     ALLOCATE(tbdydta(jpbdim,jpk,2), sbdydta(jpbdim,jpk,2), &
+              ubdydta(jpbdim,jpk,2), vbdydta(jpbdim,jpk,2), Stat=bdy_dta_alloc)
+
+     IF( lk_mpp           ) CALL mpp_sum ( bdy_dta_alloc )
+     IF(bdy_dta_alloc /= 0) CALL ctl_warn('bdy_dta_alloc: failed to allocate arrays')
+
+   END FUNCTION bdy_dta_alloc
+
 
    SUBROUTINE bdy_dta_frs( kt )

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -21 +21 @@
    USE obc_par         ! ocean open boundary conditions
    USE bdy_oce         ! unstructured open boundary conditions
+   USE bdydta, ONLY: bdy_dta_alloc ! open boundary data
    USE bdytides        ! tides at open boundaries initialization (tide_init routine)
    USE in_out_manager  ! I/O units
@@ -75 +76 @@
       !
       !                                      ! allocate bdy_oce arrays
-      IF( bdy_oce_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'bdy_init : unable to allocate arrays' )
+      IF( bdy_oce_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'bdy_init : unable to allocate oce arrays' )
+      IF( bdy_dta_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'bdy_init : unable to allocate dta arrays' )
 
       IF( jperio /= 0 )   CALL ctl_stop( 'Cyclic or symmetric,',   &