--- trunk/libf/dyn3d/start_init_orog_m.f90 2008/08/01 15:24:12 15 +++ trunk/libf/phylmd/Orography/start_init_orog_m.f90 2011/01/25 15:11:05 39 @@ -13,13 +13,14 @@ SUBROUTINE start_init_orog(relief, zstd_2d, zsig_2d, zgam_2d, zthe_2d, & zpic_2d, zval_2d) - USE ioipsl, only: flininfo, flinopen_nozoom, flinget, flinclo use conf_dat2d_m, only: conf_dat2d use comgeom, only: rlatu, rlonv use dimens_m, only: iim, jjm - use indicesol, only: epsfra - use comconst, only: pi + USE flincom, only: flininfo, flinopen_nozoom, flinclo + use flinget_m, only: flinget use grid_noro_m, only: grid_noro + use indicesol, only: epsfra + use nr_util, only: pi REAL, intent(out):: relief(:, :) ! orographie moyenne @@ -51,8 +52,6 @@ REAL, ALLOCATABLE:: lon_ini(:), lat_ini(:) REAL, ALLOCATABLE:: lon_rel(:, :), lat_rel(:, :) - CHARACTER(len=120) orogfname - !----------------------------------- print *, "Call sequence information: start_init_orog" @@ -64,16 +63,14 @@ size(zgam_2d, 2), size(zthe_2d, 2), size(zpic_2d, 2), & size(zval_2d, 2)/) /= jjm + 1)) stop "start_init_orog size 2" - orogfname = 'Relief.nc' print *, 'Reading the high resolution orography' - - CALL flininfo(orogfname, iml_rel, jml_rel, llm_tmp, ttm_tmp, fid) + CALL flininfo('Relief.nc', iml_rel, jml_rel, llm_tmp, ttm_tmp, fid) ALLOCATE(lat_rel(iml_rel, jml_rel)) ALLOCATE(lon_rel(iml_rel, jml_rel)) ALLOCATE(relief_hi(iml_rel, jml_rel)) - CALL flinopen_nozoom(orogfname, iml_rel, jml_rel, llm_tmp, & + CALL flinopen_nozoom(iml_rel, jml_rel, llm_tmp, & lon_rel, lat_rel, lev, ttm_tmp, itau, date, dt, fid) ! 'RELIEF': high resolution orography CALL flinget(fid, 'RELIEF', iml_rel, jml_rel, llm_tmp, ttm_tmp, 1, 1, &