Changeset 1857 for branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/LIM_SRC_2/limdia_2.F90

Timestamp:

2010-05-03T13:59:46+02:00 (14 years ago)

Author:

gm

Message:

ticket:#665 Reverting previous commit and going back to revision 1850

File:

• branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/LIM_SRC_2/limdia_2.F90 (modified) (7 diffs)

branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/LIM_SRC_2/limdia_2.F90

@@ -12 +12 @@
    !!   'key_lim2' :                                  LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
    !!   lim_dia_2      : computation of the time evolution of keys var.
    !!   lim_dia_init_2 : initialization and namelist read
@@ -27 +28 @@
    PRIVATE
 
-   PUBLIC   lim_dia_2   ! called by sbc_ice_lim_2
-   
-   INTEGER, PUBLIC ::   ntmoy   = 1   !: instantaneous values of ice evolution or averaging ntmoy
-   INTEGER, PUBLIC ::   ninfo   = 1   !: frequency of ouputs on file ice_evolu in case of averaging
-
-   !                                              !!! Parameters for outputs to files "evolu"
-   INTEGER, PARAMETER ::   jpinfmx = 100           ! maximum number of key variables
-   INTEGER, PARAMETER ::   jpchinf = 5             ! ???
-   INTEGER, PARAMETER ::   jpchsep = jpchinf + 2   ! ???
-
-   INTEGER ::   nfrinf  = 4   ! number of variables written in one line 
-   INTEGER ::   nferme        ! last time step at which the var. are written on file
-   INTEGER ::   nvinfo        ! number of total variables 
-   INTEGER ::   nbvt          ! number of time variables
-   INTEGER ::   naveg         ! number of step for accumulation before averaging
-
-   CHARACTER(len= 8) ::   fmtinf  = '1PE13.5 '   ! format of the output values  
-   CHARACTER(len=30) ::   fmtw, fmtr, fmtitr     ! various formats
-   CHARACTER(len=jpchsep), DIMENSION(jpinfmx) ::   titvar   ! title of key variables
+   PUBLIC               lim_dia_2          ! called by sbc_ice_lim_2
+   INTEGER, PUBLIC ::   ntmoy   = 1 ,   &  !: instantaneous values of ice evolution or averaging ntmoy
+      &                 ninfo   = 1        !: frequency of ouputs on file ice_evolu in case of averaging
+
+   INTEGER, PARAMETER ::   &  ! Parameters for outputs to files "evolu"
+      jpinfmx = 100         ,    &  ! maximum number of key variables
+      jpchinf = 5           ,    &  ! ???
+      jpchsep = jpchinf + 2         ! ???
+
+   INTEGER ::   &
+      nfrinf  = 4 ,     &  ! number of variables written in one line 
+      nferme ,          &  ! last time step at which the var. are written on file
+      nvinfo ,          &  ! number of total variables 
+      nbvt   ,          &  ! number of time variables
+      naveg                ! number of step for accumulation before averaging
+
+   CHARACTER(len= 8) ::   fmtinf  = '1PE13.5 ' ! format of the output values  
+   CHARACTER(len=30) ::   fmtw  ,           &  ! formats
+      &                   fmtr  ,           &  ! ???
+      &                   fmtitr               ! ???
+   CHARACTER(len=jpchsep), DIMENSION(jpinfmx) ::   titvar               ! title of key variables
  
    REAL(wp)                     ::   epsi06 = 1.e-06      ! ???
@@ -54 +57 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/LIM 3.3,  UCL-LOCEAN-IPSL (2010) 
+   !!   LIM 2.0,  UCL-LOCEAN-IPSL (2005) 
    !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -68 +71 @@
       !!      the temporal evolution of some key variables
       !!-------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   kt   ! number of iteration
+      INTEGER, INTENT(in) ::   kt     ! number of iteration
       !!
       INTEGER  ::   jv,ji, jj   ! dummy loop indices
       INTEGER  ::   nv          ! indice of variable 
-      REAL(wp) ::   zarea    , zldarea     ! sea-ice and leads area
-      REAL(wp) ::   zextent15, zextent85   ! sea-ice extent (15% and 85%)
-      REAL(wp) ::   zicevol  , zsnwvol     ! sea-ice and snow volume volume
-      REAL(wp) ::   zicespd                     ! sea-ice velocity
+      REAL(wp) ::   zarea    , zldarea  ,    &  ! sea-ice and leads area
+         &          zextent15, zextent85,    &  ! sea-ice extent (15% and 85%)
+         &          zicevol  , zsnwvol  ,    &  ! sea-ice and snow volume volume
+         &          zicespd                     ! sea-ice velocity
       REAL(wp), DIMENSION(jpinfmx) ::   vinfor  ! temporary working space 
       !!-------------------------------------------------------------------
@@ -117 +120 @@
       vinfor(nv+13) = SQRT( vinfor(nv+13) / MAX( vinfor(nv+9) , epsi06 ) )
 
+
       ! variables in southern Hemis
        nv = nv + 1
@@ -173 +177 @@
        INTEGER  ::   nv            ! indice of variable 
        REAL(wp) ::   zxx0, zxx1    ! temporary scalars
-       !!
+
        NAMELIST/namicedia/fmtinf, nfrinf, ninfo, ntmoy
        !!-------------------------------------------------------------------
 
-       REWIND ( numnam_ice )                 ! Read Namelist namicedia
+       ! Read Namelist namicedia
+       REWIND ( numnam_ice )
        READ   ( numnam_ice  , namicedia )
        
-       IF(lwp) THEN                          ! control print
+       IF(lwp) THEN
           WRITE(numout,*)
           WRITE(numout,*) 'lim_dia_init_2 : ice parameters for ice diagnostics '
@@ -269 +274 @@
    !!   Default option :                           NO LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
+CONTAINS
+   SUBROUTINE lim_dia_2         ! Empty routine
+   END SUBROUTINE lim_dia_2
 #endif