--- trunk/libf/dyn3d/etat0.f90 2013/06/24 15:39:52 70 +++ trunk/dyn3d/etat0.f90 2014/02/05 17:51:07 78 @@ -7,7 +7,7 @@ REAL pctsrf(klon, nbsrf) ! ("pctsrf(i, :)" is the composition of the surface at horizontal - ! position "i") + ! position "i") private nbsrf, klon @@ -20,7 +20,7 @@ use caldyn0_m, only: caldyn0 use comconst, only: dtvr, daysec, cpp, kappa use comgeom, only: rlatu, rlonv, rlonu, rlatv, aire_2d, apoln, apols, & - cu_2d, cv_2d + cu_2d, cv_2d, inigeom use conf_gcm_m, only: day_step, iphysiq, dayref, anneeref use dimens_m, only: iim, jjm, llm, nqmx use dimphy, only: zmasq @@ -35,9 +35,7 @@ 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 use netcdf, only: nf90_nowrite use netcdf95, only: nf95_close, nf95_get_var, nf95_gw_var, & @@ -51,7 +49,7 @@ use regr_pr_o3_m, only: regr_pr_o3 use serre, only: alphax use startdyn, only: start_init_dyn - USE start_init_orog_m, only: start_init_orog, mask, phis + 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, annee_ref, day_ref @@ -62,7 +60,7 @@ ! (latitude and longitude of a point of the scalar grid identified ! by a simple index, in °) - REAL, dimension(iim + 1, jjm + 1, llm):: ucov, t3d, tpot + REAL, dimension(iim + 1, jjm + 1, llm):: ucov, t3d, teta REAL vcov(iim + 1, jjm, llm) REAL q(iim + 1, jjm + 1, llm, nqmx) @@ -83,14 +81,15 @@ real seaice(klon) ! kg m-2 REAL frugs(klon, nbsrf), agesno(klon, nbsrf) REAL rugmer(klon) - real, dimension(iim + 1, jjm + 1):: relief, zstd_2d, zsig_2d, zgam_2d + REAL phis(iim + 1, jjm + 1) ! surface geopotential, in m2 s-2 + real, dimension(iim + 1, jjm + 1):: zmea_2d, zstd_2d, zsig_2d, zgam_2d real, dimension(iim + 1, jjm + 1):: zthe_2d, zpic_2d, zval_2d - real, dimension(iim + 1, jjm + 1):: tsol_2d, qsol_2d, psol + real, dimension(iim + 1, jjm + 1):: tsol_2d, qsol_2d, ps REAL zmea(klon), zstd(klon) REAL zsig(klon), zgam(klon) REAL zthe(klon) REAL zpic(klon), zval(klon) - REAL t_ancien(klon, llm), q_ancien(klon, llm) ! + 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) @@ -112,6 +111,9 @@ 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" @@ -136,18 +138,18 @@ ! (with conversion to degrees) lonfi(klon) = 0. - call start_init_orog(relief, zstd_2d, zsig_2d, zgam_2d, zthe_2d, zpic_2d, & - zval_2d) ! also compute "mask" and "phis" + call start_init_orog(phis, zmea_2d, zstd_2d, zsig_2d, zgam_2d, zthe_2d, & + zpic_2d, zval_2d) ! also compute "mask" call init_dyn_phy ! define the mask "dyn_phy" for distinct grid points zmasq = pack(mask, dyn_phy) PRINT *, 'Masque construit' call start_init_phys(tsol_2d, qsol_2d) - CALL start_init_dyn(tsol_2d, psol) + CALL start_init_dyn(tsol_2d, phis, ps) ! Compute pressure on intermediate levels: - forall(l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * psol - CALL exner_hyb(psol, p3d, pks, pk) + forall(l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * ps + CALL exner_hyb(ps, p3d, pks, pk) IF (MINVAL(pk) == MAXVAL(pk)) then print *, '"pk" should not be constant' stop 1 @@ -166,14 +168,14 @@ vcov(iim + 1, :, :) = vcov(1, :, :) call start_inter_3d('TEMP', rlonu, rlatv, pls, t3d) - PRINT *, 'minval(t3d) = ', minval(t3d) + PRINT *, 'minval(t3d) = ', minval(t3d) print *, "maxval(t3d) = ", maxval(t3d) - tpot(:iim, :, :) = t3d(:iim, :, :) * cpp / pk(:iim, :, :) - tpot(iim + 1, :, :) = tpot(1, :, :) - DO l=1, llm - tpot(:, 1, l) = SUM(aire_2d(:, 1) * tpot(:, 1, l)) / apoln - tpot(:, jjm + 1, l) = SUM(aire_2d(:, jjm + 1) * tpot(:, jjm + 1, l)) & + teta(:iim, :, :) = t3d(:iim, :, :) * cpp / pk(:iim, :, :) + teta(iim + 1, :, :) = teta(1, :, :) + DO l = 1, llm + teta(:, 1, l) = SUM(aire_2d(:, 1) * teta(:, 1, l)) / apoln + teta(:, jjm + 1, l) = SUM(aire_2d(:, jjm + 1) * teta(:, jjm + 1, l)) & / apols ENDDO @@ -200,7 +202,7 @@ call regr_lat_time_coefoz call regr_pr_o3(q(:, :, :, 5)) ! Convert from mole fraction to mass fraction: - q(:, :, :, 5) = q(:, :, :, 5) * 48. / 29. + q(:, :, :, 5) = q(:, :, :, 5) * 48. / 29. end if tsol = pack(tsol_2d, dyn_phy) @@ -210,7 +212,7 @@ tslab = 0. ! IM "slab" ocean seaice = 0. rugmer = 0.001 - zmea = pack(relief, dyn_phy) + zmea = pack(zmea_2d, dyn_phy) zstd = pack(zstd_2d, dyn_phy) zsig = pack(zsig_2d, dyn_phy) zgam = pack(zgam_2d, dyn_phy) @@ -244,10 +246,10 @@ print *, "jml_lic = ", jml_lic ! Si les coordonnées sont en degrés, on les transforme : - IF (MAXVAL( dlon_lic ) > pi) THEN + IF (MAXVAL(dlon_lic) > pi) THEN dlon_lic = dlon_lic * pi / 180. ENDIF - IF (maxval( dlat_lic ) > pi) THEN + IF (maxval(dlat_lic) > pi) THEN dlat_lic = dlat_lic * pi/ 180. ENDIF @@ -261,7 +263,7 @@ pctsrf = 0. pctsrf(:, is_lic) = pack(flic_tmp, dyn_phy) ! Adéquation avec le maque terre/mer - WHERE (pctsrf(:, is_lic) < EPSFRA ) pctsrf(:, is_lic) = 0. + WHERE (pctsrf(:, is_lic) < EPSFRA) pctsrf(:, is_lic) = 0. WHERE (zmasq < EPSFRA) pctsrf(:, is_lic) = 0. pctsrf(:, is_ter) = zmasq where (zmasq > EPSFRA) @@ -282,18 +284,18 @@ pctsrf(:, is_oce) = 1. - zmasq WHERE (pctsrf(:, is_oce) < EPSFRA) pctsrf(:, is_oce) = 0. - ! Vérification que somme des sous-surfaces vaut 1: + ! Vérification que somme des sous-surfaces vaut 1 : ji = count(abs(sum(pctsrf, dim = 2) - 1.) > EPSFRA) IF (ji /= 0) then PRINT *, 'Problème répartition sous maille pour ', ji, 'points' end IF - ! Calcul intermédiaire: + ! Calcul intermédiaire : CALL massdair(p3d, masse) print *, 'ALPHAX = ', alphax - forall (l = 1:llm) + forall (l = 1:llm) masse(:, 1, l) = SUM(aire_2d(:iim, 1) * masse(:iim, 1, l)) / apoln masse(:, jjm + 1, l) = & SUM(aire_2d(:iim, jjm + 1) * masse(:iim, jjm + 1, l)) / apols @@ -301,20 +303,19 @@ ! Initialisation pour traceurs: call iniadvtrac - CALL inidissip itau_phy = 0 day_ref = dayref annee_ref = anneeref - CALL geopot(tpot, pk , pks, phis, phi) - CALL caldyn0(ucov, vcov, tpot, psol, masse, pk, phis, phi, w, pbaru, & + CALL geopot(teta, pk , pks, phis, phi) + CALL caldyn0(ucov, vcov, teta, ps, masse, pk, phis, phi, w, pbaru, & pbarv) CALL dynredem0("start.nc", dayref, phis) - CALL dynredem1("start.nc", vcov, ucov, tpot, q, masse, psol, itau=0) + CALL dynredem1("start.nc", vcov, ucov, teta, q, masse, ps, itau=0) ! Ecriture état initial physique: print *, "iphysiq = ", iphysiq - phystep = dtvr * REAL(iphysiq) + phystep = dtvr * REAL(iphysiq) print *, 'phystep = ', phystep ! Initialisations : @@ -349,20 +350,22 @@ seaice = 0. frugs(:, is_oce) = rugmer - frugs(:, is_ter) = MAX(1.e-05, zstd * zsig / 2) - frugs(:, is_lic) = MAX(1.e-05, zstd * zsig / 2) + 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, & 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