--- trunk/libf/dyn3d/etat0.f90 2011/07/19 12:54:20 48 +++ trunk/libf/dyn3d/etat0.f90 2012/04/20 14:58:43 61 @@ -17,8 +17,6 @@ ! 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, & @@ -35,10 +33,11 @@ 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 netcdf, only: nf90_nowrite use netcdf95, only: nf95_open, nf95_close, nf95_get_var, nf95_inq_varid @@ -52,7 +51,8 @@ use serre, only: alphax USE start_init_orog_m, only: start_init_orog, mask, phis use start_init_phys_m, only: start_init_phys - use startdyn, only: start_inter_3d, start_init_dyn + 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: @@ -149,7 +149,10 @@ ! 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) @@ -216,9 +219,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)) @@ -229,11 +232,11 @@ CALL flinopen_nozoom(iml_lic, jml_lic, & llm_tmp, lon_lic, lat_lic, lev, ttm_tmp, itaul, date, trash, & fid) + 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) - CALL flinclo(fid) ! Interpolation sur la grille T du modèle : PRINT *, 'Dimensions de "landice"'