Changeset 105 for palm/trunk/SOURCE
- Timestamp:
- Aug 8, 2007 7:12:55 AM (17 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 3 edited
-
CURRENT_MODIFICATIONS (modified) (1 diff)
-
check_open.f90 (modified) (17 diffs)
-
user_interface.f90 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r104 r105 25 25 Errors: 26 26 ------ 27 +dots_num_palm in module user, +module netcdf_control in user_init (both in user_interface.f90) 28 27 29 Bugfix: Error message concerning output of particle concentration (pc) modified (check_parameters). 28 30 29 check_parameters 31 check_parameters, user_interface -
palm/trunk/SOURCE/check_open.f90
r102 r105 156 156 FORM='UNFORMATTED', STATUS='OLD' ) 157 157 ELSE 158 OPEN ( 13, FILE='BININ'// coupling_char//'/'//myid_char, &158 OPEN ( 13, FILE='BININ'//TRIM( coupling_char )//'/'//myid_char, & 159 159 FORM='UNFORMATTED', STATUS='OLD' ) 160 160 ENDIF … … 175 175 CALL MPI_BARRIER( comm2d, ierr ) 176 176 #endif 177 OPEN ( 14, FILE='BINOUT'// coupling_char//'/'//myid_char_14, &177 OPEN ( 14, FILE='BINOUT'//TRIM(coupling_char)//'/'//myid_char_14, & 178 178 FORM='UNFORMATTED', POSITION='APPEND' ) 179 179 ENDIF … … 205 205 ENDIF 206 206 IF ( myid_char == '' ) THEN 207 OPEN ( 20, FILE='DATA_LOG'// coupling_char//'/_0000', &207 OPEN ( 20, FILE='DATA_LOG'//TRIM( coupling_char )//'/_0000', & 208 208 FORM='UNFORMATTED', POSITION='APPEND' ) 209 209 ELSE … … 214 214 CALL MPI_BARRIER( comm2d, ierr ) 215 215 #endif 216 OPEN ( 20, FILE='DATA_LOG'// coupling_char//'/'//myid_char,&216 OPEN ( 20, FILE='DATA_LOG'//TRIM( coupling_char )//'/'//myid_char,& 217 217 FORM='UNFORMATTED', POSITION='APPEND' ) 218 218 ENDIF … … 221 221 222 222 IF ( data_output_2d_on_each_pe ) THEN 223 OPEN ( 21, FILE='PLOT2D_XY'// coupling_char//myid_char, &223 OPEN ( 21, FILE='PLOT2D_XY'//TRIM( coupling_char )//myid_char, & 224 224 FORM='UNFORMATTED', POSITION='APPEND' ) 225 225 ELSE … … 262 262 263 263 IF ( data_output_2d_on_each_pe ) THEN 264 OPEN ( 22, FILE='PLOT2D_XZ'// coupling_char//myid_char, &264 OPEN ( 22, FILE='PLOT2D_XZ'//TRIM( coupling_char )//myid_char, & 265 265 FORM='UNFORMATTED', POSITION='APPEND' ) 266 266 ELSE … … 300 300 301 301 IF ( data_output_2d_on_each_pe ) THEN 302 OPEN ( 23, FILE='PLOT2D_YZ'// coupling_char//myid_char, &302 OPEN ( 23, FILE='PLOT2D_YZ'//TRIM( coupling_char )//myid_char, & 303 303 FORM='UNFORMATTED', POSITION='APPEND' ) 304 304 ELSE … … 337 337 CASE ( 30 ) 338 338 339 OPEN ( 30, FILE='PLOT3D_DATA'// coupling_char//myid_char, &339 OPEN ( 30, FILE='PLOT3D_DATA'//TRIM( coupling_char )//myid_char, & 340 340 FORM='UNFORMATTED' ) 341 341 ! … … 511 511 WRITE ( suffix, '(''_'',I1)' ) file_id - 40 512 512 ENDIF 513 OPEN ( file_id, FILE='PLOT1D_DATA'//coupling_char//TRIM( suffix ), & 513 OPEN ( file_id, FILE='PLOT1D_DATA'//TRIM( coupling_char )// & 514 TRIM( suffix ), & 514 515 FORM='FORMATTED' ) 515 516 ! … … 525 526 WRITE ( suffix, '(''_'',I1)' ) file_id - 50 526 527 ENDIF 527 OPEN ( file_id, FILE='PLOTTS_DATA'//coupling_char//TRIM( suffix ), & 528 OPEN ( file_id, FILE='PLOTTS_DATA'//TRIM( coupling_char )// & 529 TRIM( suffix ), & 528 530 FORM='FORMATTED', RECL=496 ) 529 531 ! … … 543 545 ! 544 546 !-- Write RAHMEN parameter 545 OPEN ( 90, FILE='PLOTTS_PAR'//coupling_char//TRIM( suffix ), & 547 OPEN ( 90, FILE='PLOTTS_PAR'//TRIM( coupling_char )// & 548 TRIM( suffix ), & 546 549 FORM='FORMATTED', DELIM='APOSTROPHE' ) 547 550 WRITE ( 90, RAHMEN ) … … 579 582 580 583 IF ( myid_char == '' ) THEN 581 OPEN ( 80, FILE='PARTICLE_INFOS'// coupling_char//myid_char, &584 OPEN ( 80, FILE='PARTICLE_INFOS'//TRIM(coupling_char)//myid_char, & 582 585 FORM='FORMATTED', POSITION='APPEND' ) 583 586 ELSE … … 596 599 ENDIF 597 600 #endif 598 OPEN ( 80, FILE='PARTICLE_INFOS'//coupling_char//'/'//myid_char, & 601 OPEN ( 80, FILE='PARTICLE_INFOS'//TRIM( coupling_char )//'/'// & 602 myid_char, & 599 603 FORM='FORMATTED', POSITION='APPEND' ) 600 604 ENDIF … … 627 631 628 632 IF ( myid_char == '' ) THEN 629 OPEN ( 85, FILE='PARTICLE_DATA'// coupling_char//myid_char, &633 OPEN ( 85, FILE='PARTICLE_DATA'//TRIM(coupling_char)//myid_char, & 630 634 FORM='UNFORMATTED', POSITION='APPEND' ) 631 635 ELSE … … 639 643 CALL MPI_BARRIER( comm2d, ierr ) 640 644 #endif 641 OPEN ( 85, FILE='PARTICLE_DATA'//coupling_char//'/'//myid_char, & 645 OPEN ( 85, FILE='PARTICLE_DATA'//TRIM( coupling_char )//'/'// & 646 myid_char, & 642 647 FORM='UNFORMATTED', POSITION='APPEND' ) 643 648 ENDIF … … 1066 1071 filename = 'DATA_PRT_NETCDF' // coupling_char 1067 1072 ELSE 1068 filename = 'DATA_PRT_NETCDF' // coupling_char // '/' // myid_char 1073 filename = 'DATA_PRT_NETCDF' // TRIM( coupling_char ) // '/' // & 1074 myid_char 1069 1075 ENDIF 1070 1076 ! … … 1102 1108 THEN ! needs modification in case of non-extendable sets 1103 1109 CALL local_system( 'mkdir DATA_PRT_NETCDF' // & 1104 coupling_char// '/' )1110 TRIM( coupling_char ) // '/' ) 1105 1111 ENDIF 1106 1112 #if defined( __parallel ) -
palm/trunk/SOURCE/user_interface.f90
r98 r105 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! +dots_num_palm in module user, +module netcdf_control in user_init 7 7 ! 8 8 ! Former revisions: … … 42 42 !------------------------------------------------------------------------------! 43 43 44 INTEGER :: user_idummy44 INTEGER :: dots_num_palm, user_idummy 45 45 LOGICAL :: user_defined_namelist_found = .FALSE. 46 46 REAL :: user_dummy … … 180 180 USE control_parameters 181 181 USE indices 182 USE netcdf_control 182 183 USE pegrid 183 184 USE user
Note: See TracChangeset
for help on using the changeset viewer.
