Changeset 1559 for trunk/NEMO/LIM_SRC_2

Timestamp:

2009-07-29T16:03:14+02:00 (15 years ago)

Author:

ctlod

Message:

only cosmetic changes

File:

• trunk/NEMO/LIM_SRC_2/limthd_2.F90 (modified) (6 diffs)

trunk/NEMO/LIM_SRC_2/limthd_2.F90

@@ -4 +4 @@
    !!              LIM thermo ice model : ice thermodynamic
    !!======================================================================
-   !! History :  1.0  !  00-01 (LIM)
-   !!            2.0  !  02-07 (C. Ethe, G. Madec) F90
-   !!            2.0  !  03-08 (C. Ethe)  add lim_thd_init
-   !!             -   !  08-2008  (A. Caubel, G. Madec, E. Maisonnave, S. Masson ) generic coupled interface
+   !! History :  1.0  ! 2000-01 (LIM)
+   !!            2.0  ! 2002-07 (C. Ethe, G. Madec) F90
+   !!            2.0  ! 2003-08 (C. Ethe)  add lim_thd_init
+   !!             -   ! 2008-2008  (A. Caubel, G. Madec, E. Maisonnave, S. Masson ) generic coupled interface
    !!---------------------------------------------------------------------
 #if defined key_lim2
@@ -47 +47 @@
 #  include "vectopt_loop_substitute.h90"
    !!-------- -------------------------------------------------------------
-   !! NEMO/LIM 2.0,  UCL-LOCEAN-IPSL (2008) 
+   !! NEMO/LIM 3.2,  UCL-LOCEAN-IPSL (2009) 
    !! $Id$
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
@@ -82 +82 @@
       REAL(wp) ::   zinda                ! switch for test. the val. of concen.
       REAL(wp) ::   zindb, zindg         ! switches for test. the val of arg
+      REAL(wp) ::   zfricp               ! temporary scalar
       REAL(wp) ::   za , zh, zthsnice    !
       REAL(wp) ::   zfric_u              ! friction velocity 
@@ -87 +88 @@
       REAL(wp) ::   zfontn               ! heat flux from snow thickness
       REAL(wp) ::   zfntlat, zpareff     ! test. the val. of lead heat budget
-      REAL(wp) ::   zfi                  ! temporary scalar
-      REAL(wp), DIMENSION(jpi,jpj)     ::   ztmp      ! working array
+      REAL(wp), DIMENSION(jpi,jpj)     ::   ztmp      ! 2D workspace
       REAL(wp), DIMENSION(jpi,jpj)     ::   zqlbsbq   ! link with lead energy budget qldif
-      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zmsk      ! working array
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zmsk      ! 3D workspace
       !!-------------------------------------------------------------------
 
@@ -179 +179 @@
             zindb          = tms(ji,jj) * ( 1.0 - MAX( rzero , SIGN( rone , - zthsnice ) ) ) 
             pfrld(ji,jj)   = frld(ji,jj)
-            zinda          = 1.0 - MAX( rzero , SIGN( rone , - ( 1.0 - pfrld(ji,jj) ) ) )
+            zfricp         = 1.0 - frld(ji,jj)
+            zinda          = 1.0 - MAX( rzero , SIGN( rone , - zfricp ) )
             
             !  solar irradiance transmission at the mixed layer bottom and used in the lead heat budget
@@ -192 +193 @@
             !  partial computation of the lead energy budget (qldif)
 #if defined key_coupled 
-            zfi = 1.0 - pfrld(ji,jj)
             qldif(ji,jj)   = tms(ji,jj) * rdt_ice                                             &
-               &    * (   ( qsr_tot(ji,jj) - qsr_ice(ji,jj,1) * zfi ) * ( 1.0 - thcm(ji,jj) )   &
-               &        + ( qns_tot(ji,jj) - qns_ice(ji,jj,1) * zfi )                           &
+               &    * (   ( qsr_tot(ji,jj) - qsr_ice(ji,jj,1) * zfricp ) * ( 1.0 - thcm(ji,jj) )   &
+               &        + ( qns_tot(ji,jj) - qns_ice(ji,jj,1) * zfricp )                           &
                &        + frld(ji,jj) * ( fdtcn(ji,jj) + ( 1.0 - zindb ) * fsbbq(ji,jj) )   )
 #else