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

Timestamp:

2011-02-26T13:31:38+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; move dyn allocation from nemogcm to module when possible (continuation)

File:

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

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

@@ -5 +5 @@
    !! Ocean dynamics: Define in memory surface pressure gradient variables
    !!======================================================================
-   !! History :  1.0  !  05-12  (C. Talandier, G. Madec)  Original code
+   !! History :  1.0  ! 2005-12  (C. Talandier, G. Madec)  Original code
    !!            3.2  ! 2009-07  (R. Benshila) Suppression of rigid-lid option
    !!----------------------------------------------------------------------
@@ -30 +30 @@
 #endif
 
-!!gm BUG : always required in _ts, only  some of them in vvl
-!    #if   defined key_dynspg_ts   ||   defined key_esopa
-!!gm end
-#if   defined key_dynspg_ts   ||   defined key_vvl   ||   defined key_esopa
-  !                                                                !!! Time splitting scheme (sub-time step variables)
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: ua_e  , va_e             ! barotropic velocities (after)
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: sshn_e, ssha_e, sshn_b   ! 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
-
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.2 , LODYC-IPSL  (2009)
+   !! NEMO/OPA 4.0 , LODYC-IPSL  (2011)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!======================================================================
-CONTAINS
-
-  FUNCTION dynspg_oce_alloc()
-    IMPLICIT none
-    INTEGER :: dynspg_oce_alloc
-
-    dynspg_oce_alloc = 0
-
-#if   defined key_dynspg_ts   ||   defined key_vvl   ||   defined key_esopa
-    ALLOCATE(ua_e(jpi,jpj),   va_e(jpi,jpj)  ,                  &
-             sshn_e(jpi,jpj), ssha_e(jpi,jpj), sshn_b(jpi,jpj), &
-             hu_e(jpi,jpj),   hv_e(jpi,jpj)  ,                  &
-             hur_e(jpi,jpj),  hvr_e(jpi,jpj) ,                  &
-             Stat=dynspg_oce_alloc)
-#endif
-
-  END FUNCTION dynspg_oce_alloc
-
 END MODULE dynspg_oce