Changeset 260 for palm/trunk/SOURCE

Timestamp:

Mar 16, 2009 11:57:58 AM (16 years ago)

Author:

raasch

Message:

automatic generation of dvrs/html file for combined dvr streams; automatic call of streaming server

Location:

palm/trunk/SOURCE

Files:

• init_dvrp.f90 (modified) (10 diffs)
• modules.f90 (modified) (2 diffs)
• parin.f90 (modified) (3 diffs)

palm/trunk/SOURCE/init_dvrp.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
+! Output names are changed: surface=groundplate, buildings=topography
 ! Output of messages replaced by message handling routine.
 ! Clipping implemented.
@@ -146 +147 @@
     ENDIF
 
+!
+!-- A local dvrserver running always outputs on temporary directory DATA_DVR
+    IF ( local_dvrserver_running )  THEN
+       dvrp_directory = 'DATA_DVR'
+    ENDIF
+
     IF ( dvrp_output /= 'local' )  THEN
        IF ( dvrp_file /= 'default'  .AND.  dvrp_file /= '/dev/null' )  THEN
@@ -176 +183 @@
             mode_dvrp(m)(1:9)  /= 'pathlines' )  THEN
 
-          message_string = 'mode_dvrp="' // TRIM( mode_dvrp ) // '" not allowed'
+          message_string = 'mode_dvrp="' // TRIM( mode_dvrp(m) ) // '" not allowed'
           CALL message( 'init_dvrp', 'PA0198', 1, 2, 0, 6, 0 )
           CALL local_stop
@@ -259 +266 @@
 
 !
-!--          Create filename for buildings
+!--          Create filename for topography
              IF ( dvrp_output == 'rtsp' )  THEN
 
                 dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) )  &
-                              // '/buildings.dvr'
+                              // '/topography.dvr'
                 dvrp_file_c = dvrp_file
                 CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
@@ -272 +279 @@
 
                 dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) )  &
-                              // '.buildings.dvr'
+                              // '.topography.dvr'
                 dvrp_file_c = dvrp_file
 !                CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
@@ -282 +289 @@
                 IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
                    dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
-                                       // '.buildings.dvr'
+                                       // '.topography.dvr'
                    dvrp_file_local_c = dvrp_file_local
                 ELSE
@@ -378 +385 @@
 
 !
-!--       Write the surface isosurface (ground plate at z=0) on file
+!--       Write the ground plate (z=0) isosurface on file
           CALL DVRP_INIT( m-1, 0 )
 
@@ -385 +392 @@
           IF ( dvrp_output == 'rtsp' )  THEN
 
-             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '/surface.dvr'
+             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // &
+                           '/groundplate.dvr'
              dvrp_file_c = dvrp_file
              CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
@@ -393 +401 @@
           ELSEIF ( dvrp_output == 'ftp' )  THEN
 
-             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '.surface.dvr'
+             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // &
+                           '.groundplate.dvr'
              dvrp_file_c = dvrp_file
 !             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
@@ -403 +412 @@
              IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
                 dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
-                     // '.surface.dvr'
+                     // '.groundplate.dvr'
                 dvrp_file_local_c = dvrp_file_local
              ELSE

palm/trunk/SOURCE/modules.f90

@@ -6 +6 @@
 ! -----------------
 ! +clip_dvrp_*, cluster_size, dvrp_overlap, dvrp_total_overlap,
-! n*_dvrp in dvrp_variables
+! local_dvrserver_running, n*_dvrp in dvrp_variables
 ! +canyon_height, canyon_width_x, canyon_width_y, canyon_wall_left, 
 ! canyon_wall_south, conserve_volume_flow_mode, dp_external, dp_level_b, 
@@ -549 +549 @@
 
     LOGICAL ::  cyclic_dvrp = .FALSE., dvrp_overlap, dvrp_total_overlap, &
-                lock_steering_update = .FALSE.,                          &
+                local_dvrserver_running, lock_steering_update = .FALSE., &
                 use_seperate_pe_for_dvrp_output = .FALSE.
 

palm/trunk/SOURCE/parin.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
+! +local_dvrserver_running in envpar
 ! Output of messages replaced by message handling routine.
 ! +canyon_height, canyon_width_x, canyon_width_y, canyon_wall_left, 
@@ -72 +73 @@
     USE averaging
     USE control_parameters
+    USE dvrp_variables
     USE grid_variables
     USE indices
@@ -159 +161 @@
 
 
-    NAMELIST /envpar/  host, maximum_cpu_time_allowed, revision, return_addres,&
-                       return_username, run_identifier, tasks_per_node, &
-                       write_binary
+    NAMELIST /envpar/  host, local_dvrserver_running, maximum_cpu_time_allowed,  &
+                       revision, return_addres, return_username, run_identifier, &
+                       tasks_per_node, write_binary
 
 !