--- trunk/libf/dyn3d/etat0.f90 2011/01/25 15:11:05 39 +++ trunk/libf/dyn3d/etat0.f90 2012/10/02 15:50:56 67 @@ -17,13 +17,11 @@ ! From "etat0_netcdf.F", version 1.3 2005/05/25 13:10:09 - ! This subroutine creates "mask". - 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 - use comvert, only: ap, bp, preff, pa + use disvert_m, only: ap, bp, preff, pa use conf_gcm_m, only: day_step, iphysiq, dayref, anneeref use dimens_m, only: iim, jjm, llm, nqmx use dimphy, only: zmasq @@ -32,14 +30,18 @@ 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 + 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_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,8 +51,9 @@ 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 startdyn, only: start_inter_3d, start_init_dyn + use start_init_phys_m, only: start_init_phys + use startdyn, only: start_init_dyn + use start_inter_3d_m, only: start_inter_3d use temps, only: itau_phy, annee_ref, day_ref ! Variables local to the procedure: @@ -59,8 +62,8 @@ ! (latitude and longitude of a point of the scalar grid identified ! by a simple index, in °) - REAL, dimension(iim + 1, jjm + 1, llm):: uvent, t3d, tpot - REAL vvent(iim + 1, jjm, llm) + REAL, dimension(iim + 1, jjm + 1, llm):: ucov, t3d, tpot + REAL vcov(iim + 1, jjm, llm) REAL q3d(iim + 1, jjm + 1, llm, nqmx) ! (mass fractions of trace species @@ -82,7 +85,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 +95,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,24 +144,28 @@ 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 CALL exner_hyb(psol, p3d, pks, pk) - IF (MINVAL(pk) == MAXVAL(pk)) stop '"pk" should not be constant' + IF (MINVAL(pk) == MAXVAL(pk)) then + print *, '"pk" should not be constant' + stop 1 + end IF pls = preff * (pk / cpp)**(1. / kappa) PRINT *, "minval(pls) = ", minval(pls) print *, "maxval(pls) = ", maxval(pls) - call start_inter_3d('U', rlonv, rlatv, pls, uvent) - forall (l = 1: llm) uvent(:iim, :, l) = uvent(:iim, :, l) * cu_2d(:iim, :) - uvent(iim+1, :, :) = uvent(1, :, :) - - call start_inter_3d('V', rlonu, rlatu(:jjm), pls(:, :jjm, :), vvent) - forall (l = 1: llm) vvent(:iim, :, l) = vvent(:iim, :, l) * cv_2d(:iim, :) - vvent(iim + 1, :, :) = vvent(1, :, :) + call start_inter_3d('U', rlonv, rlatv, pls, ucov) + forall (l = 1: llm) ucov(:iim, :, l) = ucov(:iim, :, l) * cu_2d(:iim, :) + ucov(iim+1, :, :) = ucov(1, :, :) + + call start_inter_3d('V', rlonu, rlatu(:jjm), pls(:, :jjm, :), vcov) + forall (l = 1: llm) vcov(:iim, :, l) = vcov(:iim, :, l) * cv_2d(:iim, :) + vcov(iim + 1, :, :) = vcov(1, :, :) call start_inter_3d('TEMP', rlonu, rlatv, pls, t3d) PRINT *, 'minval(t3d) = ', minval(t3d) @@ -213,9 +220,9 @@ zpic = pack(zpic_2d, dyn_phy) zval = pack(zval_2d, dyn_phy) - ! On initialise les sous-surfaces: + ! On initialise les sous-surfaces. ! Lecture du fichier glace de terre pour fixer la fraction de terre - ! et de glace de terre: + ! et de glace de terre : CALL flininfo("landiceref.nc", iml_lic, jml_lic, llm_tmp, & ttm_tmp, fid) ALLOCATE(lat_lic(iml_lic, jml_lic)) @@ -226,9 +233,11 @@ 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 flinclo(fid) + 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) ! Interpolation sur la grille T du modèle : PRINT *, 'Dimensions de "landice"' @@ -300,10 +309,10 @@ annee_ref = anneeref CALL geopot(ip1jmp1, tpot, pk , pks, phis, phi) - CALL caldyn0(uvent, vvent, tpot, psol, masse, pk, phis, phi, w, pbaru, & + CALL caldyn0(ucov, vcov, tpot, psol, masse, pk, phis, phi, w, pbaru, & pbarv) CALL dynredem0("start.nc", dayref, phis) - CALL dynredem1("start.nc", vvent, uvent, tpot, q3d, masse, psol, itau=0) + CALL dynredem1("start.nc", vcov, ucov, tpot, q3d, masse, psol, itau=0) ! Ecriture état initial physique: print *, "iphysiq = ", iphysiq