Changeset 2813 for branches/2011/dev_r2802_UKMO8_sbccpl/NEMOGCM/NEMO/LIM_SRC_2

Timestamp:

2011-07-21T14:33:51+02:00 (13 years ago)

Author:

charris

Message:

#662 First set of changes - more details in ticket.

File:

• branches/2011/dev_r2802_UKMO8_sbccpl/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90 (modified) (2 diffs)

branches/2011/dev_r2802_UKMO8_sbccpl/NEMOGCM/NEMO/LIM_SRC_2/limsbc_2.F90

@@ -27 +27 @@
    USE sbc_ice          ! surface boundary condition: ice
    USE sbc_oce          ! surface boundary condition: ocean
+   USE sbccpl
 
    USE albedo           ! albedo parameters
@@ -234 +235 @@
       !-----------------------------------------------!
 
-      IF( lk_cpl ) THEN          ! coupled case
-         tn_ice(:,:,1) = sist(:,:)          ! sea-ice surface temperature       
-         !                                  ! Computation of snow/ice and ocean albedo
-         CALL albedo_ice( tn_ice, 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)
-         CALL iom_put( "icealb_cea", alb_ice(:,:,1) * fr_i(:,:) )  ! ice albedo
-      ENDIF
+#if defined key_coupled
+      tn_ice(:,:,1) = sist(:,:)          ! sea-ice surface temperature       
+      ht_i(:,:,1) = hicif(:,:)
+      ht_s(:,:,1) = hsnif(:,:)
+      a_i(:,:,1) = fr_i(:,:)
+      !                                  ! Computation of snow/ice and ocean albedo
+      CALL albedo_ice( tn_ice, ht_i, ht_s, zalbp, zalb )
+      alb_ice(:,:,1) =  0.5 * ( zalbp(:,:,1) + zalb (:,:,1) )   ! Ice albedo (mean clear and overcast skys)
+      CALL iom_put( "icealb_cea", alb_ice(:,:,1) * fr_i(:,:) )  ! ice albedo
+#endif
 
       IF(ln_ctl) THEN            ! control print