Changeset 886 for branches/dev_001_SBC/NEMO/LIM_SRC_2

Timestamp:

2008-04-11T11:24:17+02:00 (16 years ago)

Author:

ctlod

Message:

dev_001_SBC: Step II: adapt new SBC to LIM 3.0 component, see ticket: #112

Location:

branches/dev_001_SBC/NEMO/LIM_SRC_2

Files:

• limsbc_2.F90 (modified) (2 diffs)
• limwri_dimg_2.h90 (modified) (2 diffs)

branches/dev_001_SBC/NEMO/LIM_SRC_2/limsbc_2.F90

@@ -85 +85 @@
 #if defined key_coupled    
       REAL(wp), DIMENSION(jpi,jpj) ::   zalb     ! albedo of ice under overcast sky
-      REAL(wp), DIMENSION(jpi,jpj) ::   zalcn    ! albedo of ocean under overcast sky
       REAL(wp), DIMENSION(jpi,jpj) ::   zalbp    ! albedo of ice under clear sky
-      REAL(wp), DIMENSION(jpi,jpj) ::   zaldum   ! albedo of ocean under clear sky
 #endif
       REAL(wp) ::   zsang, zmod, zfm
@@ -224 +222 @@
       !------------------------------------------------!
       zalb  (:,:) = 0.e0
-      zalcn (:,:) = 0.e0
       zalbp (:,:) = 0.e0
-      zaldum(:,:) = 0.e0
-
-      CALL blk_albedo( zalb, zalcn, zalbp, zaldum )
+
+      CALL albedo_ice( sist, hicif, hsnif, zalbp, zalb )
 
       alb_ice(:,:) =  0.5 * zalbp(:,:) + 0.5 * zalb (:,:)   ! Ice albedo (mean clear and overcast skys)

branches/dev_001_SBC/NEMO/LIM_SRC_2/limwri_dimg_2.h90

@@ -123 +123 @@
           zcmo(ji,jj,15) = utaui_ice(ji,jj)
           zcmo(ji,jj,16) = vtaui_ice(ji,jj)
-          zcmo(ji,jj,17) = qsr_ice (ji,jj)
-          zcmo(ji,jj,18) = qnsr_ice(ji,jj)
+          zcmo(ji,jj,17) = qsr_ice(ji,jj)
+          zcmo(ji,jj,18) = qns_ice(ji,jj)
           zcmo(ji,jj,19) = sprecip(ji,jj)
        END DO
@@ -166 +166 @@
                 rcmoy(ji,jj,15) = utaui_ice(ji,jj)
                 rcmoy(ji,jj,16) = vtaui_ice(ji,jj)
-                rcmoy(ji,jj,17) = qsr_ice (ji,jj)
-                rcmoy(ji,jj,18) = qnsr_ice(ji,jj)
+                rcmoy(ji,jj,17) = qsr_ice(ji,jj)
+                rcmoy(ji,jj,18) = qns_ice(ji,jj)
                 rcmoy(ji,jj,19) = sprecip(ji,jj)
              END DO