Changeset 260 for palm/trunk/SOURCE


Ignore:
Timestamp:
Mar 16, 2009 11:57:58 AM (14 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:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/init_dvrp.f90

    r254 r260  
    44! Current revisions:
    55! -----------------
     6! Output names are changed: surface=groundplate, buildings=topography
    67! Output of messages replaced by message handling routine.
    78! Clipping implemented.
     
    146147    ENDIF
    147148
     149!
     150!-- A local dvrserver running always outputs on temporary directory DATA_DVR
     151    IF ( local_dvrserver_running )  THEN
     152       dvrp_directory = 'DATA_DVR'
     153    ENDIF
     154
    148155    IF ( dvrp_output /= 'local' )  THEN
    149156       IF ( dvrp_file /= 'default'  .AND.  dvrp_file /= '/dev/null' )  THEN
     
    176183            mode_dvrp(m)(1:9)  /= 'pathlines' )  THEN
    177184
    178           message_string = 'mode_dvrp="' // TRIM( mode_dvrp ) // '" not allowed'
     185          message_string = 'mode_dvrp="' // TRIM( mode_dvrp(m) ) // '" not allowed'
    179186          CALL message( 'init_dvrp', 'PA0198', 1, 2, 0, 6, 0 )
    180187          CALL local_stop
     
    259266
    260267!
    261 !--          Create filename for buildings
     268!--          Create filename for topography
    262269             IF ( dvrp_output == 'rtsp' )  THEN
    263270
    264271                dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) )  &
    265                               // '/buildings.dvr'
     272                              // '/topography.dvr'
    266273                dvrp_file_c = dvrp_file
    267274                CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
     
    272279
    273280                dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) )  &
    274                               // '.buildings.dvr'
     281                              // '.topography.dvr'
    275282                dvrp_file_c = dvrp_file
    276283!                CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
     
    282289                IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
    283290                   dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
    284                                        // '.buildings.dvr'
     291                                       // '.topography.dvr'
    285292                   dvrp_file_local_c = dvrp_file_local
    286293                ELSE
     
    378385
    379386!
    380 !--       Write the surface isosurface (ground plate at z=0) on file
     387!--       Write the ground plate (z=0) isosurface on file
    381388          CALL DVRP_INIT( m-1, 0 )
    382389
     
    385392          IF ( dvrp_output == 'rtsp' )  THEN
    386393
    387              dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '/surface.dvr'
     394             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // &
     395                           '/groundplate.dvr'
    388396             dvrp_file_c = dvrp_file
    389397             CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
     
    393401          ELSEIF ( dvrp_output == 'ftp' )  THEN
    394402
    395              dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '.surface.dvr'
     403             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // &
     404                           '.groundplate.dvr'
    396405             dvrp_file_c = dvrp_file
    397406!             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
     
    403412             IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
    404413                dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
    405                      // '.surface.dvr'
     414                     // '.groundplate.dvr'
    406415                dvrp_file_local_c = dvrp_file_local
    407416             ELSE
  • palm/trunk/SOURCE/modules.f90

    r242 r260  
    66! -----------------
    77! +clip_dvrp_*, cluster_size, dvrp_overlap, dvrp_total_overlap,
    8 ! n*_dvrp in dvrp_variables
     8! local_dvrserver_running, n*_dvrp in dvrp_variables
    99! +canyon_height, canyon_width_x, canyon_width_y, canyon_wall_left,
    1010! canyon_wall_south, conserve_volume_flow_mode, dp_external, dp_level_b,
     
    549549
    550550    LOGICAL ::  cyclic_dvrp = .FALSE., dvrp_overlap, dvrp_total_overlap, &
    551                 lock_steering_update = .FALSE.,                          &
     551                local_dvrserver_running, lock_steering_update = .FALSE., &
    552552                use_seperate_pe_for_dvrp_output = .FALSE.
    553553
  • palm/trunk/SOURCE/parin.f90

    r257 r260  
    44! Current revisions:
    55! -----------------
     6! +local_dvrserver_running in envpar
    67! Output of messages replaced by message handling routine.
    78! +canyon_height, canyon_width_x, canyon_width_y, canyon_wall_left,
     
    7273    USE averaging
    7374    USE control_parameters
     75    USE dvrp_variables
    7476    USE grid_variables
    7577    USE indices
     
    159161
    160162
    161     NAMELIST /envpar/  host, maximum_cpu_time_allowed, revision, return_addres,&
    162                        return_username, run_identifier, tasks_per_node, &
    163                        write_binary
     163    NAMELIST /envpar/  host, local_dvrserver_running, maximum_cpu_time_allowed,  &
     164                       revision, return_addres, return_username, run_identifier, &
     165                       tasks_per_node, write_binary
    164166
    165167!
Note: See TracChangeset for help on using the changeset viewer.