Ignore:
Timestamp:
Jun 1, 2007 3:25:22 PM (15 years ago)
Author:
raasch
Message:

preliminary uncomplete changes for ocean version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/parin.f90

    r90 r94  
    44! Actual revisions:
    55! -----------------
    6 !
     6! +ocean, sa_surface, sa_vertical_gradient, sa_vertical_gradient_level,
     7! top_salinity_flux in inipar,
     8! sa_init is allocated
    79!
    810! Former revisions:
     
    6163    NAMELIST /inipar/  adjust_mixing_length, alpha_surface, bc_e_b, bc_lr, &
    6264                       bc_ns, bc_p_b, bc_p_t, bc_pt_b, bc_pt_t, bc_q_b, &
    63                        bc_q_t,bc_s_b, bc_s_t, bc_uv_b, bc_uv_t, &
    64                        building_height, building_length_x, building_length_y, &
    65                        building_wall_left, building_wall_south, &
    66                        cloud_droplets, cloud_physics, conserve_volume_flow, &
    67                        cut_spline_overshoot, damp_level_1d, dissipation_1d, &
    68                        dt, dt_pr_1d, dt_run_control_1d, dx, dy, dz, dz_max, &
    69                        dz_stretch_factor, dz_stretch_level, e_min, &
    70                        end_time_1d, fft_method, galilei_transformation, &
    71                        grid_matching, humidity, inflow_disturbance_begin, &
    72                        inflow_disturbance_end, initializing_actions, &
    73                        km_constant, km_damp_max, long_filter_factor, &
    74                        loop_optimization, mixing_length_1d, &
    75                        momentum_advec, netcdf_precision, npex, npey, nsor_ini, &
    76                        nx, ny, nz, omega, outflow_damping_width, &
    77                        overshoot_limit_e, &
    78                        overshoot_limit_pt, overshoot_limit_u, &
    79                        overshoot_limit_v, overshoot_limit_w, passive_scalar, &
    80                        phi, prandtl_layer, precipitation, pt_reference, &
    81                        pt_surface, pt_surface_initial_change, &
    82                        pt_vertical_gradient, pt_vertical_gradient_level, &
    83                        q_surface, q_surface_initial_change, &
    84                        q_vertical_gradient, q_vertical_gradient_level, &
    85                        radiation, random_generator, random_heatflux, rif_max, &
    86                        rif_min, roughness_length, scalar_advec, &
    87                        statistic_regions, surface_heatflux, surface_pressure, &
    88                        surface_scalarflux, surface_waterflux, s_surface, &
    89                        s_surface_initial_change, s_vertical_gradient, &
    90                        s_vertical_gradient_level, top_heatflux, &
    91                        timestep_scheme, topography, ug_surface, &
    92                        ug_vertical_gradient, ug_vertical_gradient_level, &
    93                        ups_limit_e, ups_limit_pt, ups_limit_u, ups_limit_v, &
    94                        ups_limit_w, use_surface_fluxes, use_top_fluxes, &
    95                        use_ug_for_galilei_tr, use_upstream_for_tke, &
    96                        vg_surface, vg_vertical_gradient, &
    97                        vg_vertical_gradient_level, wall_adjustment, &
    98                        wall_heatflux
     65             bc_q_t,bc_s_b, bc_s_t, bc_uv_b, bc_uv_t, building_height, &
     66             building_length_x, building_length_y, building_wall_left, &
     67             building_wall_south, cloud_droplets, cloud_physics, &
     68             conserve_volume_flow, cut_spline_overshoot, damp_level_1d, &
     69             dissipation_1d, dt, dt_pr_1d, dt_run_control_1d, dx, dy, dz, &
     70             dz_max, dz_stretch_factor, dz_stretch_level, e_min, end_time_1d, &
     71             fft_method, galilei_transformation, grid_matching, humidity, &
     72             inflow_disturbance_begin, inflow_disturbance_end, &
     73             initializing_actions, km_constant, km_damp_max, &
     74             long_filter_factor, loop_optimization, mixing_length_1d, &
     75             momentum_advec, netcdf_precision, npex, npey, nsor_ini, nx, ny, &
     76             nz, ocean, omega, outflow_damping_width, overshoot_limit_e, &
     77             overshoot_limit_pt, overshoot_limit_u, overshoot_limit_v, &
     78             overshoot_limit_w, passive_scalar, phi, prandtl_layer, &
     79             precipitation, pt_reference, pt_surface, &
     80             pt_surface_initial_change, pt_vertical_gradient, &
     81             pt_vertical_gradient_level, q_surface, q_surface_initial_change, &
     82             q_vertical_gradient, q_vertical_gradient_level, radiation, &
     83             random_generator, random_heatflux, rif_max, rif_min, &
     84             roughness_length, sa_surface, sa_vertical_gradient, &
     85             sa_vertical_gradient_level, scalar_advec, statistic_regions, &
     86             surface_heatflux, surface_pressure, surface_scalarflux, &
     87             surface_waterflux, s_surface, s_surface_initial_change, &
     88             s_vertical_gradient, s_vertical_gradient_level, top_heatflux, &
     89             top_salinity_flux, timestep_scheme, topography, ug_surface, &
     90             ug_vertical_gradient, ug_vertical_gradient_level, ups_limit_e, &
     91             ups_limit_pt, ups_limit_u, ups_limit_v, ups_limit_w, &
     92             use_surface_fluxes, use_top_fluxes, use_ug_for_galilei_tr, &
     93             use_upstream_for_tke, vg_surface, vg_vertical_gradient, &
     94             vg_vertical_gradient_level, wall_adjustment, wall_heatflux
    9995
    10096
     
    232228
    233229       ALLOCATE( ug(0:nz+1), vg(0:nz+1), &
    234                  pt_init(0:nz+1), q_init(0:nz+1), u_init(0:nz+1), &
    235                  v_init(0:nz+1),                                  &
     230                 pt_init(0:nz+1), q_init(0:nz+1), sa_init(0:nz+1), &
     231                 u_init(0:nz+1), v_init(0:nz+1),                   &
    236232                 hom(0:nz+1,2,pr_palm+max_pr_user,0:statistic_regions) )
    237233       hom = 0.0
Note: See TracChangeset for help on using the changeset viewer.