Ignore:
Timestamp:
Aug 9, 2012 8:28:32 AM (9 years ago)
Author:
fricke
Message:

merge fricke branch back into trunk

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk

  • palm/trunk/SOURCE

  • palm/trunk/SOURCE/parin.f90

    r965 r978  
    44! Current revisions:
    55! -----------------
    6 !
     6! -km_damp_max, outflow_damping_width
     7! +pt_damping_factor, pt_damping_width
     8! +z0h_factor
    79!
    810! Former revisions:
     
    168170             inflow_damping_height, inflow_damping_width, &
    169171             inflow_disturbance_begin, inflow_disturbance_end, &
    170              initializing_actions, km_constant, km_damp_max, lad_surface, &
     172             initializing_actions, km_constant, lad_surface, &
    171173             lad_vertical_gradient, lad_vertical_gradient_level, &
    172174             leaf_surface_concentration, long_filter_factor, &
     
    175177             netcdf_precision, neutral, ngsrb, nsor, &
    176178             nsor_ini, nx, ny, nz, ocean, omega, omega_sor, &
    177              outflow_damping_width, overshoot_limit_e, overshoot_limit_pt, &
     179             overshoot_limit_e, overshoot_limit_pt, &
    178180             overshoot_limit_u, overshoot_limit_v, overshoot_limit_w, &
    179181             passive_scalar, pch_index, phi, plant_canopy, prandtl_layer, &
    180              prandtl_number, precipitation, psolver, pt_reference, pt_surface, &
     182             prandtl_number, precipitation, psolver, pt_damping_factor, &
     183             pt_damping_width, pt_reference, pt_surface, &
    181184             pt_surface_initial_change, pt_vertical_gradient, &
    182185             pt_vertical_gradient_level, q_surface, q_surface_initial_change, &
     
    200203             uv_heights, u_bulk, u_profile, vg_surface, vg_vertical_gradient, &
    201204             vg_vertical_gradient_level, v_bulk, v_profile, wall_adjustment, &
    202              wall_heatflux, wall_humidityflux, wall_scalarflux
     205             wall_heatflux, wall_humidityflux, wall_scalarflux, z0h_factor
    203206
    204207
Note: See TracChangeset for help on using the changeset viewer.