Changeset 2298 for LMDZ5/branches/testing/libf/phylmd/calcul_fluxs_mod.F90

Timestamp:

Jun 14, 2015, 9:13:32 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/calcul_fluxs_mod.F90 (modified) (12 diffs)

LMDZ5/branches/testing/libf/phylmd/calcul_fluxs_mod.F90

@@ -5 +5 @@
 CONTAINS
   SUBROUTINE calcul_fluxs( knon, nisurf, dtime, &
-       tsurf, p1lay, cal, beta, coef1lay, ps, &
+       tsurf, p1lay, cal, beta, cdragh, cdragq, ps, &
        precip_rain, precip_snow, snow, qsurf, &
-       radsol, dif_grnd, t1lay, q1lay, u1lay, v1lay, &
-       petAcoef, peqAcoef, petBcoef, peqBcoef, &
+       radsol, dif_grnd, t1lay, q1lay, u1lay, v1lay, gustiness, &
+       fqsat, petAcoef, peqAcoef, petBcoef, peqBcoef, &
        tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
     
     USE dimphy, ONLY : klon
     USE indice_sol_mod
+
+    INCLUDE "clesphys.h"
 
 ! Cette routine calcule les fluxs en h et q a l'interface et eventuellement
@@ -26 +28 @@
 !   cal          capacite calorifique du sol
 !   beta         evap reelle
-!   coef1lay     coefficient d'echange
+!   cdragh       coefficient d'echange temperature
+!   cdragq       coefficient d'echange evaporation
 !   ps           pression au sol
 !   precip_rain  precipitations liquides
@@ -59 +62 @@
     REAL, DIMENSION(klon), INTENT(IN)    :: petBcoef, peqBcoef
     REAL, DIMENSION(klon), INTENT(IN)    :: ps, q1lay
-    REAL, DIMENSION(klon), INTENT(IN)    :: tsurf, p1lay, cal, beta, coef1lay
+    REAL, DIMENSION(klon), INTENT(IN)    :: tsurf, p1lay, cal, beta, cdragh,cdragq
     REAL, DIMENSION(klon), INTENT(IN)    :: precip_rain, precip_snow ! pas utiles
     REAL, DIMENSION(klon), INTENT(IN)    :: radsol, dif_grnd
-    REAL, DIMENSION(klon), INTENT(IN)    :: t1lay, u1lay, v1lay
+    REAL, DIMENSION(klon), INTENT(IN)    :: t1lay, u1lay, v1lay,gustiness
+    REAL,                  INTENT(IN)    :: fqsat ! correction factor on qsat (generally 0.98 over salty water, 1 everywhere else)
 
 ! Parametres entree-sorties
@@ -79 +83 @@
     REAL, DIMENSION(klon)                :: zx_mh, zx_nh, zx_oh
     REAL, DIMENSION(klon)                :: zx_mq, zx_nq, zx_oq
-    REAL, DIMENSION(klon)                :: zx_pkh, zx_dq_s_dt, zx_qsat, zx_coef
-    REAL, DIMENSION(klon)                :: zx_sl, zx_k1
+    REAL, DIMENSION(klon)                :: zx_pkh, zx_dq_s_dt, zx_qsat
+    REAL, DIMENSION(klon)                :: zx_sl, zx_coefh, zx_coefq, zx_wind
     REAL, DIMENSION(klon)                :: d_ts
     REAL                                 :: zdelta, zcvm5, zx_qs, zcor, zx_dq_s_dh
@@ -125 +129 @@
     fluxlat=0.
     dflux_s = 0.
-    dflux_l = 0.        
+    dflux_l = 0.
 !
 ! zx_qs = qsat en kg/kg
@@ -154 +158 @@
        zx_dq_s_dt(i) = RCPD * zx_pkh(i) * zx_dq_s_dh
        zx_qsat(i) = zx_qs
-       zx_coef(i) = coef1lay(i) * &
-            (1.0+SQRT(u1lay(i)**2+v1lay(i)**2)) * &
-            p1lay(i)/(RD*t1lay(i))
-       
+       zx_wind(i)=min_wind_speed+SQRT(gustiness(i)+u1lay(i)**2+v1lay(i)**2)
+       zx_coefh(i) = cdragh(i) * zx_wind(i) * p1lay(i)/(RD*t1lay(i))
+       zx_coefq(i) = cdragq(i) * zx_wind(i) * p1lay(i)/(RD*t1lay(i))
+!      zx_wind(i)=min_wind_speed+SQRT(gustiness(i)+u1lay(i)**2+v1lay(i)**2) &
+!                * p1lay(i)/(RD*t1lay(i))
+!      zx_coefh(i) = cdragh(i) * zx_wind(i)
+!      zx_coefq(i) = cdragq(i) * zx_wind(i)
     ENDDO
 
@@ -168 +175 @@
        zx_sl(i) = RLVTT
        IF (tsurf(i) .LT. RTT) zx_sl(i) = RLSTT
-       zx_k1(i) = zx_coef(i)
     ENDDO
     
@@ -174 +180 @@
     DO i = 1, knon
 ! Q
-       zx_oq(i) = 1. - (beta(i) * zx_k1(i) * peqBcoef(i) * dtime)
-       zx_mq(i) = beta(i) * zx_k1(i) * &
-            (peqAcoef(i) - zx_qsat(i) + &
-            zx_dq_s_dt(i) * tsurf(i)) &
+       zx_oq(i) = 1. - (beta(i) * zx_coefq(i) * peqBcoef(i) * dtime)
+       zx_mq(i) = beta(i) * zx_coefq(i) * &
+            (peqAcoef(i) -             &
+! conv num avec precedente version
+            fqsat * zx_qsat(i) + fqsat * zx_dq_s_dt(i) * tsurf(i))  &
+!           fqsat * ( zx_qsat(i) - zx_dq_s_dt(i) * tsurf(i)) ) &
             / zx_oq(i)
-       zx_nq(i) = beta(i) * zx_k1(i) * (-1. * zx_dq_s_dt(i)) &
+       zx_nq(i) = beta(i) * zx_coefq(i) * (- fqsat * zx_dq_s_dt(i)) &
             / zx_oq(i)
        
 ! H
-       zx_oh(i) = 1. - (zx_k1(i) * petBcoef(i) * dtime)
-       zx_mh(i) = zx_k1(i) * petAcoef(i) / zx_oh(i)
-       zx_nh(i) = - (zx_k1(i) * RCPD * zx_pkh(i))/ zx_oh(i)
+       zx_oh(i) = 1. - (zx_coefh(i) * petBcoef(i) * dtime)
+       zx_mh(i) = zx_coefh(i) * petAcoef(i) / zx_oh(i)
+       zx_nh(i) = - (zx_coefh(i) * RCPD * zx_pkh(i))/ zx_oh(i)
      
 ! Tsurface
@@ -244 +252 @@
 !
   SUBROUTINE calcul_flux_wind(knon, dtime, &
-       u0, v0, u1, v1, cdrag_m, &
+       u0, v0, u1, v1, gustiness, cdrag_m, &
        AcoefU, AcoefV, BcoefU, BcoefV, &
        p1lay, t1lay, &
@@ -251 +259 @@
     USE dimphy
     INCLUDE "YOMCST.h"
+    INCLUDE "clesphys.h"
 
 ! Input arguments
@@ -257 +266 @@
     REAL, INTENT(IN)                     :: dtime
     REAL, DIMENSION(klon), INTENT(IN)    :: u0, v0  ! u and v at niveau 0
-    REAL, DIMENSION(klon), INTENT(IN)    :: u1, v1  ! u and v at niveau 1
+    REAL, DIMENSION(klon), INTENT(IN)    :: u1, v1, gustiness  ! u and v at niveau 1
     REAL, DIMENSION(klon), INTENT(IN)    :: cdrag_m ! cdrag pour momentum
     REAL, DIMENSION(klon), INTENT(IN)    :: AcoefU, AcoefV, BcoefU, BcoefV
@@ -277 +286 @@
 !****************************************************************************************
     DO i=1,knon
-       mod_wind = 1.0 + SQRT((u1(i) - u0(i))**2 + (v1(i)-v0(i))**2)
+       mod_wind = min_wind_speed + SQRT(gustiness(i)+(u1(i) - u0(i))**2 + (v1(i)-v0(i))**2)
        buf = cdrag_m(i) * mod_wind * p1lay(i)/(RD*t1lay(i))
        flux_u1(i) = (AcoefU(i) - u0(i)) / (1/buf - BcoefU(i)*dtime )