Changeset 155
- Timestamp:
- Mar 28, 2008 10:56:30 AM (17 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r151 r155 22 22 23 23 Particle advection adjusted for ocean runs. 24 25 24 26 25 User-defined spectra. … … 54 53 Errors: 55 54 ------ 55 Introduce prefix_chr to ensure unique dvrp_file path. 56 56 small bugfixes for user_interface sample code (comments): 57 57 - initialize ustvst with 0.0 as it is now computed only until nxr and nyn … … 69 69 70 70 71 flow_statistics, local_stop, plant_canopy_model, pres, read_3d_binary, user_interface, write_3d_binary71 flow_statistics, init_dvrp, local_stop, plant_canopy_model, pres, read_3d_binary, user_interface, write_3d_binary 72 72 -
palm/trunk/SOURCE/init_dvrp.f90
r139 r155 5 5 ! ----------------- 6 6 ! 7 ! introduce prefix_chr to ensure unique dvrp_file path 7 8 ! TEST: print* statements 8 9 ! ToDo: checking of mode_dvrp for legal values is not correct … … 50 51 51 52 CHARACTER (LEN=2) :: section_chr 53 CHARACTER (LEN=3) :: prefix_chr 52 54 CHARACTER (LEN=80) :: dvrp_file_local 53 55 INTEGER :: i, j, k, l, m, pn, tv, vn … … 130 132 131 133 ENDIF 132 134 ! 135 !-- Determine prefix for dvrp_file 136 WRITE ( prefix_chr, '(I2.2,''_'')' ) m 133 137 ! 134 138 !-- Camera position must be computed and written on file when no dvrp-output … … 155 159 CALL local_flush( 9 ) 156 160 157 dvrp_file = TRIM( mode_dvrp(m) ) // '/camera.dvr'161 dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '/camera.dvr' 158 162 dvrp_file_c = dvrp_file 159 163 CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, & … … 165 169 ELSEIF ( dvrp_output == 'ftp' ) THEN 166 170 167 dvrp_file = TRIM( mode_dvrp(m) ) // '.camera.dvr'171 dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '.camera.dvr' 168 172 dvrp_file_c = dvrp_file 169 173 ! CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, & … … 174 178 175 179 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' 177 182 dvrp_file_local_c = dvrp_file_local 178 183 ELSE … … 209 214 IF ( dvrp_output == 'rtsp' ) THEN 210 215 211 dvrp_file = TRIM( mode_dvrp(m) ) // '/buildings.dvr' 216 dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) & 217 // '/buildings.dvr' 212 218 dvrp_file_c = dvrp_file 213 219 CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, & … … 219 225 ELSEIF ( dvrp_output == 'ftp' ) THEN 220 226 221 dvrp_file = TRIM( mode_dvrp(m) ) // '.buildings.dvr' 227 dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) & 228 // '.buildings.dvr' 222 229 dvrp_file_c = dvrp_file 223 230 ! CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, & … … 228 235 229 236 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' 231 239 dvrp_file_local_c = dvrp_file_local 232 240 ELSE … … 302 310 IF ( dvrp_output == 'rtsp' ) THEN 303 311 304 dvrp_file = TRIM( mode_dvrp(m) ) // '/surface.dvr'312 dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '/surface.dvr' 305 313 dvrp_file_c = dvrp_file 306 314 CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, & … … 312 320 ELSEIF ( dvrp_output == 'ftp' ) THEN 313 321 314 dvrp_file = TRIM( mode_dvrp(m) ) // '.surface.dvr'322 dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '.surface.dvr' 315 323 dvrp_file_c = dvrp_file 316 324 ! CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, & … … 321 329 322 330 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' 324 333 dvrp_file_local_c = dvrp_file_local 325 334 ELSE … … 463 472 CALL local_flush( 9 ) 464 473 465 dvrp_file = TRIM( mode_dvrp(m) ) // '/*****.dvr'474 dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '/*****.dvr' 466 475 dvrp_file_c = dvrp_file 467 476 CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, & … … 473 482 ELSEIF ( dvrp_output == 'ftp' ) THEN 474 483 475 dvrp_file = TRIM( mode_dvrp(m) ) // '.%05d.dvr'484 dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '.%05d.dvr' 476 485 dvrp_file_c = dvrp_file 477 486 ! CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, & … … 481 490 482 491 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' 484 494 dvrp_file_local_c = dvrp_file_local 485 495 ELSE … … 490 500 ENDIF 491 501 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 ) 494 506 ! dvrp_file = '/dev/null' // CHAR( 0 ) 495 507 ! CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host, dvrp_username, dvrp_password, &
Note: See TracChangeset
for help on using the changeset viewer.