Changeset 2761 for trunk/NEMOGCM/NEMO/TOP_SRC/SED/sedchem.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/sedchem.F90 (modified) (6 diffs)

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

@@ -163 +163 @@
    DATA Ddsw / 999.842594 , 6.793952E-2 , -9.095290E-3, 1.001685E-4, -1.120083E-6, 6.536332E-9/
 
-
-   !! * Module variables
-   REAL(wp), DIMENSION(jpi,jpj,10) :: &
-      chem_data
-
 CONTAINS
 
@@ -181 +176 @@
       !!----------------------------------------------------------------------
       !!* Arguments
-      INTEGER, INTENT(in) ::  &
-         kt                     ! time step
+      INTEGER, INTENT(in) :: kt                     ! time step
 
 #if ! defined key_sed_off
-      INTEGER :: &
-         ji, jj, ikt
-
-      REAL(wp) :: &
-         ztkel, ztc, ztc2, zpres, ztr ,   &
-         zsal, zsal2, zsqrt, zsal15   ,   &
-         zis, zis2, zisqrt            ,   &
-         zdens0, zaw, zbw, zcw        ,   &
-         zbuf1, zbuf2 ,   & 
-         zcpexp, zcpexp2              ,   &
-         zck1p, zck2p, zck3p, zcksi   
-
-     REAL(wp), DIMENSION(jpi,jpj,6) :: &
-        zchem_data
+      INTEGER  :: ji, jj, ikt
+      REAL(wp) :: ztkel, ztc, ztc2, zpres, ztr 
+      REAL(wp) :: zsal, zsal2, zsqrt, zsal15  
+      REAL(wp) :: zis, zis2, zisqrt          
+      REAL(wp) :: zdens0, zaw, zbw, zcw    
+      REAL(wp) :: zbuf1, zbuf2 
+      REAL(wp) :: zcpexp, zcpexp2
+      REAL(wp) :: zck1p, zck2p, zck3p, zcksi   
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   zchem_data
 
 #endif
@@ -213 +202 @@
 #else
       ! reading variables
-      zchem_data(:,:,:) = 0.
+      ALLOCATE( zchem_data(jpi,jpj,6) )   ;   zchem_data(:,:,:) = 0.
+
       DO jj = 1,jpj
          DO ji = 1, jpi
@@ -234 +224 @@
       CALL pack_arr ( jpoce, aksps (1:jpoce), zchem_data(1:jpi,1:jpj,5), iarroce(1:jpoce) )
       CALL pack_arr ( jpoce, borats(1:jpoce), zchem_data(1:jpi,1:jpj,6), iarroce(1:jpoce) )
+
+      DEALLOCATE( zchem_data )
 
       DO ji = 1, jpoce
@@ -320 +312 @@
          calcon2(ji) = 0.01028 * ( salt(ji) / 35. ) * densSW(ji)
       ENDDO
+
+       
 #endif
 
@@ -337 +331 @@
       !!----------------------------------------------------------------------  
       !! * Local declarations
-      INTEGER :: &
-         ji
-
-      REAL(wp) :: &
-         ztkel, ztc, ztc2, zpres, ztr ,   &
-         zsal, zsal2, zsqrt, zsal15   ,   &
-         zis, zis2, zisqrt            ,   &
-         zdens0, zaw, zbw, zcw        ,   &
-         zchl, zst, zft, zbuf1, zbuf2 ,   & 
-         zcpexp, zcpexp2              ,   &
-         zckb, zck1, zck2, zckw       ,   &
-         zck1p, zck2p, zck3p, zcksi   ,   &
-         zak1, zak2, zakb, zakw       ,   &        
-         zaksp0, zksp, zks, zkf 
+      INTEGER :: ji
+
+      REAL(wp) ::  ztkel, ztc, ztc2, zpres, ztr 
+      REAL(wp) ::  zsal, zsal2, zsqrt, zsal15   
+      REAL(wp) ::  zis, zis2, zisqrt            
+      REAL(wp) ::  zdens0, zaw, zbw, zcw        
+      REAL(wp) ::  zchl, zst, zft, zbuf1, zbuf2 
+      REAL(wp) ::  zcpexp, zcpexp2              
+      REAL(wp) ::  zckb, zck1, zck2, zckw       
+      REAL(wp) ::  zck1p, zck2p, zck3p, zcksi   
+      REAL(wp) ::  zak1, zak2, zakb, zakw              
+      REAL(wp) ::  zaksp0, zksp, zks, zkf