--- trunk/phylmd/physiq.f 2015/02/13 18:22:38 129 +++ trunk/Sources/phylmd/physiq.f 2015/11/25 20:14:19 174 @@ -4,13 +4,13 @@ contains - SUBROUTINE physiq(lafin, rdayvrai, time, dtphys, paprs, play, pphi, pphis, & - u, v, t, qx, omega, d_u, d_v, d_t, d_qx) + SUBROUTINE physiq(lafin, dayvrai, time, paprs, play, pphi, pphis, u, v, t, & + qx, omega, d_u, d_v, d_t, d_qx) ! From phylmd/physiq.F, version 1.22 2006/02/20 09:38:28 ! (subversion revision 678) - ! Author: Z.X. Li (LMD/CNRS) 1993 + ! Author: Z. X. Li (LMD/CNRS) 1993 ! This is the main procedure for the "physics" part of the program. @@ -25,9 +25,10 @@ ok_orodr, ok_orolf USE clmain_m, ONLY: clmain use clouds_gno_m, only: clouds_gno - USE comgeomphy, ONLY: airephy, cuphy, cvphy + use comconst, only: dtphys + USE comgeomphy, ONLY: airephy USE concvl_m, ONLY: concvl - USE conf_gcm_m, ONLY: offline, raz_date + USE conf_gcm_m, ONLY: offline, raz_date, day_step, iphysiq USE conf_phys_m, ONLY: conf_phys use conflx_m, only: conflx USE ctherm, ONLY: iflag_thermals, nsplit_thermals @@ -45,20 +46,23 @@ USE indicesol, ONLY: clnsurf, epsfra, is_lic, is_oce, is_sic, is_ter, & nbsrf USE ini_histins_m, ONLY: ini_histins + use netcdf95, only: NF95_CLOSE use newmicro_m, only: newmicro USE orbite_m, ONLY: orbite USE ozonecm_m, ONLY: ozonecm USE phyetat0_m, ONLY: phyetat0, rlat, rlon USE phyredem_m, ONLY: phyredem + USE phyredem0_m, ONLY: phyredem0 USE phystokenc_m, ONLY: phystokenc USE phytrac_m, ONLY: phytrac USE qcheck_m, ONLY: qcheck use radlwsw_m, only: radlwsw use readsulfate_m, only: readsulfate use readsulfate_preind_m, only: readsulfate_preind - use sugwd_m, only: sugwd - USE suphec_m, ONLY: ra, rcpd, retv, rg, rlvtt, romega, rsigma, rtt + use yoegwd, only: sugwd + USE suphec_m, ONLY: rcpd, retv, rg, rlvtt, romega, rsigma, rtt USE temps, ONLY: itau_phy + use transp_m, only: transp use unit_nml_m, only: unit_nml USE ymds2ju_m, ONLY: ymds2ju USE yoethf_m, ONLY: r2es, rvtmp2 @@ -66,11 +70,10 @@ logical, intent(in):: lafin ! dernier passage - REAL, intent(in):: rdayvrai - ! elapsed time since January 1st 0h of the starting year, in days + integer, intent(in):: dayvrai + ! current day number, based at value 1 on January 1st of annee_ref REAL, intent(in):: time ! heure de la journ\'ee en fraction de jour - REAL, intent(in):: dtphys ! pas d'integration pour la physique (seconde) REAL, intent(in):: paprs(:, :) ! (klon, llm + 1) ! pression pour chaque inter-couche, en Pa @@ -155,14 +158,6 @@ integer nlevSTD PARAMETER(nlevSTD = 17) - real rlevSTD(nlevSTD) - DATA rlevSTD/100000., 92500., 85000., 70000., & - 60000., 50000., 40000., 30000., 25000., 20000., & - 15000., 10000., 7000., 5000., 3000., 2000., 1000./ - CHARACTER(LEN = 4) clevSTD(nlevSTD) - DATA clevSTD/'1000', '925 ', '850 ', '700 ', '600 ', & - '500 ', '400 ', '300 ', '250 ', '200 ', '150 ', '100 ', & - '70 ', '50 ', '30 ', '20 ', '10 '/ ! prw: precipitable water real prw(klon) @@ -175,51 +170,7 @@ INTEGER kmax, lmax PARAMETER(kmax = 8, lmax = 8) INTEGER kmaxm1, lmaxm1 - PARAMETER(kmaxm1 = kmax-1, lmaxm1 = lmax-1) - - REAL zx_tau(kmaxm1), zx_pc(lmaxm1) - DATA zx_tau/0., 0.3, 1.3, 3.6, 9.4, 23., 60./ - DATA zx_pc/50., 180., 310., 440., 560., 680., 800./ - - ! cldtopres pression au sommet des nuages - REAL cldtopres(lmaxm1) - DATA cldtopres/50., 180., 310., 440., 560., 680., 800./ - - ! taulev: numero du niveau de tau dans les sorties ISCCP - CHARACTER(LEN = 4) taulev(kmaxm1) - - DATA taulev/'tau0', 'tau1', 'tau2', 'tau3', 'tau4', 'tau5', 'tau6'/ - CHARACTER(LEN = 3) pclev(lmaxm1) - DATA pclev/'pc1', 'pc2', 'pc3', 'pc4', 'pc5', 'pc6', 'pc7'/ - - CHARACTER(LEN = 28) cnameisccp(lmaxm1, kmaxm1) - DATA cnameisccp/'pc< 50hPa, tau< 0.3', 'pc= 50-180hPa, tau< 0.3', & - 'pc= 180-310hPa, tau< 0.3', 'pc= 310-440hPa, tau< 0.3', & - 'pc= 440-560hPa, tau< 0.3', 'pc= 560-680hPa, tau< 0.3', & - 'pc= 680-800hPa, tau< 0.3', 'pc< 50hPa, tau= 0.3-1.3', & - 'pc= 50-180hPa, tau= 0.3-1.3', 'pc= 180-310hPa, tau= 0.3-1.3', & - 'pc= 310-440hPa, tau= 0.3-1.3', 'pc= 440-560hPa, tau= 0.3-1.3', & - 'pc= 560-680hPa, tau= 0.3-1.3', 'pc= 680-800hPa, tau= 0.3-1.3', & - 'pc< 50hPa, tau= 1.3-3.6', 'pc= 50-180hPa, tau= 1.3-3.6', & - 'pc= 180-310hPa, tau= 1.3-3.6', 'pc= 310-440hPa, tau= 1.3-3.6', & - 'pc= 440-560hPa, tau= 1.3-3.6', 'pc= 560-680hPa, tau= 1.3-3.6', & - 'pc= 680-800hPa, tau= 1.3-3.6', 'pc< 50hPa, tau= 3.6-9.4', & - 'pc= 50-180hPa, tau= 3.6-9.4', 'pc= 180-310hPa, tau= 3.6-9.4', & - 'pc= 310-440hPa, tau= 3.6-9.4', 'pc= 440-560hPa, tau= 3.6-9.4', & - 'pc= 560-680hPa, tau= 3.6-9.4', 'pc= 680-800hPa, tau= 3.6-9.4', & - 'pc< 50hPa, tau= 9.4-23', 'pc= 50-180hPa, tau= 9.4-23', & - 'pc= 180-310hPa, tau= 9.4-23', 'pc= 310-440hPa, tau= 9.4-23', & - 'pc= 440-560hPa, tau= 9.4-23', 'pc= 560-680hPa, tau= 9.4-23', & - 'pc= 680-800hPa, tau= 9.4-23', 'pc< 50hPa, tau= 23-60', & - 'pc= 50-180hPa, tau= 23-60', 'pc= 180-310hPa, tau= 23-60', & - 'pc= 310-440hPa, tau= 23-60', 'pc= 440-560hPa, tau= 23-60', & - 'pc= 560-680hPa, tau= 23-60', 'pc= 680-800hPa, tau= 23-60', & - 'pc< 50hPa, tau> 60.', 'pc= 50-180hPa, tau> 60.', & - 'pc= 180-310hPa, tau> 60.', 'pc= 310-440hPa, tau> 60.', & - 'pc= 440-560hPa, tau> 60.', 'pc= 560-680hPa, tau> 60.', & - 'pc= 680-800hPa, tau> 60.'/ - - ! ISCCP simulator v3.4 + PARAMETER(kmaxm1 = kmax - 1, lmaxm1 = lmax - 1) ! Variables propres a la physique @@ -230,7 +181,7 @@ REAL radsol(klon) SAVE radsol ! bilan radiatif au sol calcule par code radiatif - INTEGER, SAVE:: itap ! number of calls to "physiq" + INTEGER:: itap = 0 ! number of calls to "physiq" REAL, save:: ftsol(klon, nbsrf) ! skin temperature of surface fraction @@ -248,8 +199,7 @@ ! column-density of water in soil, in kg m-2 REAL, save:: fsnow(klon, nbsrf) ! epaisseur neigeuse - REAL, save:: falbe(klon, nbsrf) ! albedo par type de surface - REAL, save:: falblw(klon, nbsrf) ! albedo par type de surface + REAL, save:: falbe(klon, nbsrf) ! albedo visible par type de surface ! Param\`etres de l'orographie \`a l'\'echelle sous-maille (OESM) : REAL, save:: zmea(klon) ! orographie moyenne @@ -319,8 +269,7 @@ REAL dlw(klon) ! derivee infra rouge SAVE dlw REAL bils(klon) ! bilan de chaleur au sol - REAL fder(klon) ! Derive de flux (sensible et latente) - save fder + REAL, save:: fder(klon) ! Derive de flux (sensible et latente) REAL ve(klon) ! integr. verticale du transport meri. de l'energie REAL vq(klon) ! integr. verticale du transport meri. de l'eau REAL ue(klon) ! integr. verticale du transport zonal de l'energie @@ -335,14 +284,12 @@ INTEGER, SAVE:: lmt_pas ! number of time steps of "physics" per day REAL, save:: pctsrf(klon, nbsrf) ! percentage of surface REAL pctsrf_new(klon, nbsrf) ! pourcentage surfaces issus d'ORCHIDEE - REAL, save:: albsol(klon) ! albedo du sol total - REAL, save:: albsollw(klon) ! albedo du sol total + REAL, save:: albsol(klon) ! albedo du sol total visible REAL, SAVE:: wo(klon, llm) ! column density of ozone in a cell, in kDU ! Declaration des procedures appelees EXTERNAL nuage ! calculer les proprietes radiatives - EXTERNAL transp ! transport total de l'eau et de l'energie ! Variables locales @@ -370,21 +317,16 @@ ! Le rayonnement n'est pas calcul\'e tous les pas, il faut donc que ! les variables soient r\'emanentes. REAL, save:: heat(klon, llm) ! chauffage solaire - REAL heat0(klon, llm) ! chauffage solaire ciel clair + REAL, save:: heat0(klon, llm) ! chauffage solaire ciel clair REAL, save:: cool(klon, llm) ! refroidissement infrarouge - REAL cool0(klon, llm) ! refroidissement infrarouge ciel clair + REAL, save:: cool0(klon, llm) ! refroidissement infrarouge ciel clair REAL, save:: topsw(klon), toplw(klon), solsw(klon) REAL, save:: sollw(klon) ! rayonnement infrarouge montant \`a la surface real, save:: sollwdown(klon) ! downward LW flux at surface REAL, save:: topsw0(klon), toplw0(klon), solsw0(klon), sollw0(klon) - REAL albpla(klon) + REAL, save:: albpla(klon) REAL fsollw(klon, nbsrf) ! bilan flux IR pour chaque sous surface REAL fsolsw(klon, nbsrf) ! flux solaire absorb. pour chaque sous surface - SAVE albpla - SAVE heat0, cool0 - - INTEGER itaprad - SAVE itaprad REAL conv_q(klon, llm) ! convergence de l'humidite (kg/kg/s) REAL conv_t(klon, llm) ! convergence of temperature (K/s) @@ -503,7 +445,6 @@ REAL ue_lay(klon, llm) ! transport zonal de l'energie a chaque niveau vert. REAL uq_lay(klon, llm) ! transport zonal de l'eau a chaque niveau vert. - REAL zsto real date0 ! Variables li\'ees au bilan d'\'energie et d'enthalpie : @@ -572,6 +513,7 @@ ! (column-density of mass of air in a cell, in kg m-2) real, parameter:: dobson_u = 2.1415e-05 ! Dobson unit, in kg m-2 + integer, save:: ncid_startphy namelist /physiq_nml/ ok_journe, ok_mensuel, ok_instan, fact_cldcon, & facttemps, ok_newmicro, iflag_cldcon, ratqsbas, ratqshaut, if_ebil, & @@ -581,7 +523,7 @@ IF (if_ebil >= 1) zero_v = 0. IF (nqmx < 2) CALL abort_gcm('physiq', & - 'eaux vapeur et liquide sont indispensables', 1) + 'eaux vapeur et liquide sont indispensables') test_firstcal: IF (firstcal) THEN ! initialiser @@ -632,30 +574,25 @@ ! Initialiser les compteurs: frugs = 0. - itap = 0 - itaprad = 0 CALL phyetat0(pctsrf, ftsol, ftsoil, tslab, seaice, fqsurf, qsol, & - fsnow, falbe, falblw, fevap, rain_fall, snow_fall, solsw, sollw, & - dlw, radsol, frugs, agesno, zmea, zstd, zsig, zgam, zthe, zpic, & - zval, t_ancien, q_ancien, ancien_ok, rnebcon, ratqs, clwcon, & - run_off_lic_0, sig1, w01) + fsnow, falbe, fevap, rain_fall, snow_fall, solsw, sollw, dlw, & + radsol, frugs, agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, & + t_ancien, q_ancien, ancien_ok, rnebcon, ratqs, clwcon, & + run_off_lic_0, sig1, w01, ncid_startphy) ! ATTENTION : il faudra a terme relire q2 dans l'etat initial q2 = 1e-8 - radpas = NINT(86400. / dtphys / nbapp_rad) + lmt_pas = day_step / iphysiq + print *, 'Number of time steps of "physics" per day: ', lmt_pas + + radpas = lmt_pas / nbapp_rad - ! on remet le calendrier a zero + ! On remet le calendrier a zero IF (raz_date) itau_phy = 0 CALL printflag(radpas, ok_journe, ok_instan, ok_region) - IF (dtphys * radpas > 21600. .AND. cycle_diurne) THEN - print *, "Au minimum 4 appels par jour si cycle diurne" - call abort_gcm('physiq', & - "Nombre d'appels au rayonnement insuffisant", 1) - ENDIF - ! Initialisation pour le sch\'ema de convection d'Emanuel : IF (iflag_con >= 3) THEN ibas_con = 1 @@ -669,9 +606,6 @@ rugoro = 0. ENDIF - lmt_pas = NINT(86400. / dtphys) ! tous les jours - print *, 'Number of time steps of "physics" per day: ', lmt_pas - ecrit_ins = NINT(ecrit_ins/dtphys) ecrit_hf = NINT(ecrit_hf/dtphys) ecrit_mth = NINT(ecrit_mth/dtphys) @@ -684,6 +618,7 @@ CALL ymds2ju(annee_ref, 1, day_ref, 0., date0) ! Positionner date0 pour initialisation de ORCHIDEE print *, 'physiq date0: ', date0 + CALL phyredem0(lmt_pas) ENDIF test_firstcal ! We will modify variables *_seri and we will not touch variables @@ -693,7 +628,7 @@ v_seri = v q_seri = qx(:, :, ivap) ql_seri = qx(:, :, iliq) - tr_seri = qx(:, :, 3: nqmx) + tr_seri = qx(:, :, 3:nqmx) ztsol = sum(ftsol * pctsrf, dim = 2) @@ -741,7 +676,7 @@ ! Incrémenter le compteur de la physique itap = itap + 1 - julien = MOD(NINT(rdayvrai), 360) + julien = MOD(dayvrai, 360) if (julien == 0) julien = 360 forall (k = 1: llm) zmasse(:, k) = (paprs(:, k) - paprs(:, k + 1)) / rg @@ -778,12 +713,11 @@ IF (cycle_diurne) THEN CALL zenang(longi, time, dtphys * radpas, mu0, fract) ELSE - mu0 = -999.999 + mu0 = - 999.999 ENDIF ! Calcul de l'abedo moyen par maille albsol = sum(falbe * pctsrf, dim = 2) - albsollw = sum(falblw * pctsrf, dim = 2) ! R\'epartition sous maille des flux longwave et shortwave ! R\'epartition du longwave par sous-surface lin\'earis\'ee @@ -799,14 +733,14 @@ ! Couche limite: CALL clmain(dtphys, itap, pctsrf, pctsrf_new, t_seri, q_seri, u_seri, & - v_seri, julien, mu0, co2_ppm, ftsol, cdmmax, cdhmax, & - ksta, ksta_ter, ok_kzmin, ftsoil, qsol, paprs, play, fsnow, fqsurf, & - fevap, falbe, falblw, fluxlat, rain_fall, snow_fall, fsolsw, fsollw, & - fder, rlat, frugs, firstcal, agesno, rugoro, d_t_vdf, d_q_vdf, & - d_u_vdf, d_v_vdf, d_ts, fluxt, fluxq, fluxu, fluxv, 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, fluxo, fluxg, tslab) + v_seri, julien, mu0, co2_ppm, ftsol, cdmmax, cdhmax, ksta, ksta_ter, & + ok_kzmin, ftsoil, qsol, paprs, play, fsnow, fqsurf, fevap, falbe, & + fluxlat, rain_fall, snow_fall, fsolsw, fsollw, fder, rlat, frugs, & + firstcal, agesno, rugoro, d_t_vdf, d_q_vdf, d_u_vdf, d_v_vdf, d_ts, & + fluxt, fluxq, fluxu, fluxv, 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, fluxo, fluxg, tslab) ! Incr\'ementation des flux @@ -941,10 +875,10 @@ conv_q = d_q_dyn + d_q_vdf / dtphys 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, zxfluxq(:, 1), 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, & + CALL conflx(dtphys, paprs, play, t_seri(:, llm:1:- 1), & + q_seri(:, llm:1:- 1), conv_t, conv_q, zxfluxq(:, 1), 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. @@ -1132,17 +1066,17 @@ ! 1. NUAGES CONVECTIFS - IF (iflag_cldcon <= -1) THEN + IF (iflag_cldcon <= - 1) THEN ! seulement pour Tiedtke snow_tiedtke = 0. - if (iflag_cldcon == -1) then + if (iflag_cldcon == - 1) then rain_tiedtke = rain_con else rain_tiedtke = 0. do k = 1, llm do i = 1, klon if (d_q_con(i, k) < 0.) then - rain_tiedtke(i) = rain_tiedtke(i)-d_q_con(i, k)/dtphys & + rain_tiedtke(i) = rain_tiedtke(i) - d_q_con(i, k)/dtphys & *zmasse(i, k) endif enddo @@ -1212,7 +1146,7 @@ IF (thermcep) THEN zx_qs = r2es * FOEEW(zx_t, rtt >= zx_t)/play(i, k) zx_qs = MIN(0.5, zx_qs) - zcor = 1./(1.-retv*zx_qs) + zcor = 1./(1. - retv*zx_qs) zx_qs = zx_qs*zcor ELSE IF (zx_t < t_coup) THEN @@ -1229,8 +1163,8 @@ ! Introduce the aerosol direct and first indirect radiative forcings: IF (ok_ade .OR. ok_aie) THEN ! Get sulfate aerosol distribution : - CALL readsulfate(rdayvrai, firstcal, sulfate) - CALL readsulfate_preind(rdayvrai, firstcal, sulfate_pi) + CALL readsulfate(dayvrai, time, firstcal, sulfate) + CALL readsulfate_preind(dayvrai, time, firstcal, sulfate_pi) CALL aeropt(play, paprs, t_seri, sulfate, rhcl, tau_ae, piz_ae, cg_ae, & aerindex) @@ -1252,35 +1186,25 @@ bl95_b1, cldtaupi, re, fl) endif - IF (MOD(itaprad, radpas) == 0) THEN + IF (MOD(itap - 1, radpas) == 0) THEN ! Appeler le rayonnement mais calculer tout d'abord l'albedo du sol. - DO i = 1, klon - albsol(i) = falbe(i, is_oce) * pctsrf(i, is_oce) & - + falbe(i, is_lic) * pctsrf(i, is_lic) & - + falbe(i, is_ter) * pctsrf(i, is_ter) & - + falbe(i, is_sic) * pctsrf(i, is_sic) - albsollw(i) = falblw(i, is_oce) * pctsrf(i, is_oce) & - + falblw(i, is_lic) * pctsrf(i, is_lic) & - + falblw(i, is_ter) * pctsrf(i, is_ter) & - + falblw(i, is_sic) * pctsrf(i, is_sic) - ENDDO + ! Calcul de l'abedo moyen par maille + albsol = sum(falbe * pctsrf, dim = 2) + ! Rayonnement (compatible Arpege-IFS) : - CALL radlwsw(dist, mu0, fract, paprs, play, zxtsol, albsol, & - albsollw, t_seri, q_seri, wo, cldfra, cldemi, cldtau, heat, & - heat0, cool, cool0, radsol, albpla, topsw, toplw, solsw, sollw, & - sollwdown, topsw0, toplw0, solsw0, sollw0, lwdn0, lwdn, lwup0, & - lwup, swdn0, swdn, swup0, swup, ok_ade, ok_aie, tau_ae, piz_ae, & - cg_ae, topswad, solswad, cldtaupi, topswai, solswai) - itaprad = 0 + CALL radlwsw(dist, mu0, fract, paprs, play, zxtsol, albsol, t_seri, & + q_seri, wo, cldfra, cldemi, cldtau, heat, heat0, cool, cool0, & + radsol, albpla, topsw, toplw, solsw, sollw, sollwdown, topsw0, & + toplw0, solsw0, sollw0, lwdn0, lwdn, lwup0, lwup, swdn0, swdn, & + swup0, swup, ok_ade, ok_aie, tau_ae, piz_ae, cg_ae, topswad, & + solswad, cldtaupi, topswai, solswai) ENDIF - itaprad = itaprad + 1 - ! Ajouter la tendance des rayonnements (tous les pas) DO k = 1, llm DO i = 1, klon - t_seri(i, k) = t_seri(i, k) + (heat(i, k)-cool(i, k)) * dtphys/86400. + t_seri(i, k) = t_seri(i, k) + (heat(i, k) - cool(i, k)) * dtphys/86400. ENDDO ENDDO @@ -1313,11 +1237,11 @@ ! Param\'etrisation de l'orographie \`a l'\'echelle sous-maille : IF (ok_orodr) THEN - ! selection des points pour lesquels le shema est actif: + ! S\'election des points pour lesquels le sch\'ema est actif : igwd = 0 DO i = 1, klon itest(i) = 0 - IF (((zpic(i)-zmea(i)) > 100.).AND.(zstd(i) > 10.)) THEN + IF (zpic(i) - zmea(i) > 100. .AND. zstd(i) > 10.) THEN itest(i) = 1 igwd = igwd + 1 idx(igwd) = i @@ -1325,8 +1249,8 @@ ENDDO CALL drag_noro(klon, llm, dtphys, paprs, play, zmea, zstd, zsig, zgam, & - zthe, zpic, zval, igwd, idx, itest, t_seri, u_seri, v_seri, & - zulow, zvlow, zustrdr, zvstrdr, d_t_oro, d_u_oro, d_v_oro) + zthe, zpic, zval, itest, 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 @@ -1343,7 +1267,7 @@ igwd = 0 DO i = 1, klon itest(i) = 0 - IF ((zpic(i) - zmea(i)) > 100.) THEN + IF (zpic(i) - zmea(i) > 100.) THEN itest(i) = 1 igwd = igwd + 1 idx(igwd) = i @@ -1379,8 +1303,8 @@ ENDDO ENDDO - CALL aaam_bud(ra, rg, romega, rlat, rlon, pphis, zustrdr, zustrli, & - zustrph, zvstrdr, zvstrli, zvstrph, paprs, u, v, aam, torsfc) + CALL aaam_bud(rg, romega, rlat, rlon, pphis, zustrdr, zustrli, zustrph, & + zvstrdr, zvstrli, zvstrph, paprs, u, v, aam, torsfc) IF (if_ebil >= 2) CALL diagetpq(airephy, 'after orography', ip_ebil, 2, & 2, dtphys, t_seri, q_seri, ql_seri, u_seri, v_seri, paprs, d_h_vcol, & @@ -1389,16 +1313,15 @@ ! Calcul des tendances traceurs call phytrac(itap, lmt_pas, 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, pphis, da, phi, mp, & - upwd, dnwd, tr_seri, zmasse) + yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, mp, upwd, & + dnwd, tr_seri, zmasse, ncid_startphy, nid_ins) IF (offline) call phystokenc(dtphys, rlon, rlat, t, mfu, mfd, pen_u, & pde_u, pen_d, pde_d, fm_therm, entr_therm, ycoefh, yu1, yv1, ftsol, & pctsrf, frac_impa, frac_nucl, pphis, airephy, dtphys, itap) ! Calculer le transport de l'eau et de l'energie (diagnostique) - CALL transp(paprs, zxtsol, t_seri, q_seri, u_seri, v_seri, zphi, ve, vq, & - ue, uq) + CALL transp(paprs, t_seri, q_seri, u_seri, v_seri, zphi, ve, vq, ue, uq) ! diag. bilKP @@ -1456,7 +1379,7 @@ DO iq = 3, nqmx DO k = 1, llm DO i = 1, klon - d_qx(i, k, iq) = (tr_seri(i, k, iq-2) - qx(i, k, iq)) / dtphys + d_qx(i, k, iq) = (tr_seri(i, k, iq - 2) - qx(i, k, iq)) / dtphys ENDDO ENDDO ENDDO @@ -1469,18 +1392,16 @@ ENDDO ENDDO - ! Ecriture des sorties call write_histins - ! Si c'est la fin, il faut conserver l'etat de redemarrage - IF (lafin) THEN - itau_phy = itau_phy + itap - CALL phyredem("restartphy.nc", rlat, rlon, pctsrf, ftsol, ftsoil, & - tslab, seaice, fqsurf, qsol, fsnow, falbe, falblw, fevap, & - rain_fall, snow_fall, solsw, sollw, dlw, radsol, frugs, & - agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, t_ancien, & - q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01) - ENDIF + IF (lafin) then + call NF95_CLOSE(ncid_startphy) + CALL phyredem(pctsrf, ftsol, ftsoil, tslab, seaice, fqsurf, qsol, & + fsnow, falbe, fevap, rain_fall, snow_fall, solsw, sollw, dlw, & + radsol, frugs, agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, & + t_ancien, q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, & + w01) + end IF firstcal = .FALSE. @@ -1490,12 +1411,13 @@ ! From phylmd/write_histins.h, version 1.2 2005/05/25 13:10:09 + ! Ecriture des sorties + use dimens_m, only: iim, jjm USE histsync_m, ONLY: histsync USE histwrite_m, ONLY: histwrite - real zout - integer itau_w ! pas de temps ecriture + integer i, itau_w ! pas de temps ecriture REAL zx_tmp_2d(iim, jjm + 1), zx_tmp_3d(iim, jjm + 1, llm) !-------------------------------------------------- @@ -1503,15 +1425,11 @@ IF (ok_instan) THEN ! Champs 2D: - zsto = dtphys * ecrit_ins - zout = dtphys * ecrit_ins itau_w = itau_phy + itap - i = NINT(zout/zsto) CALL gr_fi_ecrit(1, klon, iim, jjm + 1, pphis, zx_tmp_2d) CALL histwrite(nid_ins, "phis", itau_w, zx_tmp_2d) - i = NINT(zout/zsto) CALL gr_fi_ecrit(1, klon, iim, jjm + 1, airephy, zx_tmp_2d) CALL histwrite(nid_ins, "aire", itau_w, zx_tmp_2d) @@ -1581,7 +1499,7 @@ CALL gr_fi_ecrit(1, klon, iim, jjm + 1, bils, zx_tmp_2d) CALL histwrite(nid_ins, "bils", itau_w, zx_tmp_2d) - zx_tmp_fi2d(1:klon) = -1*sens(1:klon) + zx_tmp_fi2d(1:klon) = - sens(1:klon) ! CALL gr_fi_ecrit(1, klon, iim, jjm + 1, sens, zx_tmp_2d) CALL gr_fi_ecrit(1, klon, iim, jjm + 1, zx_tmp_fi2d, zx_tmp_2d) CALL histwrite(nid_ins, "sens", itau_w, zx_tmp_2d) @@ -1643,7 +1561,7 @@ CALL histwrite(nid_ins, "rugs_"//clnsurf(nsrf), itau_w, & zx_tmp_2d) - zx_tmp_fi2d(1 : klon) = falbe(1 : klon, nsrf) + zx_tmp_fi2d(1 : klon) = falbe(:, nsrf) CALL gr_fi_ecrit(1, klon, iim, jjm + 1, zx_tmp_fi2d, zx_tmp_2d) CALL histwrite(nid_ins, "albe_"//clnsurf(nsrf), itau_w, & zx_tmp_2d) @@ -1651,8 +1569,6 @@ END DO CALL gr_fi_ecrit(1, klon, iim, jjm + 1, albsol, zx_tmp_2d) CALL histwrite(nid_ins, "albs", itau_w, zx_tmp_2d) - CALL gr_fi_ecrit(1, klon, iim, jjm + 1, albsollw, zx_tmp_2d) - CALL histwrite(nid_ins, "albslw", itau_w, zx_tmp_2d) CALL gr_fi_ecrit(1, klon, iim, jjm + 1, zxrugs, zx_tmp_2d) CALL histwrite(nid_ins, "rugs", itau_w, zx_tmp_2d)