Changeset 2689 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90

Timestamp:

2011-03-15T15:49:11+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; bug correction (sshn_b allocated twice) + style in time splitting case

File:

• branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90 (modified) (3 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_oce.F90

@@ -3 +3 @@
    !!                       ***  MODULE dynspg_oce  ***
    !!       
-   !! Ocean dynamics: Define in memory surface pressure gradient variables
+   !! Ocean dynamics: Define in memory some surface pressure gradient variables
    !!======================================================================
    !! History :  1.0  ! 2005-12  (C. Talandier, G. Madec)  Original code
@@ -9 +9 @@
    !!----------------------------------------------------------------------
    USE par_oce        ! ocean parameters
+   USE lib_mpp        ! MPP library
 
    IMPLICIT NONE
    PUBLIC           
 
+   PUBLIC   dynspg_oce_alloc   ! called in dynspg.F90
+   
    !                                                       !!! Surface pressure gradient logicals
 #if   defined key_dynspg_exp  ||  defined key_esopa
@@ -30 +33 @@
 #endif
 
-#if   defined key_dynspg_ts   ||   defined key_vvl   ||   defined key_esopa 
-  !                                                                !!! Time splitting scheme (sub-time step variables) 
+  !                                                                         !!! Time splitting scheme (key_dynspg_ts) 
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   sshn_e, ssha_e   ! sea surface heigth (now, after, average)
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   ua_e  , va_e     ! barotropic velocities (after)
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   sshn_e, ssha_e   ! sea surface heigth (now, after, average)
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hu_e  , hv_e     ! now ocean depth ( = Ho+sshn_e )
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hur_e , hvr_e    ! inverse of the now depth ( = 1/(Ho+sshn_e) )
-#endif    !!----------------------------------------------------------------------
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hur_e , hvr_e    ! inverse of hu_e and hv_e
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   sshn_b       ! before field without time-filter
 
-   !! NEMO/OPA 4.0 , LODYC-IPSL  (2011)
-   !! $Id$ 
+   !!----------------------------------------------------------------------
+   !! NEMO/OPA 4.0 , NEMO Consortium (2011)
+   !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !!----------------------------------------------------------------------
+CONTAINS
+
+   INTEGER FUNCTION dynspg_oce_alloc()
+      !!----------------------------------------------------------------------
+      !!                  ***  routine dynspg_oce_alloc  ***
+      !!----------------------------------------------------------------------
+      ALLOCATE( sshn_e(jpi,jpj) , ua_e(jpi,jpj) , hu_e(jpi,jpj) , hur_e(jpi,jpj) ,      &
+         &      ssha_e(jpi,jpj) , va_e(jpi,jpj) , hv_e(jpi,jpj) , hvr_e(jpi,jpj) ,      &
+         &      sshn_b(jpi,jpj)                                                  , STAT = dynspg_oce_alloc )
+         !
+      IF( lk_mpp                )   CALL mpp_sum ( dynspg_oce_alloc )
+      IF( dynspg_oce_alloc /= 0 )   CALL ctl_warn('dynspg_oce_alloc: failed to allocate arrays')
+      !
+   END FUNCTION dynspg_oce_alloc
+
    !!======================================================================
 END MODULE dynspg_oce