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

Timestamp:

Dec 14, 2009 7:14:46 AM (14 years ago)

Author:

raasch

Message:

data asignments for dvrp arrays switched back to old settings due to runtime problems; type problem in mpi_waitall (poisfft_hybrid) fixed for mpi2 libraries

File:

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

palm/trunk/SOURCE/modules.f90

@@ -717 +717 @@
                            topography_color = (/ 0.8, 0.7, 0.6 /)
 
-!#if defined( __decalpha )
+#if defined( __decalpha )
     REAL, DIMENSION(2,10)  ::  slicer_range_limits_dvrp = RESHAPE( (/       &
                                 -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
@@ -744 +744 @@
                                   interval_s_dvrp_prt = 1.0,                   &
                                   interval_a_dvrp_prt = 0.0
-!#else
-!    REAL, DIMENSION(2,10)     ::  slicer_range_limits_dvrp
-
-!    REAL, DIMENSION(3,10)     ::  isosurface_color
-
-!    REAL(4), DIMENSION(2,100) ::  interval_values_dvrp,                       &
-!                                  interval_values_dvrp_prt, interval_h_dvrp,  &
-!                                  interval_h_dvrp_prt, interval_l_dvrp = 0.5, &
-!                                  interval_l_dvrp_prt = 0.5, interval_s_dvrp = 1.0, &
-!                                  interval_s_dvrp_prt = 1.0, interval_a_dvrp = 0.0, &
-!                                  interval_a_dvrp_prt = 0.0
-
-!    DATA  slicer_range_limits_dvrp / -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
-!                                     -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
-!                                     -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
-!                                     -1.0, 1.0 /
-
-!    DATA  isosurface_color / 0.9, 0.9, 0.9,  0.8, 0.1, 0.1,  0.1, 0.1, 0.8, &
-!                             0.1, 0.8, 0.1,  0.6, 0.1, 0.1,  0.1, 0.1, 0.6, &
-!                             0.1, 0.6, 0.1,  0.4, 0.1, 0.1,  0.1, 0.1, 0.4, &
-!                             0.1, 0.4, 0.1 /
-
-!    DATA  interval_h_dvrp / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, &
-!                            25.0, -25.0, 192 * 0.0 /
-
-!    DATA  interval_h_dvrp_prt / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, &
-!                                25.0, -25.0, 192 * 0.0 /
-!#endif
+#else
+    REAL, DIMENSION(2,10)     ::  slicer_range_limits_dvrp
+
+    REAL, DIMENSION(3,10)     ::  isosurface_color
+
+    REAL(4), DIMENSION(2,100) ::  interval_values_dvrp,                       &
+                                  interval_values_dvrp_prt, interval_h_dvrp,  &
+                                  interval_h_dvrp_prt, interval_l_dvrp = 0.5, &
+                                  interval_l_dvrp_prt = 0.5, interval_s_dvrp = 1.0, &
+                                  interval_s_dvrp_prt = 1.0, interval_a_dvrp = 0.0, &
+                                  interval_a_dvrp_prt = 0.0
+
+    DATA  slicer_range_limits_dvrp / -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
+                                     -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
+                                     -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &
+                                     -1.0, 1.0 /
+
+    DATA  isosurface_color / 0.9, 0.9, 0.9,  0.8, 0.1, 0.1,  0.1, 0.1, 0.8, &
+                             0.1, 0.8, 0.1,  0.6, 0.1, 0.1,  0.1, 0.1, 0.6, &
+                             0.1, 0.6, 0.1,  0.4, 0.1, 0.1,  0.1, 0.1, 0.4, &
+                             0.1, 0.4, 0.1 /
+
+    DATA  interval_h_dvrp / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, &
+                            25.0, -25.0, 192 * 0.0 /
+
+    DATA  interval_h_dvrp_prt / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, &
+                                25.0, -25.0, 192 * 0.0 /
+#endif
 
     REAL(4), DIMENSION(:), ALLOCATABLE ::  xcoor_dvrp, ycoor_dvrp, zcoor_dvrp