Changeset 2761 for trunk/NEMOGCM/NEMO/TOP_SRC/SED/sedadv.F90

Timestamp:

2011-05-03T12:49:22+02:00 (13 years ago)

Author:

cetlod

Message:

Changes in sediment model to use with dynamic memory, see ticket #821

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/SED/sedadv.F90 (modified) (4 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/SED/sedadv.F90

@@ -14 +14 @@
 
    !! * Module variable
-   INTEGER, PARAMETER  ::   &
-      nztime = jpksed         ! number of time step between sunrise and sunset
-   !      
-   
-   REAL(wp), DIMENSION(jpksed), SAVE :: &
-      dvolsp, dvolsm, &
-      c2por, ckpor
-
-   REAL(wp), SAVE :: &
-      por1clay , &
-      cpor   
-
-   REAL(wp) :: &
-      eps = 1.e-13
+   INTEGER, PARAMETER  ::  nztime = jpksed         ! number of time step between sunrise and sunset
+
+   REAL(wp), DIMENSION(jpksed), SAVE :: dvolsp, dvolsm
+   REAL(wp), DIMENSION(jpksed), SAVE :: c2por, ckpor
+
+   REAL(wp) :: cpor
+   REAL(wp) :: por1clay 
+   REAL(wp) :: eps = 1.e-13
 
 CONTAINS
@@ -52 +46 @@
          kt                     ! time step
       ! * local variables
-
-      INTEGER ::  &
-         ji, jk, js
-
-      INTEGER ::  &
-         jn, ntimes, ikwneg
+      INTEGER :: ji, jk, js 
+      INTEGER :: jn, ntimes, ikwneg
       
-      REAL(wp), DIMENSION(jpksed,jpsol) :: zsolcpno
-      REAL(wp), DIMENSION(jpksed)       :: zfilled, zfull, zfromup, zempty
-     
+      REAL(wp), DIMENSION(:,:), ALLOCATABLE :: zsolcpno
+      REAL(wp), DIMENSION(:  ), ALLOCATABLE :: zfilled, zfull, zfromup, zempty
       REAL(wp), DIMENSION(:,:), ALLOCATABLE :: zgap, zwb
-      REAL(wp), DIMENSION(jpoce,jpsol)      :: zrainrf
-
+      REAL(wp), DIMENSION(:,:), ALLOCATABLE :: zrainrf
       REAL(wp), DIMENSION(nztime) ::  zraipush
 
-      REAL(wp) :: &
-         zkwnup, zkwnlo, zfrac, &
-         zfromce, zrest
-
+      REAL(wp) :: zkwnup, zkwnlo, zfrac,  zfromce, zrest
 
       !------------------------------------------------------------------------
@@ -93 +78 @@
       ENDIF
 
-
-      ALLOCATE( zgap (jpoce,jpksed) )    ;   ALLOCATE( zwb(jpoce,jpksed) )
-
+      ALLOCATE( zsolcpno(jpksed,jpsol), zrainrf(jpoce,jpsol) )
+      ALLOCATE( zfilled(jpksed), zfull(jpksed), zfromup(jpksed), zempty(jpksed) )
+      ALLOCATE( zgap (jpoce,jpksed)   , zwb(jpoce,jpksed)  )  
 
       ! Initialization of data for mass balance calculation
@@ -438 +423 @@
       raintg(:)   = 0.
 
-
-      DEALLOCATE( zgap  ) ;  DEALLOCATE( zwb )
+      DEALLOCATE( zsolcpno )   
+      DEALLOCATE( zrainrf  )
+      DEALLOCATE( zfilled  )
+      DEALLOCATE( zfull    )
+      DEALLOCATE( zfromup  )
+      DEALLOCATE( zempty   )
+      DEALLOCATE( zgap     )  
+      DEALLOCATE( zwb      )