Changeset 2298 for LMDZ5/branches/testing/libf/phylmd/ocean_cpl_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/ocean_cpl_mod.F90 (modified) (10 diffs)

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

@@ -46 +46 @@
        windsp, fder_old, &
        itime, dtime, knon, knindex, &
-       p1lay, cdragh, cdragm, precip_rain, precip_snow, temp_air, spechum, &
+       p1lay, cdragh, cdragq, cdragm, precip_rain, precip_snow, temp_air, spechum, &
        AcoefH, AcoefQ, BcoefH, BcoefQ, &
        AcoefU, AcoefV, BcoefU, BcoefV, &
-       ps, u1, v1, &
+       ps, u1, v1, gustiness, &
        radsol, snow, agesno, &
        qsurf, evap, fluxsens, fluxlat, flux_u1, flux_v1, &
@@ -65 +65 @@
 
     INCLUDE "YOMCST.h"
+    INCLUDE "clesphys.h"
 !    
 ! Input arguments  
@@ -77 +78 @@
     REAL, DIMENSION(klon), INTENT(IN)        :: fder_old
     REAL, DIMENSION(klon), INTENT(IN)        :: p1lay
-    REAL, DIMENSION(klon), INTENT(IN)        :: cdragh, cdragm
+    REAL, DIMENSION(klon), INTENT(IN)        :: cdragh, cdragq, cdragm
     REAL, DIMENSION(klon), INTENT(IN)        :: precip_rain, precip_snow
     REAL, DIMENSION(klon), INTENT(IN)        :: temp_air, spechum
@@ -83 +84 @@
     REAL, DIMENSION(klon), INTENT(IN)        :: AcoefU, AcoefV, BcoefU, BcoefV
     REAL, DIMENSION(klon), INTENT(IN)        :: ps
-    REAL, DIMENSION(klon), INTENT(IN)        :: u1, v1
+    REAL, DIMENSION(klon), INTENT(IN)        :: u1, v1, gustiness
 
 ! In/Output arguments
@@ -136 +137 @@
 
     CALL calcul_fluxs(knon, is_oce, dtime, &
-         tsurf_cpl, p1lay, cal, beta, cdragh, ps, &
+         tsurf_cpl, p1lay, cal, beta, cdragh, cdragq, ps, &
          precip_rain, precip_snow, snow, qsurf,  &
-         radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, &
-         AcoefH, AcoefQ, BcoefH, BcoefQ, &
+         radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, gustiness, &
+         f_qsat_oce,AcoefH, AcoefQ, BcoefH, BcoefQ, &
          tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
     
 ! - Flux calculation at first modele level for U and V
     CALL calcul_flux_wind(knon, dtime, &
-         u0_cpl, v0_cpl, u1, v1, cdragm, &
+         u0_cpl, v0_cpl, u1, v1, gustiness, cdragm, &
          AcoefU, AcoefV, BcoefU, BcoefV, &
          p1lay, temp_air, &
@@ -185 +186 @@
        AcoefH, AcoefQ, BcoefH, BcoefQ, &
        AcoefU, AcoefV, BcoefU, BcoefV, &
-       ps, u1, v1, pctsrf, &
+       ps, u1, v1, gustiness, pctsrf, &
        radsol, snow, qsurf, &
        alb1_new, alb2_new, evap, fluxsens, fluxlat, flux_u1, flux_v1, &
@@ -200 +201 @@
 
     INCLUDE "YOMCST.h"
+    INCLUDE "clesphys.h"
 
 ! Input arguments
@@ -219 +221 @@
     REAL, DIMENSION(klon), INTENT(IN)        :: AcoefU, AcoefV, BcoefU, BcoefV
     REAL, DIMENSION(klon), INTENT(IN)        :: ps
-    REAL, DIMENSION(klon), INTENT(IN)        :: u1, v1
+    REAL, DIMENSION(klon), INTENT(IN)        :: u1, v1, gustiness
     REAL, DIMENSION(klon,nbsrf), INTENT(IN)  :: pctsrf
 
@@ -279 +281 @@
 
     CALL calcul_fluxs(knon, is_sic, dtime, &
-         tsurf_cpl, p1lay, cal, beta, cdragh, ps, &
+         tsurf_cpl, p1lay, cal, beta, cdragh, cdragh, ps, &
          precip_rain, precip_snow, snow, qsurf,  &
-         radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, &
-         AcoefH, AcoefQ, BcoefH, BcoefQ, &
+         radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, gustiness, &
+         f_qsat_oce,AcoefH, AcoefQ, BcoefH, BcoefQ, &
          tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
 
@@ -288 +290 @@
 ! - Flux calculation at first modele level for U and V
     CALL calcul_flux_wind(knon, dtime, &
-         u0, v0, u1, v1, cdragm, &
+         u0, v0, u1, v1, gustiness, cdragm, &
          AcoefU, AcoefV, BcoefU, BcoefV, &
          p1lay, temp_air, &