Changeset 1146 for LMDZ4/trunk/libf/phylmd/surf_land_mod.F90

Timestamp:

Apr 9, 2009, 12:11:35 PM (15 years ago)

Author:

Laurent Fairhead

Message:

Réintegration dans le tronc des modifications issues de la branche LMDZ-dev
comprises entre la révision 1074 et 1145
Validation: une simulation de 1 jour en séquentiel sur PC donne les mêmes
résultats entre la trunk et la dev
LF

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/surf_land_mod.F90 (modified) (4 diffs)

LMDZ4/trunk/libf/phylmd/surf_land_mod.F90

@@ -15 +15 @@
        AcoefU, AcoefV, BcoefU, BcoefV, & 
        pref, u1, v1, rugoro, pctsrf, &
+       lwdown_m, q2m, t2m, &
        snow, qsol, agesno, tsoil, &
        z0_new, alb1_new, alb2_new, evap, fluxsens, fluxlat, &
        qsurf, tsurf_new, dflux_s, dflux_l, &
-       flux_u1, flux_v1, & 
-       lwdown_m)
+       flux_u1, flux_v1 ) 
 
     USE dimphy
     USE surface_data, ONLY    : ok_veget
+
+#ifdef ORCHIDEE_NOOPENMP
+    USE surf_land_orchidee_noopenmp_mod
+#else
     USE surf_land_orchidee_mod
+#endif
     USE surf_land_bucket_mod
     USE calcul_fluxs_mod
@@ -53 +58 @@
     REAL, DIMENSION(klon), INTENT(IN)       :: rugoro
     REAL, DIMENSION(klon,nbsrf), INTENT(IN) :: pctsrf
-
     REAL, DIMENSION(klon), INTENT(IN)       :: lwdown_m  ! downwelling longwave radiation at mean surface
                                                          ! corresponds to previous sollwdown
+    REAL, DIMENSION(klon), INTENT(IN)       :: q2m, t2m
 
 ! In/Output variables
@@ -124 +129 @@
             cdragh, AcoefH, AcoefQ, BcoefH, BcoefQ, &
             precip_rain, precip_snow, lwdown_m, swnet, swdown, &
-            pref_tmp, &
+            pref_tmp, q2m, t2m, &
             evap, fluxsens, fluxlat, &              
             tsol_rad, tsurf_new, alb1_new, alb2_new, &
@@ -133 +138 @@
 !  
        DO i=1,knon
-          z0_new(i) = SQRT(z0_new(i)**2 + rugoro(i)**2)
+          z0_new(i) = MAX(1.5e-05,SQRT(z0_new(i)**2 + rugoro(i)**2))
        ENDDO