Ignore:
Timestamp:
Jun 14, 2015, 9:13:32 PM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes -r2237:2291 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/ocean_forced_mod.F90

    r1999 r2298  
    1313  SUBROUTINE ocean_forced_noice( &
    1414       itime, dtime, jour, knon, knindex, &
    15        p1lay, cdragh, cdragm, precip_rain, precip_snow, &
     15       p1lay, cdragh, cdragq, cdragm, precip_rain, precip_snow, &
    1616       temp_air, spechum, &
    1717       AcoefH, AcoefQ, BcoefH, BcoefQ, &
    1818       AcoefU, AcoefV, BcoefU, BcoefV, &
    19        ps, u1, v1, &
     19       ps, u1, v1, gustiness, &
    2020       radsol, snow, agesno, &
    2121       qsurf, evap, fluxsens, fluxlat, flux_u1, flux_v1, &
    … …  
    3333    USE indice_sol_mod
    3434    INCLUDE "YOMCST.h"
     35    INCLUDE "clesphys.h"
     36
    3537
    3638! Input arguments
    … …  
    4042    REAL, INTENT(IN)                         :: dtime
    4143    REAL, DIMENSION(klon), INTENT(IN)        :: p1lay
    42     REAL, DIMENSION(klon), INTENT(IN)        :: cdragh, cdragm
     44    REAL, DIMENSION(klon), INTENT(IN)        :: cdragh, cdragq, cdragm
    4345    REAL, DIMENSION(klon), INTENT(IN)        :: precip_rain, precip_snow
    4446    REAL, DIMENSION(klon), INTENT(IN)        :: temp_air, spechum
    … …  
    4648    REAL, DIMENSION(klon), INTENT(IN)        :: AcoefU, AcoefV, BcoefU, BcoefV
    4749    REAL, DIMENSION(klon), INTENT(IN)        :: ps
    48     REAL, DIMENSION(klon), INTENT(IN)        :: u1, v1
     50    REAL, DIMENSION(klon), INTENT(IN)        :: u1, v1, gustiness
    4951
    5052! In/Output arguments
    … …  
    109111! Calcul de tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l and qsurf
    110112    CALL calcul_fluxs(knon, is_oce, dtime, &
    111          tsurf_lim, p1lay, cal, beta, cdragh, ps, &
     113         tsurf_lim, p1lay, cal, beta, cdragh, cdragq, ps, &
    112114         precip_rain, precip_snow, snow, qsurf,  &
    113          radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, &
    114          AcoefH, AcoefQ, BcoefH, BcoefQ, &
     115         radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, gustiness, &
     116         f_qsat_oce,AcoefH, AcoefQ, BcoefH, BcoefQ, &
    115117         tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
    116118
    117119! - Flux calculation at first modele level for U and V
    118120    CALL calcul_flux_wind(knon, dtime, &
    119          u0, v0, u1, v1, cdragm, &
     121         u0, v0, u1, v1, gustiness, cdragm, &
    120122         AcoefU, AcoefV, BcoefU, BcoefV, &
    121123         p1lay, temp_air, &
    … …  
    131133       AcoefH, AcoefQ, BcoefH, BcoefQ, &
    132134       AcoefU, AcoefV, BcoefU, BcoefV, &
    133        ps, u1, v1, &
     135       ps, u1, v1, gustiness, &
    134136       radsol, snow, qsol, agesno, tsoil, &
    135137       qsurf, alb1_new, alb2_new, evap, fluxsens, fluxlat, flux_u1, flux_v1, &
    … …  
    165167    REAL, DIMENSION(klon), INTENT(IN)    :: AcoefU, AcoefV, BcoefU, BcoefV
    166168    REAL, DIMENSION(klon), INTENT(IN)    :: ps
    167     REAL, DIMENSION(klon), INTENT(IN)    :: u1, v1
     169    REAL, DIMENSION(klon), INTENT(IN)    :: u1, v1, gustiness
    168170
    169171! In/Output arguments
    … …  
    231233    v1_lay(:) = v1(:) - v0(:)
    232234    CALL calcul_fluxs(knon, is_sic, dtime, &
    233          tsurf_tmp, p1lay, cal, beta, cdragh, ps, &
     235         tsurf_tmp, p1lay, cal, beta, cdragh, cdragh, ps, &
    234236         precip_rain, precip_snow, snow, qsurf,  &
    235          radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, &
    236          AcoefH, AcoefQ, BcoefH, BcoefQ, &
     237         radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, gustiness, &
     238         f_qsat_oce,AcoefH, AcoefQ, BcoefH, BcoefQ, &
    237239         tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
    238240
    239241! - Flux calculation at first modele level for U and V
    240242    CALL calcul_flux_wind(knon, dtime, &
    241          u0, v0, u1, v1, cdragm, &
     243         u0, v0, u1, v1, gustiness, cdragm, &
    242244         AcoefU, AcoefV, BcoefU, BcoefV, &
    243245         p1lay, temp_air, &
Note: See TracChangeset for help on using the changeset viewer.