Changeset 155


Ignore:
Timestamp:
Mar 28, 2008 10:56:30 AM (14 years ago)
Author:
letzel
Message:

Introduce prefix_chr to ensure unique dvrp_file path.

Location:
palm/trunk/SOURCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r151 r155  
    2222
    2323Particle advection adjusted for ocean runs.
    24 
    2524
    2625User-defined spectra.
     
    5453Errors:
    5554------
     55Introduce prefix_chr to ensure unique dvrp_file path.
    5656small bugfixes for user_interface sample code (comments):
    5757- initialize ustvst with 0.0 as it is now computed only until nxr and nyn
     
    6969
    7070
    71 flow_statistics, local_stop, plant_canopy_model, pres, read_3d_binary, user_interface, write_3d_binary
     71flow_statistics, init_dvrp, local_stop, plant_canopy_model, pres, read_3d_binary, user_interface, write_3d_binary
    7272
  • palm/trunk/SOURCE/init_dvrp.f90

    r139 r155  
    55! -----------------
    66!
     7! introduce prefix_chr to ensure unique dvrp_file path
    78! TEST: print* statements
    89! ToDo: checking of mode_dvrp for legal values is not correct
     
    5051
    5152    CHARACTER (LEN=2)  ::  section_chr
     53    CHARACTER (LEN=3)  ::  prefix_chr
    5254    CHARACTER (LEN=80) ::  dvrp_file_local
    5355    INTEGER ::  i, j, k, l, m, pn, tv, vn
     
    130132
    131133       ENDIF
    132    
     134!
     135!--    Determine prefix for dvrp_file
     136       WRITE ( prefix_chr, '(I2.2,''_'')' )  m
    133137!
    134138!--    Camera position must be computed and written on file when no dvrp-output
     
    155159    CALL local_flush( 9 )
    156160
    157              dvrp_file   = TRIM( mode_dvrp(m) ) // '/camera.dvr'
     161             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '/camera.dvr'
    158162             dvrp_file_c = dvrp_file
    159163             CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
     
    165169          ELSEIF ( dvrp_output == 'ftp' )  THEN
    166170
    167              dvrp_file   = TRIM( mode_dvrp(m) ) // '.camera.dvr'
     171             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '.camera.dvr'
    168172             dvrp_file_c = dvrp_file
    169173!             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
     
    174178
    175179             IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
    176                 dvrp_file_local   = TRIM( mode_dvrp(m) ) // '.camera.dvr'
     180                dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
     181                     // '.camera.dvr'
    177182                dvrp_file_local_c = dvrp_file_local
    178183             ELSE
     
    209214          IF ( dvrp_output == 'rtsp' )  THEN
    210215
    211              dvrp_file   = TRIM( mode_dvrp(m) ) // '/buildings.dvr'
     216             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) )  &
     217                  // '/buildings.dvr'
    212218             dvrp_file_c = dvrp_file
    213219             CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
     
    219225          ELSEIF ( dvrp_output == 'ftp' )  THEN
    220226
    221              dvrp_file   = TRIM( mode_dvrp(m) ) // '.buildings.dvr'
     227             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) )  &
     228                  // '.buildings.dvr'
    222229             dvrp_file_c = dvrp_file
    223230!             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
     
    228235
    229236             IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
    230                 dvrp_file_local   = TRIM( mode_dvrp(m) ) // '.buildings.dvr'
     237                dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
     238                     // '.buildings.dvr'
    231239                dvrp_file_local_c = dvrp_file_local
    232240             ELSE
     
    302310          IF ( dvrp_output == 'rtsp' )  THEN
    303311
    304              dvrp_file   = TRIM( mode_dvrp(m) ) // '/surface.dvr'
     312             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '/surface.dvr'
    305313             dvrp_file_c = dvrp_file
    306314             CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
     
    312320          ELSEIF ( dvrp_output == 'ftp' )  THEN
    313321
    314              dvrp_file   = TRIM( mode_dvrp(m) ) // '.surface.dvr'
     322             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '.surface.dvr'
    315323             dvrp_file_c = dvrp_file
    316324!             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
     
    321329
    322330             IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
    323                 dvrp_file_local   = TRIM( mode_dvrp(m) ) // '.surface.dvr'
     331                dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
     332                     // '.surface.dvr'
    324333                dvrp_file_local_c = dvrp_file_local
    325334             ELSE
     
    463472    CALL local_flush( 9 )
    464473
    465           dvrp_file = TRIM( mode_dvrp(m) ) // '/*****.dvr'
     474          dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '/*****.dvr'
    466475          dvrp_file_c = dvrp_file
    467476          CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
     
    473482       ELSEIF ( dvrp_output == 'ftp' )  THEN
    474483
    475           dvrp_file   = TRIM( mode_dvrp(m) ) // '.%05d.dvr'
     484          dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '.%05d.dvr'
    476485          dvrp_file_c = dvrp_file
    477486!          CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
     
    481490
    482491          IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
    483              dvrp_file_local   = TRIM( mode_dvrp(m) ) // '_%05d.dvr'
     492             dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
     493                  // '_%05d.dvr'
    484494             dvrp_file_local_c = dvrp_file_local
    485495          ELSE
     
    490500       ENDIF
    491501
    492 !       dvrp_file = TRIM( mode_dvrp(m) ) // '.%05d.dvr' // CHAR( 0 )
    493 !       dvrp_file = TRIM( mode_dvrp(m) ) // '/*****.dvr' // CHAR( 0 )
     502!       dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '.%05d.dvr'  &
     503!                   // CHAR( 0 )
     504!       dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '/*****.dvr'  &
     505!                   // CHAR( 0 )
    494506!       dvrp_file = '/dev/null' // CHAR( 0 )
    495507!       CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host, dvrp_username, dvrp_password, &
Note: See TracChangeset for help on using the changeset viewer.