Changeset 1857 for branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/LIM_SRC_2/limdmp_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/limdmp_2.F90 (modified) (5 diffs)

branches/DEV_r1837_mass_heat_salt_fluxes/NEMO/LIM_SRC_2/limdmp_2.F90

@@ -4 +4 @@
    !!  Ice model : restoring Ice thickness and Fraction leads
    !!======================================================================
-   !! History :   2.0  ! 2004-04 (S. Theetten) Original code
+   !! History :   2.0  !  04-04 (S. Theetten) Original code
    !!----------------------------------------------------------------------
 #if defined key_lim2   &&   defined key_tradmp
@@ -11 +11 @@
    !!   'key_tradmp'                                                Damping
    !!----------------------------------------------------------------------
-   !!   lim_dmp_2       : ice model damping
    !!----------------------------------------------------------------------
-   USE oce              ! ocean variables
-   USE dom_oce          ! ocean domain
-   USE phycst           ! physical constants
-   USE ice_2            ! LIM-2 variables
-   USE tradmp           ! traceur damping
-   USE in_out_manager   ! I/O manager
-   USE iom              !
+   !!   lim_dmp_2      : ice model damping
+   !!----------------------------------------------------------------------
+   USE in_out_manager  ! I/O manager
+   USE phycst          ! physical constants
+   USE ice_2
+   USE tradmp
+   USE dom_oce
+   USE oce
+   USE iom
    
    IMPLICIT NONE
@@ -26 +27 @@
    PUBLIC   lim_dmp_2     ! called by ice_step_2
    
-   INTEGER                        ::   nice1, nice2   ! first and second record used
-   INTEGER                        ::   inumice_dmp    ! logical unit for ice variables (damping)
-   REAL(wp), DIMENSION(jpi,jpj)   ::   hicif_dta      ! ice thickness at a given time
-   REAL(wp), DIMENSION(jpi,jpj)   ::   frld_dta       ! fraction lead at a given time
-   REAL(wp), DIMENSION(jpi,jpj,2) ::   hicif_data     ! ice thickness data at two consecutive times
-   REAL(wp), DIMENSION(jpi,jpj,2) ::   frld_data      ! fraction lead data at two consecutive times
+   INTEGER                        ::   nice1, nice2,  &  ! first and second record used
+      &                                inumice_dmp       ! logical unit for ice variables (damping)
+   REAL(wp), DIMENSION(jpi,jpj)   ::   hicif_dta  ,   &  ! ice thickness at a given time
+      &                                frld_dta          ! fraction lead at a given time
+   REAL(wp), DIMENSION(jpi,jpj,2) ::   hicif_data ,   &  ! ice thickness data at two consecutive times
+      &                                frld_data         ! fraction lead data at two consecutive times
 
    !! * Substitution
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/LIM 3.3,  UCL-LOCEAN-IPSL (2010) 
+   !!   LIM 2.0 , UCL-LOCEAN-IPSL  (2006)
    !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -43 +44 @@
 CONTAINS
 
-   SUBROUTINE lim_dmp_2( kt )
+   SUBROUTINE lim_dmp_2(kt)
       !!-------------------------------------------------------------------
       !!                   ***  ROUTINE lim_dmp_2 ***
@@ -52 +53 @@
       !! ** method  : the key_tradmp must be used to compute resto(:,:) coef.
       !!---------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   kt   ! ocean time-step
-      !!
-      INTEGER ::   ji, jj   ! dummy loop indices
+      INTEGER, INTENT(in) ::   kt     ! ocean time-step
+      !
+      INTEGER             ::   ji, jj         ! dummy loop indices
       !!---------------------------------------------------------------------
       !
       CALL dta_lim_2( kt )
-      !
+
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1   ! vector opt.
             hicif(ji,jj) = hicif(ji,jj) - rdt_ice * resto(ji,jj,1) * ( hicif(ji,jj) - hicif_dta(ji,jj) )
-            frld(ji,jj)  = frld (ji,jj) - rdt_ice * resto(ji,jj,1) * ( frld (ji,jj) - frld_dta (ji,jj) )  
+            frld(ji,jj)  = frld (ji,jj) - rdt_ice * resto(ji,jj,1) * ( frld(ji,jj)  - frld_dta (ji,jj) )  
          END DO
       END DO