Changeset 1815 for palm/trunk/SOURCE/modules.f90

Timestamp:

Apr 6, 2016 1:49:59 PM (9 years ago)

Author:

raasch

Message:

cpp-switches removed + cpp-bugfixes + zero-settings for velocities inside topography re-activated

File:

• palm/trunk/SOURCE/modules.f90 (modified) (3 diffs)

palm/trunk/SOURCE/modules.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! cpp-directive for decalpha removed
 !
 ! Former revisions:
@@ -926 +926 @@
                                topography_color = (/ 0.8_wp, 0.7_wp, 0.6_wp /)
 
-#if defined( __decalpha )
-    REAL(wp), DIMENSION(2,10)  ::  slicer_range_limits_dvrp = RESHAPE( (/      &
-                                   -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, &
-                                   -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp, &
-                                   -1.0_wp, 1.0_wp, -1.0_wp, 1.0_wp /), (/ 2, 10 /) )
-
-    REAL(wp), DIMENSION(3,10)  ::  isosurface_color = RESHAPE( (/                 &
-                                   0.9_wp, 0.9_wp, 0.9_wp,  0.8_wp, 0.1_wp, 0.1_wp,  0.1_wp, 0.1_wp, 0.8_wp, &
-                                   0.1_wp, 0.8_wp, 0.1_wp,  0.6_wp, 0.1_wp, 0.1_wp,  0.1_wp, 0.1_wp, 0.6_wp, &
-                                   0.1_wp, 0.6_wp, 0.1_wp,  0.4_wp, 0.1_wp, 0.1_wp,  0.1_wp, 0.1_wp, 0.4_wp, &
-                                   0.1_wp, 0.4_wp, 0.1_wp /), (/ 3, 10 /) )
-
-    REAL(sp), DIMENSION(2,100) ::  interval_values_dvrp, interval_h_dvrp =      &
-                                   RESHAPE( (/ 270.0_sp, 225.0_sp, 225.0_sp, 180.0_sp,      &
-                                                70.0_sp,  25.0_sp,  25.0_sp, -25.0_sp,      &
-                                               ( 0.0_sp, i9 = 1, 192 ) /),         &
-                                            (/ 2, 100 /) ),                     &
-                                   interval_l_dvrp = 0.5_sp, interval_s_dvrp = 1.0_sp,&
-                                   interval_a_dvrp = 0.0_sp,                       &
-                                   interval_values_dvrp_prt,                    &
-                                   interval_h_dvrp_prt = RESHAPE(               &
-                                   (/ 270.0_sp, 225.0_sp, 225.0_sp, 180.0_sp, 70.0_sp, 25.0_sp,   &
-                                      25.0_sp, -25.0_sp, ( 0.0_sp, i9 = 1, 192 ) /),     &
-                                                   (/ 2, 100 /) ),              &
-                                   interval_l_dvrp_prt = 0.5_sp,                   &
-                                   interval_s_dvrp_prt = 1.0_sp,                   &
-                                   interval_a_dvrp_prt = 0.0_sp
-#else
     REAL(wp), DIMENSION(2,10)     ::  slicer_range_limits_dvrp
 
@@ -980 +952 @@
     DATA  interval_h_dvrp_prt / 270.0_wp, 225.0_wp, 225.0_wp, 180.0_wp, 70.0_wp, 25.0_wp, &
                                 25.0_wp, -25.0_wp, 192 * 0.0_wp /
-#endif
 
     REAL(sp), DIMENSION(:), ALLOCATABLE ::  xcoor_dvrp, ycoor_dvrp, zcoor_dvrp