Changeset 155 for palm/trunk/SOURCE

Timestamp:

Mar 28, 2008 10:56:30 AM (17 years ago)

Author:

letzel

Message:

Introduce prefix_chr to ensure unique dvrp_file path.

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (3 diffs)
• init_dvrp.f90 (modified) (16 diffs)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -22 +22 @@
 
 Particle advection adjusted for ocean runs.
-
 
 User-defined spectra.
@@ -54 +53 @@
 Errors:
 ------
+Introduce prefix_chr to ensure unique dvrp_file path.
 small bugfixes for user_interface sample code (comments):
 - initialize ustvst with 0.0 as it is now computed only until nxr and nyn
@@ -69 +69 @@
 
 
-flow_statistics, local_stop, plant_canopy_model, pres, read_3d_binary, user_interface, write_3d_binary
+flow_statistics, init_dvrp, local_stop, plant_canopy_model, pres, read_3d_binary, user_interface, write_3d_binary
 

palm/trunk/SOURCE/init_dvrp.f90

@@ -5 +5 @@
 ! -----------------
 ! 
+! introduce prefix_chr to ensure unique dvrp_file path
 ! TEST: print* statements
 ! ToDo: checking of mode_dvrp for legal values is not correct
@@ -50 +51 @@
 
     CHARACTER (LEN=2)  ::  section_chr
+    CHARACTER (LEN=3)  ::  prefix_chr
     CHARACTER (LEN=80) ::  dvrp_file_local
     INTEGER ::  i, j, k, l, m, pn, tv, vn
@@ -130 +132 @@
 
        ENDIF
-    
+!
+!--    Determine prefix for dvrp_file
+       WRITE ( prefix_chr, '(I2.2,''_'')' )  m
 !
 !--    Camera position must be computed and written on file when no dvrp-output
@@ -155 +159 @@
     CALL local_flush( 9 )
 
-             dvrp_file   = TRIM( mode_dvrp(m) ) // '/camera.dvr'
+             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '/camera.dvr'
              dvrp_file_c = dvrp_file
              CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
@@ -165 +169 @@
           ELSEIF ( dvrp_output == 'ftp' )  THEN
 
-             dvrp_file   = TRIM( mode_dvrp(m) ) // '.camera.dvr'
+             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '.camera.dvr'
              dvrp_file_c = dvrp_file
 !             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
@@ -174 +178 @@
 
              IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
-                dvrp_file_local   = TRIM( mode_dvrp(m) ) // '.camera.dvr'
+                dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
+                     // '.camera.dvr'
                 dvrp_file_local_c = dvrp_file_local
              ELSE
@@ -209 +214 @@
           IF ( dvrp_output == 'rtsp' )  THEN
 
-             dvrp_file   = TRIM( mode_dvrp(m) ) // '/buildings.dvr'
+             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) )  &
+                  // '/buildings.dvr'
              dvrp_file_c = dvrp_file
              CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
@@ -219 +225 @@
           ELSEIF ( dvrp_output == 'ftp' )  THEN
 
-             dvrp_file   = TRIM( mode_dvrp(m) ) // '.buildings.dvr'
+             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) )  &
+                  // '.buildings.dvr'
              dvrp_file_c = dvrp_file
 !             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
@@ -228 +235 @@
 
              IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
-                dvrp_file_local   = TRIM( mode_dvrp(m) ) // '.buildings.dvr'
+                dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
+                     // '.buildings.dvr'
                 dvrp_file_local_c = dvrp_file_local
              ELSE
@@ -302 +310 @@
           IF ( dvrp_output == 'rtsp' )  THEN
 
-             dvrp_file   = TRIM( mode_dvrp(m) ) // '/surface.dvr'
+             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '/surface.dvr'
              dvrp_file_c = dvrp_file
              CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
@@ -312 +320 @@
           ELSEIF ( dvrp_output == 'ftp' )  THEN
 
-             dvrp_file   = TRIM( mode_dvrp(m) ) // '.surface.dvr'
+             dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '.surface.dvr'
              dvrp_file_c = dvrp_file
 !             CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
@@ -321 +329 @@
 
              IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
-                dvrp_file_local   = TRIM( mode_dvrp(m) ) // '.surface.dvr'
+                dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
+                     // '.surface.dvr'
                 dvrp_file_local_c = dvrp_file_local
              ELSE
@@ -463 +472 @@
     CALL local_flush( 9 )
 
-          dvrp_file = TRIM( mode_dvrp(m) ) // '/*****.dvr'
+          dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '/*****.dvr'
           dvrp_file_c = dvrp_file
           CALL DVRP_OUTPUT_RTSP( m-1, dvrp_host_c, dvrp_username_c, &
@@ -473 +482 @@
        ELSEIF ( dvrp_output == 'ftp' )  THEN
 
-          dvrp_file   = TRIM( mode_dvrp(m) ) // '.%05d.dvr'
+          dvrp_file   = prefix_chr // TRIM( mode_dvrp(m) ) // '.%05d.dvr'
           dvrp_file_c = dvrp_file
 !          CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host_c, dvrp_username_c, &
@@ -481 +490 @@
 
           IF ( dvrp_file(1:9) /= '/dev/null' )  THEN
-             dvrp_file_local   = TRIM( mode_dvrp(m) ) // '_%05d.dvr'
+             dvrp_file_local   = prefix_chr // TRIM( mode_dvrp(m) )  &
+                  // '_%05d.dvr'
              dvrp_file_local_c = dvrp_file_local
           ELSE
@@ -490 +500 @@
        ENDIF
 
-!       dvrp_file = TRIM( mode_dvrp(m) ) // '.%05d.dvr' // CHAR( 0 )
-!       dvrp_file = TRIM( mode_dvrp(m) ) // '/*****.dvr' // CHAR( 0 )
+!       dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '.%05d.dvr'  &
+!                   // CHAR( 0 )
+!       dvrp_file = prefix_chr // TRIM( mode_dvrp(m) ) // '/*****.dvr'  &
+!                   // CHAR( 0 )
 !       dvrp_file = '/dev/null' // CHAR( 0 )
 !       CALL DVRP_OUTPUT_FTP( m-1, 0, dvrp_host, dvrp_username, dvrp_password, &