--- trunk/libf/dyn3d/etat0.f90 2011/01/25 15:11:05 39 +++ trunk/libf/dyn3d/etat0.f90 2011/07/19 12:54:20 48 @@ -32,7 +32,7 @@ use dynredem1_m, only: dynredem1 use exner_hyb_m, only: exner_hyb USE flincom, only: flinclo, flinopen_nozoom, flininfo - use flinget_m, only: flinget + use geopot_m, only: geopot use grid_atob, only: grille_m use grid_change, only: init_dyn_phy, dyn_phy use histcom, only: histclo @@ -40,6 +40,8 @@ use iniadvtrac_m, only: iniadvtrac use inidissip_m, only: inidissip use inigeom_m, only: inigeom + use netcdf, only: nf90_nowrite + use netcdf95, only: nf95_open, nf95_close, nf95_get_var, nf95_inq_varid use nr_util, only: pi use paramet_m, only: ip1jm, ip1jmp1 use phyredem_m, only: phyredem @@ -49,7 +51,7 @@ use regr_pr_o3_m, only: regr_pr_o3 use serre, only: alphax USE start_init_orog_m, only: start_init_orog, mask, phis - use start_init_phys_m, only: qsol_2d + use start_init_phys_m, only: start_init_phys use startdyn, only: start_inter_3d, start_init_dyn use temps, only: itau_phy, annee_ref, day_ref @@ -82,7 +84,7 @@ REAL rugmer(klon) real, dimension(iim + 1, jjm + 1):: relief, 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, psol + real, dimension(iim + 1, jjm + 1):: tsol_2d, qsol_2d, psol REAL zmea(klon), zstd(klon) REAL zsig(klon), zgam(klon) REAL zthe(klon) @@ -92,7 +94,7 @@ real clwcon(klon, llm), rnebcon(klon, llm), ratqs(klon, llm) ! déclarations pour lecture glace de mer INTEGER iml_lic, jml_lic, llm_tmp, ttm_tmp - INTEGER itaul(1), fid + INTEGER itaul(1), fid, ncid, varid REAL lev(1), date REAL, ALLOCATABLE:: lon_lic(:, :), lat_lic(:, :) REAL, ALLOCATABLE:: dlon_lic(:), dlat_lic(:) @@ -141,7 +143,8 @@ zmasq = pack(mask, dyn_phy) PRINT *, 'Masque construit' - CALL start_init_dyn(tsol_2d, psol) ! also compute "qsol_2d" + call start_init_phys(tsol_2d, qsol_2d) + CALL start_init_dyn(tsol_2d, psol) ! Compute pressure on intermediate levels: forall(l = 1: llm + 1) p3d(:, :, l) = ap(l) + bp(l) * psol @@ -226,8 +229,10 @@ CALL flinopen_nozoom(iml_lic, jml_lic, & llm_tmp, lon_lic, lat_lic, lev, ttm_tmp, itaul, date, trash, & fid) - CALL flinget(fid, 'landice', iml_lic, jml_lic, llm_tmp, ttm_tmp & - , 1, 1, fraclic) + call nf95_open("landiceref.nc", nf90_nowrite, ncid) + call nf95_inq_varid(ncid, 'landice', varid) + call nf95_get_var(ncid, varid, fraclic) + call nf95_close(ncid) CALL flinclo(fid) ! Interpolation sur la grille T du modèle :