--- trunk/libf/dyn3d/etat0.f90 2012/11/14 16:59:30 68 +++ trunk/libf/dyn3d/etat0.f90 2013/07/23 13:00:07 72 @@ -35,7 +35,6 @@ use histclo_m, only: histclo use indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra use iniadvtrac_m, only: iniadvtrac - use inidissip_m, only: inidissip use inifilr_m, only: inifilr use inigeom_m, only: inigeom use massdair_m, only: massdair @@ -107,11 +106,14 @@ real pks(iim + 1, jjm + 1) REAL masse(iim + 1, jjm + 1, llm) - REAL phi(ip1jmp1, llm) + REAL phi(iim + 1, jjm + 1, llm) REAL pbaru(ip1jmp1, llm), pbarv(ip1jm, llm) REAL w(ip1jmp1, llm) REAL phystep + real sig1(klon, llm) ! section adiabatic updraft + real w01(klon, llm) ! vertical velocity within adiabatic updraft + !--------------------------------- print *, "Call sequence information: etat0" @@ -301,12 +303,11 @@ ! Initialisation pour traceurs: call iniadvtrac - CALL inidissip itau_phy = 0 day_ref = dayref annee_ref = anneeref - CALL geopot(ip1jmp1, tpot, pk , pks, phis, phi) + CALL geopot(tpot, pk , pks, phis, phi) CALL caldyn0(ucov, vcov, tpot, psol, masse, pk, phis, phi, w, pbaru, & pbarv) CALL dynredem0("start.nc", dayref, phis) @@ -357,12 +358,14 @@ rnebcon = 0. ratqs = 0. run_off_lic_0 = 0. + sig1 = 0. + w01 = 0. call phyredem("startphy.nc", latfi, lonfi, pctsrf, & tsolsrf, tsoil, tslab, seaice, qsolsrf, qsol, snsrf, albe, alblw, & evap, rain_fall, snow_fall, solsw, sollw, fder, radsol, frugs, & agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, & - t_ancien, q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0) + t_ancien, q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01) CALL histclo END SUBROUTINE etat0