Index: palm/trunk/SOURCE/radiation_model_mod.f90
===================================================================
--- palm/trunk/SOURCE/radiation_model_mod.f90	(revision 2930)
+++ palm/trunk/SOURCE/radiation_model_mod.f90	(revision 2932)
@@ -28,4 +28,7 @@
 ! -----------------
 ! $Id$
+! renamed radiation_par to radiation_parameters
+! 
+! 2930 2018-03-23 16:30:46Z suehring
 ! Remove default surfaces from radiation model, does not make much sense to 
 ! apply radiation model without energy-balance solvers; Further, add check for 
@@ -2571,5 +2574,5 @@
 ! Description:
 ! ------------
-!> Parin for &radiation_par for radiation model
+!> Parin for &radiation_parameters for radiation model
 !------------------------------------------------------------------------------!
     SUBROUTINE radiation_parin
@@ -2592,12 +2595,25 @@
                                   average_radiation,                           &
                                   surf_reflections, svfnorm_report_thresh
-       
+   
+       NAMELIST /radiation_parameters/   albedo, albedo_type, albedo_lw_dir,   &
+                                  albedo_lw_dif, albedo_sw_dir, albedo_sw_dif, &
+                                  constant_albedo, dt_radiation, emissivity,   &
+                                  lw_radiation, net_radiation,                 &
+                                  radiation_scheme, skip_time_do_radiation,    &
+                                  sw_radiation, unscheduled_radiation_calls,   &
+                                  split_diffusion_radiation,                   &
+                                  max_raytracing_dist, min_irrf_value,         &
+                                  nrefsteps, mrt_factors, rma_lad_raytrace,    &
+                                  dist_max_svf,                                &
+                                  average_radiation,                           &
+                                  surf_reflections, svfnorm_report_thresh
+   
        line = ' '
        
 !
-!--    Try to find radiation model package
+!--    Try to find radiation model namelist
        REWIND ( 11 )
        line = ' '
-       DO   WHILE ( INDEX( line, '&radiation_par' ) == 0 )
+       DO   WHILE ( INDEX( line, '&radiation_parameters' ) == 0 )
           READ ( 11, '(A)', END=10 )  line
        ENDDO
@@ -2606,16 +2622,41 @@
 !
 !--    Read user-defined namelist
-       READ ( 11, radiation_par )
+       READ ( 11, radiation_parameters )
 
 !
 !--    Set flag that indicates that the radiation model is switched on
        radiation = .TRUE.
+       
+       GOTO 12
+!
+!--    Try to find old namelist
+ 10    REWIND ( 11 )
+       line = ' '
+       DO   WHILE ( INDEX( line, '&radiation_par' ) == 0 )
+          READ ( 11, '(A)', END=12 )  line
+       ENDDO
+       BACKSPACE ( 11 )
+
+!
+!--    Read user-defined namelist
+       READ ( 11, radiation_par )
+       
+       message_string = 'namelist radiation_par is deprecated and will be ' // &
+                     'removed in near future. Please &use namelist ' //        &
+                     'radiation_parameters instead'
+       CALL message( 'radiation_parin', 'PA0487', 0, 1, 0, 6, 0 )
+
+       
+!
+!--    Set flag that indicates that the radiation model is switched on
+       radiation = .TRUE.
+
+ 12    CONTINUE
+       
+
 
 !--    Set radiation_interactions flag according to urban_ and land_surface flag
-       IF ( urban_surface  .OR.  land_surface ) radiation_interactions = .TRUE.
-
- 10    CONTINUE
+       IF ( urban_surface  .OR.  land_surface )  radiation_interactions = .TRUE.
        
-
     END SUBROUTINE radiation_parin
 
@@ -5451,5 +5492,5 @@
                CASE DEFAULT
                   WRITE(message_string, *) 'ERROR: the surface type ',td , ' is not supported for calculating SVF'
-                  CALL message( 'radiation_calc_svf', 'PA0XXX', 1, 2, 0, 6, 0 )
+                  CALL message( 'radiation_calc_svf', 'PA0488', 1, 2, 0, 6, 0 )
             END SELECT
 
