--- trunk/Sources/phylmd/physiq.f 2017/04/28 13:40:59 224 +++ trunk/phylmd/physiq.f 2018/02/05 10:39:38 254 @@ -18,8 +18,7 @@ USE abort_gcm_m, ONLY: abort_gcm use ajsec_m, only: ajsec use calltherm_m, only: calltherm - USE clesphys, ONLY: cdhmax, cdmmax, ecrit_ins, ksta, ksta_ter, ok_kzmin, & - ok_instan + USE clesphys, ONLY: cdhmax, cdmmax, ecrit_ins, ok_instan USE clesphys2, ONLY: conv_emanuel, nbapp_rad, new_oliq, ok_orodr, ok_orolf USE clmain_m, ONLY: clmain use clouds_gno_m, only: clouds_gno @@ -44,13 +43,14 @@ USE indicesol, ONLY: clnsurf, epsfra, is_lic, is_oce, is_sic, is_ter, & nbsrf USE ini_histins_m, ONLY: ini_histins, nid_ins + use lift_noro_m, only: lift_noro use netcdf95, only: NF95_CLOSE use newmicro_m, only: newmicro use nr_util, only: assert use nuage_m, only: nuage USE orbite_m, ONLY: orbite USE ozonecm_m, ONLY: ozonecm - USE phyetat0_m, ONLY: phyetat0, rlat, rlon + USE phyetat0_m, ONLY: phyetat0 USE phyredem_m, ONLY: phyredem USE phyredem0_m, ONLY: phyredem0 USE phytrac_m, ONLY: phytrac @@ -169,7 +169,7 @@ REAL, save:: zval(klon) ! Minimum de l'OESM REAL, save:: rugoro(klon) ! longueur de rugosite de l'OESM REAL zulow(klon), zvlow(klon) - INTEGER igwd, itest(klon) + INTEGER ktest(klon) REAL, save:: agesno(klon, nbsrf) ! age de la neige REAL, save:: run_off_lic_0(klon) @@ -183,10 +183,7 @@ REAL cdragh(klon) ! drag coefficient pour T and Q REAL cdragm(klon) ! drag coefficient pour vent - ! Pour phytrac : - REAL ycoefh(klon, llm) ! coef d'echange pour phytrac - REAL yu1(klon) ! vents dans la premiere couche U - REAL yv1(klon) ! vents dans la premiere couche V + REAL coefh(klon, 2:llm) ! coef d'echange pour phytrac REAL, save:: ffonte(klon, nbsrf) ! flux thermique utilise pour fondre la neige @@ -250,8 +247,9 @@ REAL flux_q(klon, nbsrf) ! flux turbulent d'humidite à la surface REAL flux_t(klon, nbsrf) ! flux turbulent de chaleur à la surface - REAL flux_u(klon, nbsrf) ! flux turbulent de vitesse u à la surface - REAL flux_v(klon, nbsrf) ! flux turbulent de vitesse v à la surface + + REAL flux_u(klon, nbsrf), flux_v(klon, nbsrf) + ! tension du vent (flux turbulent de vent) à la surface, en Pa ! Le rayonnement n'est pas calcul\'e tous les pas, il faut donc que ! les variables soient r\'emanentes. @@ -292,14 +290,10 @@ REAL, SAVE:: cteiCL(klon, nbsrf) ! cloud top instab. crit. couche limite REAL, SAVE:: pblt(klon, nbsrf) ! T \`a la hauteur de couche limite REAL, SAVE:: therm(klon, nbsrf) - REAL, SAVE:: trmb1(klon, nbsrf) ! deep_cape - REAL, SAVE:: trmb2(klon, nbsrf) ! inhibition - REAL, SAVE:: trmb3(klon, nbsrf) ! Point Omega ! Grandeurs de sorties REAL s_pblh(klon), s_lcl(klon), s_capCL(klon) REAL s_oliqCL(klon), s_cteiCL(klon), s_pblt(klon) - REAL s_therm(klon), s_trmb1(klon), s_trmb2(klon) - REAL s_trmb3(klon) + REAL s_therm(klon) ! Variables pour la convection de K. Emanuel : @@ -371,7 +365,6 @@ REAL zustrdr(klon), zvstrdr(klon) REAL zustrli(klon), zvstrli(klon) - REAL zustrph(klon), zvstrph(klon) REAL aam, torsfc REAL ve_lay(klon, llm) ! transport meri. de l'energie a chaque niveau vert. @@ -389,9 +382,11 @@ REAL, save:: t2m(klon, nbsrf), q2m(klon, nbsrf) ! temperature and humidity at 2 m - REAL, save:: u10m(klon, nbsrf), v10m(klon, nbsrf) ! vents a 10 m + REAL, save:: u10m_srf(klon, nbsrf), v10m_srf(klon, nbsrf) + ! composantes du vent \`a 10 m + REAL zt2m(klon), zq2m(klon) ! température, humidité 2 m moyenne sur 1 maille - REAL zu10m(klon), zv10m(klon) ! vents a 10 m moyennes sur 1 maille + REAL u10m(klon), v10m(klon) ! vent \`a 10 m moyenn\' sur les sous-surfaces ! Aerosol effects: @@ -419,8 +414,8 @@ test_firstcal: IF (firstcal) THEN ! initialiser - u10m = 0. - v10m = 0. + u10m_srf = 0. + v10m_srf = 0. t2m = 0. q2m = 0. ffonte = 0. @@ -440,9 +435,6 @@ cteiCL =0. ! cloud top instab. crit. couche limite pblt =0. therm =0. - trmb1 =0. ! deep_cape - trmb2 =0. ! inhibition - trmb3 =0. ! Point Omega iflag_thermals = 0 nsplit_thermals = 1 @@ -567,13 +559,12 @@ END forall CALL clmain(dtphys, pctsrf, t_seri, q_seri, u_seri, v_seri, julien, mu0, & - ftsol, cdmmax, cdhmax, ksta, ksta_ter, ok_kzmin, ftsoil, qsol, & - paprs, play, fsnow, fqsurf, fevap, falbe, fluxlat, rain_fall, & - snow_fall, fsolsw, fsollw, frugs, agesno, rugoro, d_t_vdf, d_q_vdf, & - d_u_vdf, d_v_vdf, d_ts, flux_t, flux_q, flux_u, flux_v, cdragh, & - cdragm, q2, dsens, devap, ycoefh, yu1, yv1, t2m, q2m, u10m, v10m, & - pblh, capCL, oliqCL, cteiCL, pblT, therm, trmb1, trmb2, trmb3, plcl, & - fqcalving, ffonte, run_off_lic_0) + ftsol, cdmmax, cdhmax, ftsoil, qsol, paprs, play, fsnow, fqsurf, & + fevap, falbe, fluxlat, rain_fall, snow_fall, fsolsw, fsollw, frugs, & + agesno, rugoro, d_t_vdf, d_q_vdf, d_u_vdf, d_v_vdf, d_ts, flux_t, & + flux_q, flux_u, flux_v, cdragh, cdragm, q2, dsens, devap, coefh, t2m, & + q2m, u10m_srf, v10m_srf, pblh, capCL, oliqCL, cteiCL, pblT, therm, & + plcl, fqcalving, ffonte, run_off_lic_0) ! Incr\'ementation des flux @@ -598,8 +589,8 @@ zxfluxlat = sum(fluxlat * pctsrf, dim = 2) zt2m = sum(t2m * pctsrf, dim = 2) zq2m = sum(q2m * pctsrf, dim = 2) - zu10m = sum(u10m * pctsrf, dim = 2) - zv10m = sum(v10m * pctsrf, dim = 2) + u10m = sum(u10m_srf * pctsrf, dim = 2) + v10m = sum(v10m_srf * pctsrf, dim = 2) zxffonte = sum(ffonte * pctsrf, dim = 2) zxfqcalving = sum(fqcalving * pctsrf, dim = 2) s_pblh = sum(pblh * pctsrf, dim = 2) @@ -609,9 +600,6 @@ s_cteiCL = sum(cteiCL * pctsrf, dim = 2) s_pblT = sum(pblT * pctsrf, dim = 2) s_therm = sum(therm * pctsrf, dim = 2) - s_trmb1 = sum(trmb1 * pctsrf, dim = 2) - s_trmb2 = sum(trmb2 * pctsrf, dim = 2) - s_trmb3 = sum(trmb3 * pctsrf, dim = 2) ! Si une sous-fraction n'existe pas, elle prend la valeur moyenne : DO nsrf = 1, nbsrf @@ -620,8 +608,8 @@ ftsol(i, nsrf) = tsol(i) t2m(i, nsrf) = zt2m(i) q2m(i, nsrf) = zq2m(i) - u10m(i, nsrf) = zu10m(i) - v10m(i, nsrf) = zv10m(i) + u10m_srf(i, nsrf) = u10m(i) + v10m_srf(i, nsrf) = v10m(i) ffonte(i, nsrf) = zxffonte(i) fqcalving(i, nsrf) = zxfqcalving(i) pblh(i, nsrf) = s_pblh(i) @@ -631,9 +619,6 @@ cteiCL(i, nsrf) = s_cteiCL(i) pblT(i, nsrf) = s_pblT(i) therm(i, nsrf) = s_therm(i) - trmb1(i, nsrf) = s_trmb1(i) - trmb2(i, nsrf) = s_trmb2(i) - trmb3(i, nsrf) = s_trmb3(i) end IF ENDDO ENDDO @@ -669,10 +654,9 @@ conv_t = d_t_dyn + d_t_vdf / dtphys z_avant = sum((q_seri + ql_seri) * zmasse, dim=2) CALL conflx(dtphys, paprs, play, t_seri(:, llm:1:- 1), & - q_seri(:, llm:1:- 1), conv_t, conv_q, - evap, omega, & - d_t_con, d_q_con, rain_con, snow_con, mfu(:, llm:1:- 1), & - mfd(:, llm:1:- 1), pen_u, pde_u, pen_d, pde_d, kcbot, kctop, & - kdtop, pmflxr, pmflxs) + q_seri(:, llm:1:- 1), conv_t, conv_q, - evap, omega, d_t_con, & + d_q_con, rain_con, snow_con, mfu(:, llm:1:- 1), mfd(:, llm:1:- 1), & + pen_u, pde_u, pen_d, pde_d, kcbot, kctop, kdtop, pmflxr, pmflxs) WHERE (rain_con < 0.) rain_con = 0. WHERE (snow_con < 0.) snow_con = 0. ibas_con = llm + 1 - kcbot @@ -897,18 +881,16 @@ IF (ok_orodr) THEN ! S\'election des points pour lesquels le sch\'ema est actif : - igwd = 0 DO i = 1, klon - itest(i) = 0 + ktest(i) = 0 IF (zpic(i) - zmea(i) > 100. .AND. zstd(i) > 10.) THEN - itest(i) = 1 - igwd = igwd + 1 + ktest(i) = 1 ENDIF ENDDO - CALL drag_noro(klon, llm, dtphys, paprs, play, zmea, zstd, zsig, zgam, & - zthe, zpic, zval, itest, t_seri, u_seri, v_seri, zulow, zvlow, & - zustrdr, zvstrdr, d_t_oro, d_u_oro, d_v_oro) + CALL drag_noro(dtphys, paprs, play, zmea, zstd, zsig, zgam, zthe, & + zpic, zval, ktest, t_seri, u_seri, v_seri, zulow, zvlow, zustrdr, & + zvstrdr, d_t_oro, d_u_oro, d_v_oro) ! ajout des tendances DO k = 1, llm @@ -922,18 +904,16 @@ IF (ok_orolf) THEN ! S\'election des points pour lesquels le sch\'ema est actif : - igwd = 0 DO i = 1, klon - itest(i) = 0 + ktest(i) = 0 IF (zpic(i) - zmea(i) > 100.) THEN - itest(i) = 1 - igwd = igwd + 1 + ktest(i) = 1 ENDIF ENDDO - CALL lift_noro(klon, llm, dtphys, paprs, play, rlat, zmea, zstd, zpic, & - itest, t_seri, u_seri, v_seri, zulow, zvlow, zustrli, zvstrli, & - d_t_lif, d_u_lif, d_v_lif) + CALL lift_noro(dtphys, paprs, play, zmea, zstd, zpic, ktest, t_seri, & + u_seri, v_seri, zulow, zvlow, zustrli, zvstrli, d_t_lif, & + d_u_lif, d_v_lif) ! Ajout des tendances : DO k = 1, llm @@ -945,29 +925,16 @@ ENDDO ENDIF - ! Stress n\'ecessaires : toute la physique - - DO i = 1, klon - zustrph(i) = 0. - zvstrph(i) = 0. - ENDDO - DO k = 1, llm - DO i = 1, klon - zustrph(i) = zustrph(i) + (u_seri(i, k) - u(i, k)) / dtphys & - * zmasse(i, k) - zvstrph(i) = zvstrph(i) + (v_seri(i, k) - v(i, k)) / dtphys & - * zmasse(i, k) - ENDDO - ENDDO - - CALL aaam_bud(rg, romega, rlat, rlon, pphis, zustrdr, zustrli, zustrph, & - zvstrdr, zvstrli, zvstrph, paprs, u, v, aam, torsfc) + CALL aaam_bud(rg, romega, pphis, zustrdr, zustrli, & + sum((u_seri - u) / dtphys * zmasse, dim = 2), zvstrdr, & + zvstrli, sum((v_seri - v) / dtphys * zmasse, dim = 2), paprs, u, v, & + aam, torsfc) ! Calcul des tendances traceurs call phytrac(julien, time, firstcal, lafin, dtphys, t, paprs, play, mfu, & - mfd, pde_u, pen_d, ycoefh, fm_therm, entr_therm, yu1, yv1, ftsol, & - pctsrf, frac_impa, frac_nucl, da, phi, mp, upwd, dnwd, tr_seri, & - zmasse, ncid_startphy) + mfd, pde_u, pen_d, coefh, cdragh, fm_therm, entr_therm, u(:, 1), & + v(:, 1), ftsol, pctsrf, frac_impa, frac_nucl, da, phi, mp, upwd, & + dnwd, tr_seri, zmasse, ncid_startphy) ! Calculer le transport de l'eau et de l'energie (diagnostique) CALL transp(paprs, t_seri, q_seri, u_seri, v_seri, zphi, ve, vq, ue, uq) @@ -1036,8 +1003,8 @@ CALL histwrite_phy("tsol", tsol) CALL histwrite_phy("t2m", zt2m) CALL histwrite_phy("q2m", zq2m) - CALL histwrite_phy("u10m", zu10m) - CALL histwrite_phy("v10m", zv10m) + CALL histwrite_phy("u10m", u10m) + CALL histwrite_phy("v10m", v10m) CALL histwrite_phy("snow", snow_fall) CALL histwrite_phy("cdrm", cdragm) CALL histwrite_phy("cdrh", cdragh) @@ -1064,6 +1031,8 @@ CALL histwrite_phy("tauy_"//clnsurf(nsrf), flux_v(:, nsrf)) CALL histwrite_phy("rugs_"//clnsurf(nsrf), frugs(:, nsrf)) CALL histwrite_phy("albe_"//clnsurf(nsrf), falbe(:, nsrf)) + CALL histwrite_phy("u10m_"//clnsurf(nsrf), u10m_srf(:, nsrf)) + CALL histwrite_phy("v10m_"//clnsurf(nsrf), v10m_srf(:, nsrf)) END DO CALL histwrite_phy("albs", albsol) @@ -1076,9 +1045,6 @@ CALL histwrite_phy("s_oliqCL", s_oliqCL) CALL histwrite_phy("s_cteiCL", s_cteiCL) CALL histwrite_phy("s_therm", s_therm) - CALL histwrite_phy("s_trmb1", s_trmb1) - CALL histwrite_phy("s_trmb2", s_trmb2) - CALL histwrite_phy("s_trmb3", s_trmb3) if (conv_emanuel) then CALL histwrite_phy("ptop", ema_pct)