Changeset 210 for palm/trunk/SOURCE/init_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/init_dvrp.f90 (modified) (13 diffs)

palm/trunk/SOURCE/init_dvrp.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! DVRP arguments changed to single precision, mode pathlines added
 ! TEST: print* statements
 ! ToDo: checking of mode_dvrp for legal values is not correct
@@ -50 +50 @@
     USE control_parameters
 
-!
-!-- New coupling
-    USE coupling
-
     IMPLICIT NONE
 
@@ -61 +57 @@
     INTEGER ::  i, j, k, l, m, pn, tv, vn
     LOGICAL ::  allocated
-    REAL    ::  center(3), distance
-
-    REAL, DIMENSION(:,:,:), ALLOCATABLE ::  local_pf
+    REAL(4) ::  center(3), distance, tmp_b, tmp_g, tmp_r, tmp_t, tmp_th, &
+                tmp_thr, tmp_x1, tmp_x2, tmp_y1, tmp_y2, tmp_z1, tmp_z2, &
+                tmp_1, tmp_2, tmp_3, tmp_4, tmp_5, tmp_6, tmp_7
+
+    REAL(4), DIMENSION(:,:,:), ALLOCATABLE ::  local_pf
 
     TYPE(CSTRING), SAVE ::  dvrp_directory_c, dvrp_file_c, &
@@ -130 +128 @@
        IF ( mode_dvrp(m)(1:10) /= 'isosurface'  .AND. &
             mode_dvrp(m)(1:6)  /= 'slicer'      .AND. &
-            mode_dvrp(m)(1:9)  /= 'particles' )  THEN
+            mode_dvrp(m)(1:9)  /= 'particles'   .AND. &
+            mode_dvrp(m)(1:9)  /= 'pathlines' )  THEN
 
           IF ( myid == 0 )  THEN
@@ -200 +199 @@
 !
 !--       Define bounding box material and create a bounding box
-          CALL DVRP_MATERIAL_RGB( m-1, 1, 0.5, 0.5, 0.5, 0.0 )
-          CALL DVRP_BOUNDINGBOX( m-1, 1, 0.01, 0.0, 0.0, 0.0,    &
-                                 (nx+1) * dx * superelevation_x, &
-                                 (ny+1) * dy * superelevation_y, &
-                                 zu(nz_do3d) * superelevation )
+          tmp_r = 0.5;  tmp_g = 0.5;  tmp_b = 0.5;  tmp_t = 0.0
+          CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
+
+          tmp_1 = 0.01;  tmp_2 = 0.0;  tmp_3 = 0.0;  tmp_4 = 0.0
+          tmp_5 = (nx+1) * dx * superelevation_x
+          tmp_6 = (ny+1) * dy * superelevation_y
+          tmp_7 = zu(nz_do3d) * superelevation
+          CALL DVRP_BOUNDINGBOX( m-1, 1, tmp_1, tmp_2, tmp_3, tmp_4, tmp_5, &
+                                 tmp_6, tmp_7 )
 
           CALL DVRP_VISUALIZE( m-1, 0, 0 )
@@ -272 +275 @@
 !
 !--       Define the grid used by dvrp
+          CALL DVRP_NO_GLOBAL_GRID( m-1, 1 )
           CALL DVRP_GRID( m-1, nx_dvrp, ny_dvrp, nz_dvrp, xcoor_dvrp, &
                           ycoor_dvrp, zcoor_dvrp )
-          CALL DVRP_MATERIAL_RGB( m-1, 1, 0.8, 0.7, 0.6, 0.0 )
+
+          tmp_r = 0.8;  tmp_g = 0.7;  tmp_b = 0.6;  tmp_t = 0.0
+          CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
     WRITE ( 9, * ) '***  #4'
     CALL local_flush( 9 )
@@ -295 +301 @@
     WRITE ( 9, * ) '***  #4.2'
     CALL local_flush( 9 )
-          CALL DVRP_THRESHOLD( m-1, 1.0 )
+          tmp_th = 1.0
+          CALL DVRP_THRESHOLD( m-1, tmp_th )
     WRITE ( 9, * ) '***  #4.3'
     CALL local_flush( 9 )
@@ -366 +373 @@
 !
 !--       Define the grid used by dvrp
+          CALL DVRP_NO_GLOBAL_GRID( m-1, 1 )
           CALL DVRP_GRID( m-1, nx_dvrp, ny_dvrp, nz_dvrp, xcoor_dvrp, &
                           ycoor_dvrp, zcoor_dvrp )
-          CALL DVRP_MATERIAL_RGB( m-1, 1, 0.0, 0.6, 0.0, 0.0 )
+
+          tmp_r = 0.0;  tmp_g = 0.6;  tmp_b = 0.0;  tmp_t = 0.0
+          CALL DVRP_MATERIAL_RGB( m-1, 1, tmp_r, tmp_g, tmp_b, tmp_t )
     WRITE ( 9, * ) '***  #7'
     CALL local_flush( 9 )
@@ -380 +390 @@
           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, 1.0 )
+          tmp_th = 1.0
+          CALL DVRP_THRESHOLD( m-1, tmp_th )
           CALL DVRP_VISUALIZE( m-1, 1, 0 )
 
@@ -429 +440 @@
     WRITE ( 9, * ) '***  #9'
     CALL local_flush( 9 )
+                tmp_thr = threshold(tv)
                 CALL DVRP_STEERING_INIT( m-1, name_c, steering_dvrp(pn)%min, &
-                                         steering_dvrp(pn)%max, threshold(tv) )
+                                         steering_dvrp(pn)%max, tmp_thr )
     WRITE ( 9, * ) '***  #10'
     CALL local_flush( 9 )
@@ -541 +553 @@
     CALL local_flush( 9 )
 
+       IF ( mode_dvrp(m) /= 'pathlines' )  THEN
+          CALL DVRP_NO_GLOBAL_GRID( m-1, 1 )
+       ENDIF
        CALL DVRP_GRID( m-1, nx_dvrp, ny_dvrp, nz_dvrp, xcoor_dvrp, ycoor_dvrp, &
                        zcoor_dvrp )
+
+       IF ( mode_dvrp(m) == 'pathlines' )  THEN
+
+          tmp_x1 = 0.0;  tmp_y1 = 0.0;  tmp_z1 = 0.0
+          tmp_x2 = 1.0;  tmp_y2 = 1.0;  tmp_z2 = 0.3
+          CALL DVRP_CUBIC_SEEDING( m-1, tmp_x1, tmp_y1, tmp_z1, tmp_x2, tmp_y2,&
+                                   tmp_z2, pathlines_linecount, 2, 0 )
+!
+!--       Set wavecount and wavetime
+          CALL DVRP_PATHLINES_BEHAVIOUR_WAVE( m-1, pathlines_wavecount, &
+                                              pathlines_wavetime,       &
+                                              pathlines_fadeintime,     &
+                                              pathlines_fadeouttime )
+!
+!--       Set pathline length
+          CALL DVRP_PATHLINES_SETMAXHISTORY( m-1, pathlines_maxhistory )
+          CALL DVRP_PATHLINES_SETFADING( m-1, 1, 0.0 )
+
+          CALL DVRP_INIT_PATHLINES( m-1, 0 )
+
+       ENDIF
+
     WRITE ( 9, * ) '***  #14'
     CALL local_flush( 9 )
@@ -566 +603 @@
 #if defined( __dvrp_graphics )
 
+    USE control_parameters
     USE dvrp_variables
     USE pegrid
@@ -602 +640 @@
     IF ( chr == 'true' )  THEN
        use_seperate_pe_for_dvrp_output = .TRUE.
-    WRITE ( 9, * ) '*** myid=', myid, ' vor DVRP_SPLIT'
-    CALL local_flush( 9 )
-
-!
-!-- Adjustment for new MPI-1 coupling. This might be unnecessary.
+       WRITE ( 9, * ) '*** myid=', myid, ' vor DVRP_SPLIT'
+       CALL local_flush( 9 )
+
+!
+!--    Adjustment for new MPI-1 coupling. This might be unnecessary.
 #if defined( __mpi2 )
        CALL DVRP_SPLIT( MPI_COMM_WORLD, comm_palm )
 #else
-    IF ( coupling_mode /= 'uncoupled' ) THEN
-       CALL DVRP_SPLIT( comm_inter, comm_palm )
-    ELSE
-       CALL DVRP_SPLIT( MPI_COMM_WORLD, comm_palm )
-    ENDIF
+       IF ( coupling_mode /= 'uncoupled' ) THEN
+          IF ( myid == 0 )  THEN
+             PRINT*, '+++ init_dvrp: split of communicator not realized with', &
+                          ' MPI1 coupling atmosphere-ocean'
+          ENDIF
+          CALL local_stop
+!          CALL DVRP_SPLIT( comm_inter, comm_palm )
+       ELSE
+          CALL DVRP_SPLIT( MPI_COMM_WORLD, comm_palm )
+       ENDIF
 #endif
 
-    WRITE ( 9, * ) '*** myid=', myid, ' nach DVRP_SPLIT'
-    CALL local_flush( 9 )
+       WRITE ( 9, * ) '*** myid=', myid, ' nach DVRP_SPLIT'
+       CALL local_flush( 9 )
        CALL MPI_COMM_SIZE( comm_palm, numprocs, ierr )
     ENDIF