Changeset 2611

Timestamp:

2011-02-23T10:50:10+01:00 (13 years ago)

Author:

trackstand2

Message:

Merged ldfslp.F90 bug fix (duplicate allocation of Madec arrays)

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -42 +42 @@
    LOGICAL , PUBLIC, PARAMETER ::   lk_ldfslp = .TRUE.     !: slopes flag
    !                                                                             !! Madec operator
+   !  Arrays allocated in ldf_slp_init() routine once we know whether we're using the Griffies or Madec operator
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:)     ::   uslp, wslpi          !: i_slope at U- and W-points
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:)     ::   vslp, wslpj          !: j-slope at V- and W-points
@@ -50 +51 @@
 
    !                                                              !! Madec operator
+   !  Arrays allocated in ldf_slp_init() routine once we know whether we're using the Griffies or Madec operator
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   omlmask           ! mask of the surface mixed layer at T-pt
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   uslpml, wslpiml   ! i_slope at U- and W-points just below the mixed layer
@@ -78 +80 @@
       !!              ***  ROUTINE ldf_slp_alloc  ***
       !!----------------------------------------------------------------------
-      IMPLICIT none
-      INTEGER               :: ldf_slp_alloc
-      INTEGER, DIMENSION(3) :: ierr
-      !!----------------------------------------------------------------------
-
-      ALLOCATE(uslp(jpi,jpj,jpk), wslpi(jpi,jpj,jpk), &
-               vslp(jpi,jpj,jpk), wslpj(jpi,jpj,jpk), Stat=ierr(1))
-      !
-      ALLOCATE(omlmask(jpi,jpj,jpk),                  &
-               uslpml(jpi,jpj), wslpiml(jpi,jpj),     &
-               vslpml(jpi,jpj), wslpjml(jpi,jpj), Stat=ierr(2))
+      INTEGER :: ldf_slp_alloc
+      !!----------------------------------------------------------------------
       !
       ALLOCATE(zdzrho(jpi,jpj,jpk,0:1),  zdyrho(jpi,jpj,jpk,0:1),  &
                zdxrho(jpi,jpj,jpk,0:1),  zti_mlb(jpi,jpj,0:1,0:1), &
-               ztj_mlb(jpi,jpj,0:1,0:1), Stat=ierr(3))
-
-      ldf_slp_alloc = MAXVAL(ierr)
+               ztj_mlb(jpi,jpj,0:1,0:1), Stat=ldf_slp_alloc)
+
+      IF(ldf_slp_alloc /= 0)THEN
+         CALL ctl_warn('ldf_slp_alloc : failed to allocate arrays.')
+      END IF
 
    END FUNCTION ldf_slp_alloc