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

Timestamp:

Nov 6, 2008 8:54:02 AM (15 years ago)

Author:

raasch

Message:

updates in dvr routines for new dvr version

File:

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

palm/trunk/SOURCE/data_output_dvrp.f90

@@ -32 +32 @@
 ! Actual revisions:
 ! -----------------
-! 
+! DVRP arguments changed to single precision, mode pathlines added
 ! TEST: different colours for isosurfaces
 ! TEST: write statements
@@ -72 +72 @@
     USE arrays_3d
     USE cloud_parameters
+    USE constants
     USE cpulog
     USE DVRP
@@ -87 +88 @@
     CHARACTER (LEN=2) ::  section_chr
     CHARACTER (LEN=6) ::  output_variable
-    INTEGER ::  i, j, k, l, m, n, nn, section_mode, tv, vn
+    INTEGER ::  c_mode, c_size_x, c_size_y, c_size_z, gradient_normals, i, j, &
+                k, l, m, n, nn, section_mode, tv, vn
     INTEGER, DIMENSION(:), ALLOCATABLE ::  p_c, p_t
-    REAL    ::  center(3), distance, slicer_position, surface_value
-    REAL, DIMENSION(:),     ALLOCATABLE ::  psize, p_x, p_y, p_z
-    REAL, DIMENSION(:,:,:), ALLOCATABLE ::  local_pf
+    REAL(4) ::  center(3), distance, slicer_position, surface_value,         &
+                tmp_alpha, tmp_alpha_w, tmp_b, tmp_c_alpha, tmp_g, tmp_norm, &
+                tmp_pos, tmp_r, tmp_t, tmp_th
+    REAL(4), DIMENSION(:),     ALLOCATABLE   ::  psize, p_x, p_y, p_z
+    REAL(4), DIMENSION(:,:,:), ALLOCATABLE   ::  local_pf
+    REAL(4), DIMENSION(:,:,:,:), ALLOCATABLE ::  local_pfi
 
 
@@ -112 +117 @@
 !   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: vor steering_update'
 !   CALL local_flush( 9 )
-          CALL DVRP_STEERING_UPDATE( m-1, data_output_dvrp )
+!          CALL DVRP_STEERING_UPDATE( m-1, data_output_dvrp )
 !   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: nach steering_update'
 !   CALL local_flush( 9 )
@@ -157 +162 @@
 !
 !--       Definition of characteristics of particle material
-!          CALL DVRP_MATERIAL_RGB( m-1, 1, 0.1, 0.7, 0.1, 0.0 )
-          CALL DVRP_MATERIAL_RGB( m-1, 1, 0.0, 0.0, 0.0, 0.0 )
+!          tmp_r = 0.1;  tmp_g = 0.7;  tmp_b = 0.1;  tmp_t = 0.0
+          tmp_r = 0.0;  tmp_g = 0.0;  tmp_b = 0.0;  tmp_t = 0.0
+          CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
 
 !
@@ -437 +443 @@
 !
 !--          Definition of characteristics of isosurface material
-!--          Preliminary settings for w!
+!--          Preliminary settings for w and pt!
              IF ( output_variable == 'w' )  THEN
                 IF ( tv == 1 )  THEN
-                   CALL DVRP_MATERIAL_RGB( m-1, 1, 0.8, 0.1, 0.1, 0.0 )
+                   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
-                   CALL DVRP_MATERIAL_RGB( m-1, 1, 0.1, 0.1, 0.8, 0.0 )
+                   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
-                CALL DVRP_MATERIAL_RGB( m-1, 1, 0.9, 0.9, 0.9, 0.0 )
+                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
 
@@ -452 +464 @@
              CALL DVRP_DATA( m-1, local_pf, 1, nx_dvrp, ny_dvrp, nz_dvrp, &
                              cyclic_dvrp, cyclic_dvrp, cyclic_dvrp )
-             CALL DVRP_THRESHOLD( m-1, threshold(tv) )
-             CALL DVRP_VISUALIZE( m-1, 1, dvrp_filecount )
+
+             c_size_x = vc_size_x;  c_size_y = vc_size_y;  c_size_z = vc_size_z
+             CALL DVRP_CLUSTER_SIZE( m-1, c_size_x, c_size_y, c_size_z )
+
+             c_mode   = vc_mode 
+             CALL DVRP_CLUSTERING_MODE( m-1, c_mode )
+
+             gradient_normals = vc_gradient_normals
+             CALL DVRP_GRADIENTNORMALS( m-1, gradient_normals )
+!
+!--          A seperate procedure for setting vc_alpha will be in the next
+!--          version of libDVRP
+             tmp_c_alpha = vc_alpha 
+             CALL DVRP_THRESHOLD( -(m-1)-1, tmp_c_alpha )
+
+             tmp_th = threshold(tv)
+             CALL DVRP_THRESHOLD( m-1, tmp_th )
+             CALL DVRP_VISUALIZE( m-1, 21, dvrp_filecount )
+
 !   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende isosurface'
 !   CALL local_flush( 9 )
@@ -469 +498 @@
 !
 !--          Material and color definitions
-             CALL DVRP_MATERIAL_RGB( m-1, 1, 0.0, 0.0, 0.0, 0.0 )
+             tmp_r = 0.0;  tmp_g = 0.0;  tmp_b = 0.0;  tmp_t = 0.0
+             CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
 
              islice_dvrp = islice_dvrp + 1
@@ -487 +517 @@
                              cyclic_dvrp, cyclic_dvrp, cyclic_dvrp )
 !             CALL DVRP_SLICER( m-1, section_mode, slicer_position )
-             CALL DVRP_SLICER( m-1, 2, 1.0 )
+             tmp_pos = 1.0
+             CALL DVRP_SLICER( m-1, 2, tmp_pos )
              WRITE (9,*) 'nx_dvrp=', nx_dvrp
              WRITE (9,*) 'ny_dvrp=', ny_dvrp
@@ -505 +536 @@
           DEALLOCATE( local_pf )
 
+       ELSEIF ( mode_dvrp(m)(1:9) == 'pathlines' ) THEN
+
+          ALLOCATE( local_pfi(4,nxl:nxr+1,nys:nyn+1,nzb:nz_do3d) )
+          DO  i = nxl, nxr+1
+             DO  j = nys, nyn+1
+                DO  k = nzb, nz_do3d
+                   local_pfi(1,i,j,k) = u(k,j,i)
+                   local_pfi(2,i,j,k) = v(k,j,i)
+                   local_pfi(3,i,j,k) = w(k,j,i)
+                   tmp_norm           = SQRT( u(k,j,i) * u(k,j,i) + &
+                                              v(k,j,i) * v(k,j,i) + &
+                                              w(k,j,i) * w(k,j,i) )
+                   tmp_alpha          = ACOS( 0.0 * u(k,j,i) / tmp_norm + &
+                                              0.0 * v(k,j,i) / tmp_norm - &
+                                              1.0 * w(k,j,i) / tmp_norm )
+                   tmp_alpha_w        = tmp_alpha / pi * 180.0
+                   local_pfi(4,i,j,k) = tmp_alpha_w
+                ENDDO
+             ENDDO
+          ENDDO
+
+          CALL cpu_log( log_point_s(31), 'dvrp_pathlines', 'start' )
+
+          CALL DVRP_DATA( m-1, local_pfi, 4, nx_dvrp, ny_dvrp, nz_dvrp, &
+                          cyclic_dvrp, cyclic_dvrp, cyclic_dvrp )
+          CALL DVRP_VISUALIZE( m-1, 20, dvrp_filecount )
+
+          CALL cpu_log( log_point_s(31), 'dvrp_pathlines', 'stop' )
+
+          DEALLOCATE( local_pfi )
+
        ENDIF