--- trunk/Sources/dyn3d/etat0.f 2015/07/20 16:01:49 157 +++ trunk/Sources/dyn3d/etat0.f 2016/05/09 19:56:28 191 @@ -43,8 +43,7 @@ use netcdf95, only: nf95_close, nf95_get_var, nf95_gw_var, nf95_put_var, & nf95_inq_varid, nf95_open use nr_util, only: pi, assert - use paramet_m, only: ip1jm, ip1jmp1 - use phyetat0_m, only: rlat, rlon + use phyetat0_m, only: rlat, rlon, itau_phy use phyredem0_m, only: phyredem0, ncid_restartphy use phyredem_m, only: phyredem use q_sat_m, only: q_sat @@ -54,7 +53,6 @@ USE start_init_orog_m, only: start_init_orog, mask use start_init_phys_m, only: start_init_phys use start_inter_3d_m, only: start_inter_3d - use temps, only: itau_phy use test_disvert_m, only: test_disvert use unit_nml_m, only: unit_nml @@ -101,12 +99,8 @@ REAL pk(iim + 1, jjm + 1, llm) ! fonction d'Exner aux milieux des couches real pks(iim + 1, jjm + 1) - REAL masse(iim + 1, jjm + 1, llm) REAL phi(iim + 1, jjm + 1, llm) - REAL pbaru(ip1jmp1, llm), pbarv(ip1jm, llm) - REAL w(iim + 1, jjm + 1, llm) - real sig1(klon, llm) ! section adiabatic updraft real w01(klon, llm) ! vertical velocity within adiabatic updraft @@ -294,7 +288,7 @@ pctsrf(:, is_oce) = 1. - zmasq WHERE (pctsrf(:, is_oce) < EPSFRA) pctsrf(:, is_oce) = 0. - ! V\'erification que somme des sous-surfaces vaut 1 : + ! V\'erification que la somme des sous-surfaces vaut 1 : ji = count(abs(sum(pctsrf, dim = 2) - 1.) > EPSFRA) IF (ji /= 0) then PRINT *, 'Bad surface percentages for ', ji, 'points' @@ -311,7 +305,7 @@ call iniadvtrac CALL geopot(teta, pk , pks, phis, phi) - CALL caldyn0(ucov, vcov, teta, ps, masse, pk, phis, phi, w, pbaru, pbarv) + CALL caldyn0(ucov, vcov, teta, ps, pk, phis, phi) CALL dynredem0(day_ref, phis) CALL dynredem1(vcov, ucov, teta, q, masse, ps, itau = 0) @@ -340,18 +334,18 @@ sig1 = 0. w01 = 0. - itau_phy = 0 nday = 0 + itau_phy = 0 ! side effect call phyredem0(lmt_pas = day_step / iphysiq) call nf95_inq_varid(ncid_restartphy, "trs", varid) call nf95_put_var(ncid_restartphy, varid, null_array) - call phyredem(pctsrf, tsoil(:, 1, :), tsoil, tsoil(:, 1, is_oce), & - null_array, qsolsrf, pack(qsol_2d, dyn_phy), snsrf, albe, evap, & - null_array, null_array, solsw, sollw, null_array, null_array, frugs, & - agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, t_ancien, & - q_ancien, rnebcon, ratqs, clwcon, null_array, sig1, w01) + call phyredem(pctsrf, tsoil(:, 1, :), tsoil, qsolsrf, & + pack(qsol_2d, dyn_phy), snsrf, albe, evap, null_array, null_array, & + solsw, sollw, null_array, null_array, frugs, agesno, zmea, zstd, & + zsig, zgam, zthe, zpic, zval, t_ancien, q_ancien, rnebcon, ratqs, & + clwcon, null_array, sig1, w01) END SUBROUTINE etat0