Index: palm/trunk/SOURCE/module_interface.f90
===================================================================
--- palm/trunk/SOURCE/module_interface.f90	(revision 3700)
+++ palm/trunk/SOURCE/module_interface.f90	(revision 3701)
@@ -270,5 +270,6 @@
 
    USE user,                                                                   &
-       ONLY:  user_parin,                                                      &
+       ONLY:  user_module_enabled,                                             &
+              user_parin,                                                      &
               user_check_parameters,                                           &
               user_check_data_output_ts,                                       &
@@ -479,5 +480,5 @@
    IF ( urban_surface )        CALL usm_check_parameters
    IF ( wind_turbine )         CALL wtm_check_parameters
-                               CALL user_check_parameters
+   IF ( user_module_enabled )  CALL user_check_parameters
 
 
@@ -503,5 +504,7 @@
    ENDIF
 
-   CALL user_check_data_output_ts( dots_max, dots_num, dots_label, dots_unit )
+   IF ( user_module_enabled )  THEN
+      CALL user_check_data_output_ts( dots_max, dots_num, dots_label, dots_unit )
+   ENDIF
 
 
@@ -551,5 +554,5 @@
    ENDIF
 
-   IF ( unit == 'illegal' )  THEN
+   IF ( unit == 'illegal'  .AND.  user_module_enabled )  THEN
       unit = '' ! ToDo: Seems like a hack. Find a general soultion!
       CALL user_check_data_output_pr( variable, var_count, unit, dopr_unit )
@@ -618,5 +621,5 @@
    ENDIF
 
-   IF ( unit == 'illegal' )  THEN
+   IF ( unit == 'illegal'  .AND.  user_module_enabled )  THEN
       unit = ''
       CALL user_check_data_output( variable, unit )
@@ -652,5 +655,5 @@
    ENDIF
 
-   IF ( unit == 'illegal' )  THEN
+   IF ( unit == 'illegal'  .AND.  user_module_enabled )  THEN
       unit = ''
       CALL user_check_data_output( variable, unit )
@@ -732,5 +735,5 @@
    IF ( wind_turbine        )  CALL wtm_init
    IF ( radiation           )  CALL radiation_init
-                               CALL user_init
+   IF ( user_module_enabled )  CALL user_init
 
 
@@ -763,6 +766,5 @@
    IF ( calculate_spectra   )  CALL spectra_header( io )
    IF ( syn_turb_gen        )  CALL stg_header( io )
-
-   CALL user_header( io ) ! ToDo: make user module switch
+   IF ( user_module_enabled )  CALL user_header( io )
 
 
@@ -782,6 +784,5 @@
 
    IF ( gust_module_enabled )  CALL gust_actions( location )
-
-   CALL user_actions( location ) ! ToDo: make user module switch
+   IF ( user_module_enabled )  CALL user_actions( location )
 
 
@@ -803,6 +804,5 @@
 
    IF ( gust_module_enabled )  CALL gust_actions( i, j, location )
-
-   CALL user_actions( i, j, location ) ! ToDo: make user module switch
+   IF ( user_module_enabled )  CALL user_actions( i, j, location )
 
 
@@ -853,6 +853,5 @@
    IF ( salsa               )  CALL salsa_3d_data_averaging( mode, variable )
    IF ( urban_surface       )  CALL usm_3d_data_averaging( mode, variable )
-
-   CALL user_3d_data_averaging( mode, variable ) ! ToDo: make user module switch
+   IF ( user_module_enabled )  CALL user_3d_data_averaging( mode, variable )
 
 
@@ -930,5 +929,5 @@
    ENDIF
 
-   IF ( .NOT. found )  THEN  ! ToDo: make user module switch
+   IF ( .NOT. found  .AND.  user_module_enabled )  THEN
       CALL user_data_output_2d(                                                &
               av, variable, found, grid, local_pf, two_d, nzb_do, nzt_do       &
@@ -1000,5 +999,5 @@
    ENDIF
 
-   IF ( .NOT. found )  THEN  ! ToDo: make user module switch
+   IF ( .NOT. found  .AND.  user_module_enabled )  THEN
       CALL user_data_output_3d( av, variable, found, local_pf, nzb_do, nzt_do )
       resorted = .TRUE.
@@ -1024,6 +1023,5 @@
    IF ( gust_module_enabled )  CALL gust_statistics( mode, sr, tn, dots_max )
    IF ( air_chemistry       )  CALL chem_statistics( mode, sr, tn )
-
-   CALL user_statistics( mode, sr, tn ) ! ToDo: make user module switch
+   IF ( user_module_enabled )  CALL user_statistics( mode, sr, tn )
 
 
@@ -1049,5 +1047,4 @@
    IF ( .NOT. found )  CALL stg_rrd_global ( found ) ! ToDo: change interface to pass variable
    IF ( .NOT. found )  CALL wtm_rrd_global( found ) ! ToDo: change interface to pass variable
-
    IF ( .NOT. found )  CALL user_rrd_global( found ) ! ToDo: change interface to pass variable
 
@@ -1071,6 +1068,5 @@
    IF ( syn_turb_gen )         CALL stg_wrd_global
    IF ( wind_turbine )         CALL wtm_wrd_global
-
-   CALL user_wrd_global ! ToDo: make user module switch
+   IF ( user_module_enabled )  CALL user_wrd_global
 
 
@@ -1218,6 +1214,5 @@
    IF ( salsa )                CALL salsa_wrd_local
    IF ( urban_surface )        CALL usm_wrd_local
-
-   CALL user_wrd_local ! ToDo: make user module switch
+   IF ( user_module_enabled )  CALL user_wrd_local
 
 
@@ -1233,5 +1228,5 @@
 
 
-   CALL user_last_actions ! ToDo: make user module switch
+   IF ( user_module_enabled )  CALL user_last_actions
 
 
