--- trunk/Sources/dyn3d/etat0.f 2016/03/11 18:47:26 178 +++ trunk/dyn3d/etat0.f 2018/03/20 09:35:59 265 @@ -20,8 +20,8 @@ use caldyn0_m, only: caldyn0 use comconst, only: cpp, kappa, iniconst 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 conf_gcm_m, only: nday + use dimensions, only: iim, jjm, llm, nqmx use dimphy, only: zmasq use dimsoil, only: nsoilmx use disvert_m, only: ap, bp, preff, pa, disvert @@ -33,7 +33,7 @@ use fxhyp_m, only: fxhyp use fyhyp_m, only: fyhyp use geopot_m, only: geopot - use grid_atob, only: grille_m + use grille_m_m, only: grille_m use grid_change, only: init_dyn_phy, dyn_phy use indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra use iniadvtrac_m, only: iniadvtrac @@ -43,7 +43,7 @@ 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 phyetat0_m, only: rlat, rlon + 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 @@ -91,7 +91,7 @@ ! D\'eclarations pour lecture glace de mer : INTEGER iml_lic, jml_lic INTEGER ncid, varid - REAL, pointer:: dlon_lic(:), dlat_lic(:) + REAL, ALLOCATABLE:: dlon_lic(:), dlat_lic(:) REAL, ALLOCATABLE:: fraclic(:, :) ! fraction land ice REAL flic_tmp(iim + 1, jjm + 1) ! fraction land ice temporary @@ -261,15 +261,13 @@ rlatu) flic_tmp(iim + 1, :) = flic_tmp(1, :) - deallocate(dlon_lic, dlat_lic) ! pointers - ! Passage sur la grille physique pctsrf = 0. pctsrf(:, is_lic) = pack(flic_tmp, dyn_phy) ! Ad\'equation avec le maque terre/mer WHERE (pctsrf(:, is_lic) < EPSFRA) pctsrf(:, is_lic) = 0. WHERE (zmasq < EPSFRA) pctsrf(:, is_lic) = 0. - pctsrf(:, is_ter) = zmasq + where (zmasq <= EPSFRA) pctsrf(:, is_ter) = zmasq where (zmasq > EPSFRA) where (pctsrf(:, is_lic) >= zmasq) pctsrf(:, is_lic) = zmasq @@ -335,7 +333,8 @@ w01 = 0. nday = 0 - call phyredem0(lmt_pas = day_step / iphysiq, itau_phy = 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)