--- trunk/dyn3d/etat0.f 2015/02/13 18:22:38 129 +++ trunk/Sources/dyn3d/etat0.f 2016/06/08 12:23:41 202 @@ -19,29 +19,32 @@ 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 conf_gcm_m, only: nday, day_step, iphysiq 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 - use histclo_m, only: histclo use indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra use iniadvtrac_m, only: iniadvtrac use inifilr_m, only: inifilr use massdair_m, only: massdair use netcdf, only: nf90_nowrite - use netcdf95, only: nf95_close, nf95_get_var, nf95_gw_var, & + 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, itau_phy + use phyredem0_m, only: phyredem0, ncid_restartphy use phyredem_m, only: phyredem use q_sat_m, only: q_sat use regr_lat_time_coefoz_m, only: regr_lat_time_coefoz @@ -50,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 @@ -59,10 +61,6 @@ ! Local: - REAL latfi(klon), lonfi(klon) - ! (latitude and longitude of a point of the scalar grid identified - ! by a simple index, in degrees) - REAL, dimension(iim + 1, jjm + 1, llm):: ucov, t3d, teta REAL vcov(iim + 1, jjm, llm) @@ -72,15 +70,12 @@ ! and pressure level "pls(i, j, l)".) real qsat(iim + 1, jjm + 1, llm) ! mass fraction of saturating water vapor - 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) + REAL null_array(klon) + REAL solsw(klon), sollw(klon) !IM "slab" ocean - real seaice(klon) ! kg m-2 REAL frugs(klon, nbsrf), agesno(klon, nbsrf) REAL rugmer(klon) real, dimension(iim + 1, jjm + 1):: zmea_2d, zstd_2d, zsig_2d, zgam_2d @@ -91,7 +86,6 @@ REAL zthe(klon) REAL zpic(klon), zval(klon) REAL t_ancien(klon, llm), q_ancien(klon, llm) - REAL run_off_lic_0(klon) real clwcon(klon, llm), rnebcon(klon, llm), ratqs(klon, llm) ! D\'eclarations pour lecture glace de mer : @@ -105,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 @@ -140,18 +130,25 @@ 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 - latfi(1) = 90. - latfi(2:klon-1) = pack(spread(rlatu(2:jjm), 1, iim), .true.) * 180. / pi + rlat(1) = 90. + rlat(2:klon-1) = pack(spread(rlatu(2:jjm), 1, iim), .true.) * 180. / pi ! (with conversion to degrees) - latfi(klon) = - 90. + rlat(klon) = - 90. - lonfi(1) = 0. - lonfi(2:klon-1) = pack(spread(rlonv(:iim), 2, jjm - 1), .true.) * 180. / pi + rlon(1) = 0. + rlon(2:klon-1) = pack(spread(rlonv(:iim), 2, jjm - 1), .true.) * 180. / pi ! (with conversion to degrees) - lonfi(klon) = 0. + rlon(klon) = 0. call start_init_orog(phis, zmea_2d, zstd_2d, zsig_2d, zgam_2d, zthe_2d, & zpic_2d, zval_2d) ! also compute "mask" @@ -217,9 +214,7 @@ q(:, :, :, 5) = q(:, :, :, 5) * 48. / 29. end if - sn = 0. ! snow - radsol = 0. - seaice = 0. + null_array = 0. rugmer = 0.001 zmea = pack(zmea_2d, dyn_phy) zstd = pack(zstd_2d, dyn_phy) @@ -293,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' @@ -308,56 +303,49 @@ SUM(aire_2d(:iim, jjm + 1) * masse(:iim, jjm + 1, l)) / apols END forall - ! Initialisation pour traceurs: call iniadvtrac - itau_phy = 0 - CALL geopot(teta, pk , pks, phis, phi) - CALL caldyn0(ucov, vcov, teta, ps, masse, pk, phis, phi, w, pbaru, & - pbarv) - CALL dynredem0("start.nc", day_ref, phis) - CALL dynredem1("start.nc", vcov, ucov, teta, q, masse, ps, itau=0) + CALL caldyn0(ucov, vcov, teta, ps, pk, phis, phi) + CALL dynredem0(day_ref, phis) + CALL dynredem1(vcov, ucov, teta, q, masse, ps, itau = 0) ! Initialisations : - snsrf(:, is_ter) = sn - snsrf(:, is_lic) = sn - snsrf(:, is_oce) = sn - snsrf(:, is_sic) = sn + snsrf = 0. albe(:, is_ter) = 0.08 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) - rain_fall = 0. - snow_fall = 0. solsw = 165. sollw = -53. t_ancien = 273.15 q_ancien = 0. agesno = 0. - seaice = 0. frugs(:, is_oce) = rugmer frugs(:, is_ter) = MAX(1e-5, zstd * zsig / 2) frugs(:, is_lic) = MAX(1e-5, zstd * zsig / 2) frugs(:, is_sic) = 0.001 - fder = 0. clwcon = 0. rnebcon = 0. ratqs = 0. - run_off_lic_0 = 0. sig1 = 0. w01 = 0. - call phyredem("startphy.nc", latfi, lonfi, 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, & - q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01) - CALL histclo + nday = 0 + itau_phy = 0 ! side effect + call phyredem0 + + call nf95_inq_varid(ncid_restartphy, "trs", varid) + call nf95_put_var(ncid_restartphy, varid, null_array) + + 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