--- trunk/Sources/dyn3d/etat0.f 2015/05/22 23:13:19 138 +++ trunk/Sources/dyn3d/etat0.f 2015/07/16 17:39:10 156 @@ -19,16 +19,18 @@ use caldyn0_m, only: caldyn0 use comconst, only: cpp, kappa, iniconst - use comgeom, only: rlatu, rlonv, rlonu, rlatv, aire_2d, apoln, apols, & - cu_2d, cv_2d, inigeom + use comgeom, only: aire_2d, apoln, apols, cu_2d, cv_2d, inigeom use dimens_m, only: iim, jjm, llm, nqmx use dimphy, only: zmasq use dimsoil, only: nsoilmx use disvert_m, only: ap, bp, preff, pa, disvert - use dynetat0_m, only: day_ref, annee_ref + use dynetat0_m, only: day_ref, annee_ref, xprimp025, xprimm025, rlatu1, & + rlatu2, rlatu, rlatv, yprimu1, yprimu2, rlonu, rlonv, xprimu, xprimv use dynredem0_m, only: dynredem0 use dynredem1_m, only: dynredem1 use exner_hyb_m, only: exner_hyb + use fxhyp_m, only: fxhyp + use fyhyp_m, only: fyhyp use geopot_m, only: geopot use grid_atob, only: grille_m use grid_change, only: init_dyn_phy, dyn_phy @@ -71,7 +73,6 @@ REAL sn(klon) REAL qsolsrf(klon, nbsrf), snsrf(klon, nbsrf) REAL albe(klon, nbsrf), evap(klon, nbsrf) - REAL alblw(klon, nbsrf) REAL tsoil(klon, nsoilmx, nbsrf) REAL radsol(klon), rain_fall(klon), snow_fall(klon) REAL solsw(klon), sollw(klon), fder(klon) @@ -136,6 +137,13 @@ pa = 5e4 CALL disvert call test_disvert + + CALL fyhyp(rlatu, rlatv, rlatu2, yprimu2, rlatu1, yprimu1) + CALL fxhyp(xprimm025, rlonv, xprimv, rlonu, xprimu, xprimp025) + + rlatu(1) = pi / 2. + rlatu(jjm + 1) = -rlatu(1) + CALL inigeom CALL inifilr @@ -323,7 +331,6 @@ albe(:, is_lic) = 0.6 albe(:, is_oce) = 0.5 albe(:, is_sic) = 0.6 - alblw = albe evap = 0. qsolsrf = 150. tsoil = spread(spread(pack(tsol_2d, dyn_phy), 2, nsoilmx), 3, nbsrf) @@ -350,8 +357,8 @@ call phyredem("startphy.nc", pctsrf, tsoil(:, 1, :), tsoil, & tsoil(:, 1, is_oce), seaice, qsolsrf, pack(qsol_2d, dyn_phy), snsrf, & - albe, alblw, evap, rain_fall, snow_fall, solsw, sollw, fder, radsol, & - frugs, agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, t_ancien, & + albe, 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, sig1, w01) END SUBROUTINE etat0