Index: /LMDZ4/branches/LMDZ4-dev/libf/phylmd/pbl_surface_mod.F90 =================================================================== --- /LMDZ4/branches/LMDZ4-dev/libf/phylmd/pbl_surface_mod.F90 (revision 1143) +++ /LMDZ4/branches/LMDZ4-dev/libf/phylmd/pbl_surface_mod.F90 (revision 1144) @@ -765,4 +765,26 @@ r_co2_ppm(:) = co2_ppm + +!**************************************************************************************** +! +! Calulate t2m and q2m for the case of calculation at land grid points +! t2m and q2m are needed as input to ORCHIDEE +! +!**************************************************************************************** + IF (nsrf == is_ter) THEN + + DO i = 1, knon + zgeo1(i) = RD * yt(i,1) / (0.5*(ypaprs(i,1)+ypplay(i,1))) & + * (ypaprs(i,1)-ypplay(i,1)) + END DO + + ! Calculate the temperature et relative humidity at 2m and the wind at 10m + CALL stdlevvar(klon, knon, is_ter, zxli, & + yu(:,1), yv(:,1), yt(:,1), yq(:,1), zgeo1, & + yts, yqsurf, yrugos, ypaprs(:,1), ypplay(:,1), & + yt2m, yq2m, yt10m, yq10m, yu10m, yustar) + + END IF + !**************************************************************************************** ! @@ -787,9 +809,10 @@ AcoefU, AcoefV, BcoefU, BcoefV, & ypsref, yu1, yv1, yrugoro, pctsrf, & + ylwdown, yq2m, yt2m, & ysnow, yqsol, yagesno, ytsoil, & yz0_new, yalb1_new, yalb2_new, yevap, yfluxsens, yfluxlat, & yqsurf, ytsurf_new, y_dflux_t, y_dflux_q, & - y_flux_u1, y_flux_v1, & - ylwdown) + y_flux_u1, y_flux_v1 ) + CASE(is_lic) Index: /LMDZ4/branches/LMDZ4-dev/libf/phylmd/surf_land_mod.F90 =================================================================== --- /LMDZ4/branches/LMDZ4-dev/libf/phylmd/surf_land_mod.F90 (revision 1143) +++ /LMDZ4/branches/LMDZ4-dev/libf/phylmd/surf_land_mod.F90 (revision 1144) @@ -15,9 +15,9 @@ 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 @@ -58,7 +58,7 @@ 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 @@ -129,5 +129,5 @@ 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, & Index: /LMDZ4/branches/LMDZ4-dev/libf/phylmd/surf_land_orchidee_mod.F90 =================================================================== --- /LMDZ4/branches/LMDZ4-dev/libf/phylmd/surf_land_orchidee_mod.F90 (revision 1143) +++ /LMDZ4/branches/LMDZ4-dev/libf/phylmd/surf_land_orchidee_mod.F90 (revision 1144) @@ -36,5 +36,5 @@ tq_cdrag, petAcoef, peqAcoef, petBcoef, peqBcoef, & precip_rain, precip_snow, lwdown, swnet, swdown, & - ps, & + ps, q2m, t2m, & evap, fluxsens, fluxlat, & tsol_rad, tsurf_new, alb1_new, alb2_new, & @@ -120,5 +120,5 @@ REAL, DIMENSION(klon), INTENT(IN) :: precip_rain, precip_snow REAL, DIMENSION(klon), INTENT(IN) :: lwdown, swnet, swdown, ps - REAL, DIMENSION(klon) :: swdown_vrai + REAL, DIMENSION(klon), INTENT(IN) :: q2m, t2m ! Parametres de sortie @@ -133,4 +133,5 @@ INTEGER :: ij, jj, igrid, ireal, index INTEGER :: error + REAL, DIMENSION(klon) :: swdown_vrai CHARACTER (len = 20) :: modname = 'surf_land_orchidee' CHARACTER (len = 80) :: abort_message @@ -391,5 +392,5 @@ evap, fluxsens, fluxlat, coastalflow, riverflow, & tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, & - lon_scat, lat_scat) + lon_scat, lat_scat, q2m, t2m) #endif ENDIF @@ -415,5 +416,5 @@ evap(1:knon), fluxsens(1:knon), fluxlat(1:knon), coastalflow(1:knon), riverflow(1:knon), & tsol_rad(1:knon), tsurf_new(1:knon), qsurf(1:knon), albedo_out(1:knon,:), emis_new(1:knon), z0_new(1:knon), & - lon_scat, lat_scat) + lon_scat, lat_scat, q2m, t2m) #endif ENDIF Index: /LMDZ4/branches/LMDZ4-dev/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90 =================================================================== --- /LMDZ4/branches/LMDZ4-dev/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90 (revision 1143) +++ /LMDZ4/branches/LMDZ4-dev/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90 (revision 1144) @@ -40,5 +40,5 @@ tq_cdrag, petAcoef, peqAcoef, petBcoef, peqBcoef, & precip_rain, precip_snow, lwdown, swnet, swdown, & - ps, & + ps, q2m, t2m, & evap, fluxsens, fluxlat, & tsol_rad, tsurf_new, alb1_new, alb2_new, & @@ -121,5 +121,5 @@ REAL, DIMENSION(klon), INTENT(IN) :: precip_rain, precip_snow REAL, DIMENSION(klon), INTENT(IN) :: lwdown, swnet, swdown, ps - REAL, DIMENSION(klon) :: swdown_vrai + REAL, DIMENSION(klon), INTENT(IN) :: q2m, t2m ! Parametres de sortie @@ -134,4 +134,5 @@ INTEGER :: ij, jj, igrid, ireal, index INTEGER :: error + REAL, DIMENSION(klon) :: swdown_vrai CHARACTER (len = 20) :: modname = 'surf_land_orchidee' CHARACTER (len = 80) :: abort_message @@ -390,5 +391,5 @@ evap, fluxsens, fluxlat, coastalflow, riverflow, & tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, & - lon_scat, lat_scat) + lon_scat, lat_scat, q2m, t2m) #else @@ -402,5 +403,5 @@ evap(1:knon), fluxsens(1:knon), fluxlat(1:knon), coastalflow(1:knon), riverflow(1:knon), & tsol_rad(1:knon), tsurf_new(1:knon), qsurf(1:knon), albedo_out(1:knon,:), emis_new(1:knon), z0_new(1:knon), & - lon_scat, lat_scat) + lon_scat, lat_scat, q2m, t2m) #endif @@ -426,5 +427,5 @@ evap, fluxsens, fluxlat, coastalflow, riverflow, & tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, & - lon_scat, lat_scat) + lon_scat, lat_scat, q2m, t2m) #else @@ -438,5 +439,5 @@ evap(1:knon), fluxsens(1:knon), fluxlat(1:knon), coastalflow(1:knon), riverflow(1:knon), & tsol_rad(1:knon), tsurf_new(1:knon), qsurf(1:knon), albedo_out(1:knon,:), emis_new(1:knon), z0_new(1:knon), & - lon_scat, lat_scat) + lon_scat, lat_scat, q2m, t2m) #endif