--- trunk/libf/dyn3d/startdyn.f90 2010/12/02 17:11:04 36 +++ trunk/libf/dyn3d/startdyn.f90 2011/04/08 12:43:31 43 @@ -27,22 +27,20 @@ use comgeom, only: aire_2d, apoln, apols use conf_dat2d_m, only: conf_dat2d use inter_barxy_m, only: inter_barxy - use comconst, only: pi use comgeom, only: rlonu, rlatv use dimens_m, only: iim, jjm use gr_int_dyn_m, only: gr_int_dyn use start_init_orog_m, only: phis use start_init_phys_m, only: start_init_phys - use nr_util, only: assert + use nr_util, only: assert, pi - REAL, intent(out):: tsol_2d(:, :) - REAL, intent(out):: psol(:, :) ! surface pressure, in Pa + REAL, intent(in):: tsol_2d(:, :) ! (iim + 1, jjm + 1) + REAL, intent(out):: psol(:, :) ! (iim + 1, jjm + 1) surface pressure, in Pa ! Local: REAL date, dt INTEGER itau(1) - INTEGER i, j REAL, ALLOCATABLE:: lon_rad(:), lat_rad(:) REAL, ALLOCATABLE:: lon_dyn(:, :), lat_dyn(:, :) @@ -56,9 +54,9 @@ print *, "Call sequence information: start_init_dyn" call assert((/size(tsol_2d, 1), size(psol, 1)/) == iim + 1, & - "start_init_phys size 1") + "start_init_dyn size 1") call assert((/size(tsol_2d, 2), size(psol, 2)/) == jjm + 1, & - "start_init_phys size 2") + "start_init_dyn size 2") CALL flininfo('ECDYN.nc', iml_dyn, jml_dyn, llm_dyn, ttm_dyn, fid_dyn) print *, "iml_dyn = ", iml_dyn, ", jml_dyn = ", jml_dyn, & ", llm_dyn = ", llm_dyn, ", ttm_dyn = ", ttm_dyn @@ -103,7 +101,6 @@ CALL inter_barxy(lon_rad, lat_rad(:jml_dyn -1), var_ana, rlonu(:iim), & rlatv, tmp_var) psol = gr_int_dyn(tmp_var) - CALL start_init_phys(tsol_2d) psol(:iim, :) = psol(:iim, :) & * (1. + (z(:iim, :) - phis(:iim, :)) / 287. / tsol_2d(:iim, :))