Changeset 1474 for trunk/NEMO

Timestamp:

2009-06-12T16:59:31+02:00 (15 years ago)

Author:

smasson

Message:

continue changeset:1463, see ticket:444

File:

• trunk/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) (3 diffs)

trunk/NEMO/LIM_SRC_2/limsbc_2.F90

@@ -90 +90 @@
       REAL(wp), DIMENSION(jpi,jpj,1) ::   zalb     ! albedo of ice under overcast sky
       REAL(wp), DIMENSION(jpi,jpj,1) ::   zalbp    ! albedo of ice under clear sky
-      REAL(wp), DIMENSION(jpi,jpj,1) ::   zsist    ! surface ice temperature (K)
-      REAL(wp), DIMENSION(jpi,jpj,1) ::   zhicif   ! ice thickness
-      REAL(wp), DIMENSION(jpi,jpj,1) ::   zhsnif   ! snow thickness
       REAL(wp) ::   zsang, zmod, zfm
       REAL(wp), DIMENSION(jpi,jpj) ::   ztio_u, ztio_v   ! ocean stress below sea-ice
@@ -281 +278 @@
       !-----------------------------------------------!
 
-      fr_i  (:,:) = 1.0 - frld(:,:)       ! sea-ice fraction
+      fr_i(:,:) = 1.0 - frld(:,:)       ! sea-ice fraction
 
       IF ( lk_cpl ) THEN           
@@ -287 +284 @@
          tn_ice(:,:,1) = sist(:,:)          ! sea-ice surface temperature       
          ! Computation of snow/ice and ocean albedo
-         ! INTERFACE 3D versus 2D
-         zsist (:,:,1) = sist (:,:)
-         zhicif(:,:,1) = hicif(:,:)   ;   zhsnif(:,:,1) = hsnif(:,:)
-         CALL albedo_ice( zsist, zhicif, zhsnif, zalbp, zalb )
+         CALL albedo_ice( tn_ice(:,:,1), reshape( hicif, (/jpi,jpj,1/) ), reshape( hsnif, (/jpi,jpj,1/) ), zalbp, zalb )
          alb_ice(:,:,1) =  0.5 * ( zalbp(:,:,1) + zalb (:,:,1) )   ! Ice albedo (mean clear and overcast skys)
       ENDIF