Changeset 284 for palm/trunk/SOURCE/data_output_dvrp.f90

Timestamp:

Apr 6, 2009 6:36:10 AM (16 years ago)

Author:

raasch

Message:

further dvr updates

File:

• palm/trunk/SOURCE/data_output_dvrp.f90 (modified) (6 diffs)

palm/trunk/SOURCE/data_output_dvrp.f90

@@ -93 +93 @@
     CHARACTER (LEN=6) ::  output_variable
     INTEGER ::  c_mode, c_size_x, c_size_y, c_size_z, dvrp_nop, dvrp_not,     &
-                gradient_normals, i, ip, j, jp, k, l, m, n, nn, section_mode, &
-                tv, vn
+                gradient_normals, i, ip, j, jp, k, l, m, n, n_isosurfave,     &
+                n_slicer, nn, section_mode, vn
     INTEGER, DIMENSION(:), ALLOCATABLE ::  p_c, p_t
 
@@ -111 +111 @@
 !
 !-- Loop over all output modes choosed
-    m           = 1
-    tv          = 0  ! threshold counter
-    islice_dvrp = 0  ! slice plane counter
+    m            = 1
+    n_isosurface = 0  ! isosurface counter (for threshold values and color)
+    n_slicer     = 0  ! slice plane counter (for range of values)
     DO WHILE ( mode_dvrp(m) /= ' ' )
 !
@@ -131 +131 @@
           READ ( mode_dvrp(m), '(10X,I2)' )  vn
           output_variable = do3d(0,vn)
-          tv = tv + 1
+          n_isosurface = n_isosurface + 1
        ELSEIF ( mode_dvrp(m)(1:6) == 'slicer' )  THEN
           READ ( mode_dvrp(m), '(6X,I2)' )  vn
@@ -475 +475 @@
 
 !
-!--          Definition of characteristics of isosurface material
-!--          Preliminary settings for w and pt!
-             IF ( output_variable == 'w' )  THEN
-                IF ( tv == 1 )  THEN
-                   tmp_r = 0.8;  tmp_g = 0.1;  tmp_b = 0.1;  tmp_t = 0.0
-                   CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
-                ELSE
-                   tmp_r = 0.1;  tmp_g = 0.1;  tmp_b = 0.8;  tmp_t = 0.0
-                   CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
-                ENDIF
-             ELSEIF ( output_variable == 'pt' )  THEN
-                tmp_r = 0.8;  tmp_g = 0.1;  tmp_b = 0.1;  tmp_t = 0.0
-                CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
-             ELSE
-                tmp_r = 0.9;  tmp_g = 0.9;  tmp_b = 0.9;  tmp_t = 0.0
-                CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
-             ENDIF
-             WRITE(9,*) '#8.1'
-             CALL local_flush( 9 )
+!--          Definition of isosurface color
+             tmp_r = isosurface_color(1,n_isosurface)
+             tmp_g = isosurface_color(2,n_isosurface)
+             tmp_b = isosurface_color(3,n_isosurface)
+             tmp_t = 0.0
+             CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
 
 !
@@ -525 +512 @@
 
              IF ( dvrp_overlap )  THEN
-                tmp_th = threshold(tv)
+                tmp_th = threshold(n_isosurface)
              ELSE
                 tmp_th = 1.0   ! nothing is plotted because array values are 0
@@ -559 +546 @@
              CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
 
-             islice_dvrp = islice_dvrp + 1
-!             CALL DVRP_COLORFUNCTION( m-1, DVRP_CM_HLS, 25,                    &
-!                                      slicer_range_limits_dvrp(:,islice_dvrp), &
+             n_slicer = n_slicer + 1
+
+!
+!--           Using dolorfunction has not been properly tested
+!             islice_dvrp = n_slicer
+!             CALL DVRP_COLORFUNCTION( m-1, DVRP_CM_HLS, 25,                 &
+!                                      slicer_range_limits_dvrp(:,n_slicer), &
 !                                      color_dvrp )
 
+!
+!--          Set interval of values defining the colortable
+             CALL set_slicer_attributes_dvrp( n_slicer )
+
+!
+!--          Create user-defined colortable
              CALL user_dvrp_coltab( 'slicer', output_variable )