Index: palm/trunk/SOURCE/parin.f90
===================================================================
--- palm/trunk/SOURCE/parin.f90	(revision 2921)
+++ palm/trunk/SOURCE/parin.f90	(revision 2932)
@@ -25,4 +25,8 @@
 ! -----------------
 ! $Id$
+! inipar renamed to initialization_parameters.
+! d3par renamed to runtime_parameters.
+! 
+! 2921 2018-03-22 15:05:23Z Giersch
 ! Activation of spinup has been moved from lsm/usm_parin to parin itself
 ! 
@@ -523,5 +527,75 @@
              wall_salinityflux, wall_scalarflux, y_shift, zeta_max, zeta_min,  &
              z0h_factor
-      
+
+    NAMELIST /initialization_parameters/  aerosol_bulk, alpha_surface,         &
+             approximation, bc_e_b,                                            &
+             bc_lr, bc_ns, bc_p_b, bc_p_t, bc_pt_b, bc_pt_t, bc_q_b,           &
+             bc_q_t,bc_s_b, bc_s_t, bc_sa_t, bc_uv_b, bc_uv_t,                 &
+             bottom_salinityflux, building_height, building_length_x,          &
+             building_length_y, building_wall_left, building_wall_south,       &
+             calc_soil_moisture_during_spinup,                                 &
+             call_psolver_at_all_substeps, call_microphysics_at_all_substeps,  &
+             canyon_height,                                                    &
+             canyon_width_x, canyon_width_y, canyon_wall_left,                 &
+             canyon_wall_south, c_sedimentation, cfl_factor, cloud_droplets,   &
+             cloud_physics, cloud_scheme, cloud_top_radiation,                 &
+             cloud_water_sedimentation,                                        &
+             collective_wait, collision_turbulence, complex_terrain,           &
+             conserve_volume_flow,                                             &
+             conserve_volume_flow_mode, constant_flux_layer,                   &
+             coupling_start_time, curvature_solution_effects_bulk,             &
+             cycle_mg, damp_level_1d,                                          &
+             data_output_during_spinup,                                        &
+             day_of_year_init,                                                 &
+             dissipation_1d,                                                   &
+             dp_external, dp_level_b, dp_smooth, dpdxy, dry_aerosol_radius,    &
+             dt, dt_pr_1d, dt_run_control_1d, dt_spinup, dx, dy, dz, dz_max,   &
+             dz_stretch_factor, dz_stretch_level, end_time_1d,                 &
+             ensemble_member_nr, e_init, e_min, fft_method,                    &
+             flux_input_mode, flux_output_mode, forcing,                       &
+             galilei_transformation, humidity,                                 &
+             inflow_damping_height, inflow_damping_width,                      &
+             inflow_disturbance_begin, inflow_disturbance_end,                 &
+             initializing_actions, km_constant,                                &
+             large_scale_forcing, large_scale_subsidence, latitude,            &
+             limiter_sedimentation, longitude,                                 &
+             loop_optimization, lsf_exception, masking_method, mg_cycles,      &
+             mg_switch_to_pe0_level, mixing_length_1d, momentum_advec,         &
+             most_method, na_init, nc_const, netcdf_precision, neutral, ngsrb, &
+             nsor, nsor_ini, nudging, nx, ny, nz, ocean, omega, omega_sor,     &
+             outflow_source_plane, passive_scalar,                             &
+             prandtl_number, precipitation, psolver, pt_damping_factor,        &
+             pt_damping_width, pt_reference, pt_surface,                       &
+             pt_surface_initial_change, pt_vertical_gradient,                  &
+             pt_vertical_gradient_level, q_surface, q_surface_initial_change,  &
+             q_vertical_gradient, q_vertical_gradient_level,                   &
+             random_generator, random_heatflux, rans_mode,                     &
+             rayleigh_damping_factor, rayleigh_damping_height,                 &
+             recycling_width, recycling_yshift,                                &
+             reference_state, residual_limit,                                  &
+             roughness_length, sa_surface,                                     &
+             sa_vertical_gradient, sa_vertical_gradient_level, scalar_advec,   &
+             scalar_rayleigh_damping, sigma_bulk,                              &
+             spinup_time, spinup_pt_amplitude, spinup_pt_mean,                 &
+             statistic_regions, subs_vertical_gradient,                        &
+             subs_vertical_gradient_level, surface_heatflux, surface_pressure, &
+             surface_scalarflux, surface_waterflux,                            &
+             s_surface, s_surface_initial_change, s_vertical_gradient,         &
+             s_vertical_gradient_level, time_utc_init, timestep_scheme,        &
+             topography, topography_grid_convention, top_heatflux,             &
+             top_momentumflux_u, top_momentumflux_v, top_salinityflux,         &
+             top_scalarflux, transpose_compute_overlap,                        &
+             tunnel_height, tunnel_length, tunnel_width_x, tunnel_width_y,     &
+             tunnel_wall_depth, turbulence_closure,                            &
+             turbulent_inflow, turbulent_outflow,                              &
+             use_subsidence_tendencies, ug_surface, ug_vertical_gradient,      &
+             ug_vertical_gradient_level, use_surface_fluxes, use_cmax,         &
+             use_top_fluxes, use_ug_for_galilei_tr, use_upstream_for_tke,      &
+             uv_heights, u_bulk, u_profile, vg_surface, vg_vertical_gradient,  &
+             vg_vertical_gradient_level, v_bulk, v_profile, ventilation_effect,&
+             wall_adjustment, wall_heatflux, wall_humidityflux,                &
+             wall_salinityflux, wall_scalarflux, y_shift, zeta_max, zeta_min,  &
+             z0h_factor
+             
     NAMELIST /d3par/  averaging_interval, averaging_interval_pr,               &
              cpu_log_barrierwait, create_disturbances,                         &
@@ -545,4 +619,24 @@
              termination_time_needed, vnest_start_time, z_max_do2d
 
+    NAMELIST /runtime_parameters/  averaging_interval, averaging_interval_pr,  &
+             cpu_log_barrierwait, create_disturbances,                         &
+             cross_profiles, data_output, data_output_masks,                   &
+             data_output_pr, data_output_2d_on_each_pe, disturbance_amplitude, &
+             disturbance_energy_limit, disturbance_level_b,                    &
+             disturbance_level_t, do2d_at_begin, do3d_at_begin,                &
+             dt, dt_averaging_input, dt_averaging_input_pr,                    &
+             dt_coupling, dt_data_output, dt_data_output_av, dt_disturb,       &
+             dt_domask, dt_dopr, dt_dopr_listing, dt_dots, dt_do2d_xy,         &
+             dt_do2d_xz, dt_do2d_yz, dt_do3d, dt_max, dt_restart,              &
+             dt_run_control,end_time, force_print_header, mask_scale_x,        &
+             mask_scale_y, mask_scale_z, mask_x, mask_y, mask_z, mask_x_loop,  &
+             mask_y_loop, mask_z_loop, netcdf_data_format, netcdf_deflate,     &
+             normalizing_region, npex, npey, nz_do3d,                          &
+             precipitation_amount_interval, profile_columns, profile_rows,     &
+             restart_time, section_xy, section_xz, section_yz,                 &
+             skip_time_data_output, skip_time_data_output_av, skip_time_dopr,  &
+             skip_time_do2d_xy, skip_time_do2d_xz, skip_time_do2d_yz,          &
+             skip_time_do3d, skip_time_domask, synchronous_exchange,           &
+             termination_time_needed, vnest_start_time, z_max_do2d
 
     NAMELIST /envpar/  batch_job, host, local_dvrserver_running,               &
@@ -617,24 +711,40 @@
 !--       Read the control parameters for initialization.
 !--       The namelist "inipar" must be provided in the NAMELIST-file.
-          READ ( 11, inipar, ERR=10, END=11 )
+          READ ( 11, initialization_parameters, ERR=10, END=11 )
 
           GOTO 12
 
- 10       message_string = 'errors in \$inipar &or no \$inipar-namelist ' //   &
+ 10       message_string = 'errors in initialization_parameters &or no ' //    &
+                           'initialization_parameters-namelist ' //            &
                            'found (CRAY-machines only)'
           CALL message( 'parin', 'PA0271', 1, 2, 0, 6, 0 )
 
- 11       message_string = 'no \$inipar-namelist found'
+ 11       REWIND ( 11 )
+          READ ( 11, inipar, ERR=13, END=14 )
+ 
+          message_string = 'namelist inipar is deprecated and will be ' //     &
+                          'removed in near future. Please &use namelist ' //   &
+                          'initialization_parameters instead'
+          CALL message( 'parin', 'PA0272', 0, 1, 0, 6, 0 )
+ 
+          GOTO 12
+ 
+ 13       message_string = 'errors in inipar &or no inipar-namelist ' //       &
+                           'found (CRAY-machines only)'
+          CALL message( 'parin', 'PA0271', 1, 2, 0, 6, 0 )
+          
+ 14       message_string = 'no initialization_parameters-namelist found'
           CALL message( 'parin', 'PA0272', 1, 2, 0, 6, 0 )
 
 !
 !--       Try to read runtime parameters given by the user for this run
-!--       (namelist "d3par"). The namelist "d3par" can be omitted. In that case
-!--       default values are used for the parameters.
+!--       (namelist "runtime_parameters"). The namelist "runtime_parmeters"    
+!--       can be omitted. In that case default values are used for the         
+!--       parameters.
  12       line = ' '
 
           REWIND ( 11 )
           line = ' '
-          DO   WHILE ( INDEX( line, '&d3par' ) == 0 )
+          DO   WHILE ( INDEX( line, '&runtime_parameters' ) == 0 )
              READ ( 11, '(A)', END=20 )  line
           ENDDO
@@ -643,7 +753,25 @@
 !
 !--       Read namelist
+          READ ( 11, runtime_parameters )
+
+          GOTO 21
+          
+ 20       REWIND ( 11 )
+          line = ' '
+          DO   WHILE ( INDEX( line, '&d3par' ) == 0 )
+             READ ( 11, '(A)', END=21 )  line
+          ENDDO
+          BACKSPACE ( 11 )
+ 
+ !
+!--       Read namelist
           READ ( 11, d3par )
-
- 20       CONTINUE
+ 
+          message_string = 'namelist d3par is deprecated and will be ' //      &
+                          'removed in near future. Please &use namelist ' //   &
+                          'runtime_parameters instead'
+          CALL message( 'parin', 'PA0487', 0, 1, 0, 6, 0 )
+          
+ 21       CONTINUE
 
 !
