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

Timestamp:

Jan 12, 2001, 3:31:43 PM (23 years ago)

Author:

lmdzadmin

Message:

Changements necessaires pour l'appel a orchidee
LF

File:

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

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

@@ -54 +54 @@
       & tq_cdrag, petAcoef, peqAcoef, petBcoef, peqBcoef, &
       & precip_rain, precip_snow, lwdown, swnet, swdown, &
-      & fder, taux, tauy, rugos, &
+      & fder, taux, tauy, rugos, rugoro, &
       & albedo, snow, qsol, &
       & tsurf, p1lay, ps, radsol, &
@@ -115 +115 @@
 !   rugos        rugosite
 !   zmasq        masque terre/ocean
+!   rugoro       rugosite orographique
 !
 ! output:
@@ -152 +153 @@
   real, dimension(klon), intent(IN) :: radsol
   real, dimension(klon), intent(IN) :: zmasq
-  real, dimension(klon), intent(IN) :: fder, taux, tauy, rugos
+  real, dimension(klon), intent(IN) :: fder, taux, tauy, rugos, rugoro
   character (len = 6)  :: ocean
   integer              :: npas, nexca ! nombre et pas de temps couplage
@@ -281 +282 @@
        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
 !
@@ -445 +447 @@
 ! Rugosite
 !
-    z0_new = rugos
+    z0_new = rugoro
 !
 ! Remplissage des pourcentages de surface
@@ -943 +945 @@
         pctsrf_sav(:,is_oce) = pctsrf(:,is_oce) + pctsrf(:,is_sic)
       endwhere
-      where (abs(pctsrf_sav(:,is_oce)) .le. epsilon(pctsrf_sav(1,is_sic)))
+      where (abs(pctsrf_sav(:,is_oce)) .le. epsilon(pctsrf_sav(1,is_oce)))
         pctsrf_sav(:,is_sic) = pctsrf(:,is_oce) + pctsrf(:,is_sic)
         pctsrf_sav(:,is_oce) = 0.
@@ -1182 +1184 @@
   if ((jour - jour_lu) /= 0) deja_lu = .false.
   
-  if (check) write(*,*)modname,' :: jour_lu, deja_lu', jour_lu, deja_lu 
+  if (check) write(*,*)modname,' :: jour, jour_lu, deja_lu', jour, jour_lu, deja_lu 
   if (check) write(*,*)modname,' :: itime, lmt_pas ', itime, lmt_pas,dtime
 
@@ -1338 +1340 @@
     lmt_sst(ii) = sst_lu(knindex(ii))
   enddo
-! je peux pas utiliser la ligne suivante a cause du compilo Sun
-!  lmt_sst = sst_lu(knindex)
-  pctsrf_new = pct_tmp
+
+  pctsrf_new(:,is_oce) = pct_tmp(:,is_oce)
+  pctsrf_new(:,is_sic) = pct_tmp(:,is_sic)
 
   END SUBROUTINE interfoce_lim
@@ -1592 +1594 @@
       qsol = max_eau_sol
     else
-      snow = max(0.0, snow + (precip_snow - evap) * dtime)
+      snow = snow + (precip_snow * dtime)
+      where (snow > epsilon(snow)) snow = max(0.0, snow - (evap * dtime))
+!      snow = max(0.0, snow + (precip_snow - evap) * dtime)
       qsol = qsol + (precip_rain - evap) * dtime
     endif