Changeset 3151 for palm/trunk/SOURCE

Timestamp:

Jul 19, 2018 8:45:38 AM (6 years ago)

Author:

raasch

Message:

output of PALM code revision number in palmrun header, some preprocessor define strings removed, small revisions in configuration files

Location:

palm/trunk/SOURCE

Files:

• sum_up_3d_data.f90 (modified) (2 diffs)
• urban_surface_mod.f90 (modified) (6 diffs)

palm/trunk/SOURCE/sum_up_3d_data.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Remaining preprocessor directive __chem removed
+! 
+! 3004 2018-04-27 12:33:25Z Giersch
 ! prr field added to ONLY-list, prr* case/pr* case/precipitation_rate_av 
 ! removed, further allocation checks implemented
@@ -532 +535 @@
 !
 !--             Chemical quantity                                           
-#if defined( __chem )                
                 IF ( air_chemistry  .AND.  trimvar(1:3) == 'kc_')  THEN
                    CALL chem_3d_data_averaging( 'allocate', doav(ii) )
                 ENDIF
-#endif
 
 !

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -28 +28 @@
 ! -----------------
 ! $Id$
+! remaining preprocessor define strings __check removed
+! 
+! 3136 2018-07-16 14:48:21Z suehring
 ! Limit also roughness length for heat and moisture where necessary
 ! 
@@ -372 +375 @@
 
 !-- configuration parameters (they can be setup in PALM config)
-    LOGICAL                                        ::  usm_material_model = .TRUE.        !< flag parameter indicating wheather the  model of heat in materials is used
-    LOGICAL                                        ::  usm_anthropogenic_heat = .FALSE.   !< flag parameter indicating wheather the anthropogenic heat sources (e.g.transportation) are used
-    LOGICAL                                        ::  force_radiation_call_l = .FALSE.   !< flag parameter for unscheduled radiation model calls
-    LOGICAL                                        ::  indoor_model = .FALSE.              !< whether to use the indoor model
-    LOGICAL                                        ::  read_wall_temp_3d = .FALSE.
-
-
-    INTEGER(iwp)                                   ::  building_type = 1                  !< default building type (preleminary setting)
-    INTEGER(iwp)                                   ::  land_category = 2                  !< default category for land surface
-    INTEGER(iwp)                                   ::  wall_category = 2                  !< default category for wall surface over pedestrian zone
-    INTEGER(iwp)                                   ::  pedestrian_category = 2            !< default category for wall surface in pedestrian zone
-    INTEGER(iwp)                                   ::  roof_category = 2                  !< default category for root surface
-    REAL(wp)                                       ::  roughness_concrete = 0.001_wp      !< roughness length of average concrete surface
+    LOGICAL ::  usm_material_model = .TRUE.        !< flag parameter indicating wheather the  model of heat in materials is used
+    LOGICAL ::  usm_anthropogenic_heat = .FALSE.   !< flag parameter indicating wheather the anthropogenic heat sources (e.g.transportation) are used
+    LOGICAL ::  force_radiation_call_l = .FALSE.   !< flag parameter for unscheduled radiation model calls
+    LOGICAL ::  indoor_model = .FALSE.             !< whether to use the indoor model
+    LOGICAL ::  read_wall_temp_3d = .FALSE.
+
+
+    INTEGER(iwp) ::  building_type = 1               !< default building type (preleminary setting)
+    INTEGER(iwp) ::  land_category = 2               !< default category for land surface
+    INTEGER(iwp) ::  wall_category = 2               !< default category for wall surface over pedestrian zone
+    INTEGER(iwp) ::  pedestrian_category = 2         !< default category for wall surface in pedestrian zone
+    INTEGER(iwp) ::  roof_category = 2               !< default category for root surface
+    REAL(wp)     ::  roughness_concrete = 0.001_wp   !< roughness length of average concrete surface
 !
 !-- Indices of input attributes for (above) ground floor level 
@@ -5462 +5465 @@
             ENDIF
             
-#if defined( __parallel ) && ! defined ( __check )
+#if defined( __parallel )
             CALL MPI_BARRIER( comm2d, ierr )
 #endif
@@ -5496 +5499 @@
             ENDIF
             
-#if defined( __parallel ) && ! defined ( __check )
+#if defined( __parallel )
             CALL MPI_BARRIER( comm2d, ierr )
 #endif
@@ -6816 +6819 @@
 
             ENDIF
-#if defined( __parallel ) && ! defined ( __check )
+#if defined( __parallel )
             CALL MPI_BARRIER( comm2d, ierr )
 #endif
         ENDDO
         
-        !
+!
 !--     check completeness and formal correctness of the data
         DO i = nxlg, nxrg
@@ -7253 +7256 @@
                 CALL message( 'usm_read_wall_temperature', 'PA0523', 1, 2, 0, 6, 0 )
             ENDIF
-#if defined( __parallel ) && ! defined ( __check )
+#if defined( __parallel )
             CALL MPI_BARRIER( comm2d, ierr )
 #endif