Changeset 236 for LMDZ.3.3/branches/rel-LF

Timestamp:

Jun 21, 2001, 9:47:51 AM (23 years ago)

Author:

lmdzadmin

Message:

Inclus nouveau soil dans interface_surf
LF

File:

• LMDZ.3.3/branches/rel-LF/libf/phylmd/interface_surf.F90 (modified) (5 diffs)

LMDZ.3.3/branches/rel-LF/libf/phylmd/interface_surf.F90

@@ -184 +184 @@
   logical, save        :: first_call = .true.
   integer, save        :: error
-  integer              :: ii
+  integer              :: ii, index
   logical,save              :: check = .true.
   real, dimension(klon):: cal, beta, dif_grnd, capsol
@@ -303 +303 @@
      & klon, nisurf, knon, knindex, debut,  &
      & alb_new, z0_new)
-!
-!
-       DO ii = 1, knon
-         alb_neig(ii) = alb_neig_grid(knindex(ii))
-       enddo
-       zfra = MAX(0.0,MIN(1.0,snow/(snow+10.0)))
-       alb_new = alb_neig*zfra + alb_new*(1.0-zfra)
-       z0_new = SQRT(z0_new**2+rugoro**2)
-!
-       CALL albsno(klon,agesno,alb_neig_grid)  
-  
+!  
 ! calcul snow et qsol, hydrol adapté
 !
+       CALL calbeta(dtime, nisurf, knon, snow, qsol, beta, capsol, dif_grnd)
+
        IF (soil_model) THEN 
-           CALL soil(dtime, nisurf, snow, tsurf, tsoil,soilcap, soilflux)
-           cal = RCPD / soilcap
-           radsol = radsol + soilflux
+           CALL soil(dtime, nisurf, knon,snow, tsurf, tsoil,soilcap, soilflux)
+           cal(1:knon) = RCPD / soilcap(1:knon)
+           radsol(1:knon) = radsol(1:knon)  + soilflux(1:knon)
+!!$           WRITE(*,*) 'radsol'
+!!$           WRITE(*,*) radsol(1 : knon)
+!!$           WRITE(*,*) 'soilflux'
+!!$           WRITE(*,*) soilflux(1 : knon)
        ELSE 
-           CALL calbeta(dtime, nisurf, knon, snow, qsol, beta, capsol, dif_grnd)
 !      if (check) write(*,*)'Sortie calbeta'
 !      if (check) write(*,*)'RCPD = ',RCPD,' capsol = '
@@ -341 +336 @@
      &   petAcoef, peqAcoef, petBcoef, peqBcoef, &
      &   tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
+
+       DO ii = 1, knon
+         index = knindex(ii)
+         alb_neig(ii) = alb_neig_grid(index)
+         agesno(index)  = (agesno(index) + (1.-agesno(index)/50.)*dtime/86400.)&
+            &             * EXP(-1.*MAX(0.0,precip_snow(ii))*dtime/0.3)
+         agesno(index) = MAX(agesno(index),0.0)
+         IF(snow(ii) .LT. 0.0001) agesno(index) = 0.
+       ENDDO
+       zfra = MAX(0.0,MIN(1.0,snow/(snow+10.0)))
+       alb_new = alb_neig*zfra + alb_new*(1.0-zfra)
+       z0_new = SQRT(z0_new**2+rugoro**2)
 
     else
@@ -544 +551 @@
 ! calcul albedo
 !
-    zfra = MAX(0.0,MIN(1.0,snow/(snow+10.0)))
-    DO ii = 1, knon
-      alb_neig(ii) = alb_neig_grid(knindex(ii))
-    enddo
-    alb_new = alb_neig*zfra + 0.6 * (1.0-zfra)
-
-    z0_new = 0.001
+!
+      zfra = MAX(0.0,MIN(1.0,snow/(snow+10.0)))
+      DO ii = 1, knon
+        index = knindex(ii)
+        alb_neig(ii) = alb_neig_grid(index)
+      ENDDO
+      alb_new = alb_neig*zfra + 0.6 * (1.0-zfra)
+      
+      z0_new = 0.001
 
   else if (nisurf == is_lic) then
@@ -594 +603 @@
     zfra = MAX(0.0,MIN(1.0,snow/(snow+10.0)))
     DO ii = 1, knon
-      alb_neig(ii) = alb_neig_grid(knindex(ii))
-    enddo
+      index = knindex(ii)
+      alb_neig(ii) = alb_neig_grid(index)
+      agesno(index)  = (agesno(index) + (1.-agesno(index)/50.)*dtime/86400.)&
+         &             * EXP(-1.*MAX(0.0,precip_snow(ii))*dtime/0.3)
+      agesno(index) = MAX(agesno(index),0.0)
+        IF(snow(ii) .LT. 0.0001) agesno(index) = 0.
+    ENDDO
     alb_new = alb_neig*zfra + 0.6 * (1.0-zfra)
 !