Changeset 809
- Timestamp:
- Jan 30, 2012 1:32:58 PM (12 years ago)
- Location:
- palm/trunk
- Files:
-
- 12 edited
-
SOURCE/check_open.f90 (modified) (7 diffs)
-
SOURCE/check_parameters.f90 (modified) (10 diffs)
-
SOURCE/init_grid.f90 (modified) (4 diffs)
-
SOURCE/init_masks.f90 (modified) (3 diffs)
-
SOURCE/init_pegrid.f90 (modified) (9 diffs)
-
SOURCE/local_stop.f90 (modified) (2 diffs)
-
SOURCE/modules.f90 (modified) (3 diffs)
-
SOURCE/parin.f90 (modified) (3 diffs)
-
SOURCE/poisfft.f90 (modified) (3 diffs)
-
SOURCE/poisfft_hybrid.f90 (modified) (6 diffs)
-
UTIL/mrungui/mainwindow.cpp (modified) (2 diffs)
-
UTIL/mrungui/mainwindow.ui (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/check_open.f90
r808 r809 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 7 7 ! 8 8 ! Former revisions: … … 120 120 IF ( openfile(file_id)%opened ) RETURN 121 121 122 #if .NOT.defined ( __check )122 #if ! defined ( __check ) 123 123 ! 124 124 !-- Only certain files are allowed to be re-opened … … 240 240 CALL local_system( 'mkdir BINOUT' // coupling_char ) 241 241 ENDIF 242 #if defined( __parallel ) .AND. .NOT.defined ( __check )242 #if defined( __parallel ) && ! defined ( __check ) 243 243 ! 244 244 !-- Set a barrier in order to allow that all other processors in the … … 279 279 FORM='UNFORMATTED', POSITION='APPEND' ) 280 280 ELSE 281 #if defined( __parallel ) .AND. .NOT.defined ( __check )281 #if defined( __parallel ) && ! defined ( __check ) 282 282 ! 283 283 !-- Set a barrier in order to allow that all other processors in the … … 660 660 CALL local_system( 'mkdir PARTICLE_INFOS' // coupling_char ) 661 661 ENDIF 662 #if defined( __parallel ) .AND. .NOT.defined ( __check )662 #if defined( __parallel ) && ! defined ( __check ) 663 663 ! 664 664 !-- Set a barrier in order to allow that thereafter all other … … 709 709 CALL local_system( 'mkdir PARTICLE_DATA' // coupling_char ) 710 710 ENDIF 711 #if defined( __parallel ) .AND. .NOT.defined ( __check )711 #if defined( __parallel ) && ! defined ( __check ) 712 712 ! 713 713 !-- Set a barrier in order to allow that thereafter all other … … 1312 1312 TRIM( coupling_char ) // '/' ) 1313 1313 ENDIF 1314 #if defined( __parallel ) .AND. .NOT.defined ( __check )1314 #if defined( __parallel ) && ! defined ( __check ) 1315 1315 ! 1316 1316 !-- Set a barrier in order to allow that all other processors in the -
palm/trunk/SOURCE/check_parameters.f90
r808 r809 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 7 7 ! 8 8 ! Former revisions: … … 237 237 #endif 238 238 239 #if .NOT.defined( __check )239 #if ! defined( __check ) 240 240 IF ( myid == 0 ) THEN 241 241 CALL MPI_SEND( dt_coupling, 1, MPI_REAL, target_id, 11, comm_inter, & … … 253 253 ENDIF 254 254 IF ( dt_coupling <= 0.0 ) THEN 255 #if .NOT.defined( __check )255 #if ! defined( __check ) 256 256 IF ( myid == 0 ) THEN 257 257 CALL MPI_SEND( dt_max, 1, MPI_REAL, target_id, 19, comm_inter, ierr ) … … 267 267 CALL message( 'check_parameters', 'PA0005', 0, 1, 0, 6, 0 ) 268 268 ENDIF 269 #if .NOT.defined( __check )269 #if ! defined( __check ) 270 270 IF ( myid == 0 ) THEN 271 271 CALL MPI_SEND( restart_time, 1, MPI_REAL, target_id, 12, comm_inter, & … … 282 282 CALL message( 'check_parameters', 'PA0006', 1, 2, 0, 6, 0 ) 283 283 ENDIF 284 #if .NOT.defined( __check )284 #if ! defined( __check ) 285 285 IF ( myid == 0 ) THEN 286 286 CALL MPI_SEND( dt_restart, 1, MPI_REAL, target_id, 13, comm_inter, & … … 299 299 300 300 simulation_time_since_reference = end_time - coupling_start_time 301 #if .NOT.defined( __check )301 #if ! defined( __check ) 302 302 IF ( myid == 0 ) THEN 303 303 CALL MPI_SEND( simulation_time_since_reference, 1, MPI_REAL, target_id, & … … 316 316 ENDIF 317 317 318 #if .NOT.defined( __check )318 #if ! defined( __check ) 319 319 IF ( myid == 0 ) THEN 320 320 CALL MPI_SEND( dx, 1, MPI_REAL, target_id, 15, comm_inter, ierr ) … … 343 343 ENDIF 344 344 345 #if .NOT.defined( __check )345 #if ! defined( __check ) 346 346 IF ( myid == 0) THEN 347 347 CALL MPI_SEND( dy, 1, MPI_REAL, target_id, 16, comm_inter, ierr ) … … 391 391 ENDIF 392 392 393 #if defined( __parallel ) .AND. .NOT.defined ( __check )393 #if defined( __parallel ) && ! defined ( __check ) 394 394 ! 395 395 !-- Exchange via intercommunicator … … 2959 2959 ! 2960 2960 2961 #if .NOT.defined( __check )2961 #if ! defined( __check ) 2962 2962 !-- Check netcdf precison 2963 2963 ldum = .FALSE. -
palm/trunk/SOURCE/init_grid.f90
r808 r809 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 7 7 ! 8 8 ! Former revisions: … … 537 537 538 538 ENDIF 539 #if defined( __parallel ) .AND. .NOT.defined ( __check )539 #if defined( __parallel ) && ! defined ( __check ) 540 540 CALL MPI_BARRIER( comm2d, ierr ) 541 541 #endif … … 742 742 ENDIF 743 743 ENDDO 744 #if .NOT.defined ( __check )744 #if ! defined ( __check ) 745 745 ! 746 746 !-- Exchange of lateral boundary values (parallel computers) and cyclic … … 772 772 ENDIF 773 773 774 #if .NOT.defined ( __check )774 #if ! defined ( __check ) 775 775 ! 776 776 !-- Preliminary: to be removed after completion of the topography code! -
palm/trunk/SOURCE/init_masks.f90
r808 r809 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 7 7 ! 8 8 ! Former revisions: … … 350 350 !-- Set global masks along all three dimensions (required by 351 351 !-- define_netcdf_header). 352 #if defined( __parallel ) .AND. .NOT.defined ( __check )352 #if defined( __parallel ) && ! defined ( __check ) 353 353 ! 354 354 !-- PE0 receives partial arrays from all processors of the respective mask … … 443 443 ENDIF 444 444 445 #elif .NOT.defined ( __parallel )445 #elif ! defined ( __parallel ) 446 446 ! 447 447 !-- Local arrays can be relocated directly. -
palm/trunk/SOURCE/init_pegrid.f90
r808 r809 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 6 7 ! 7 8 ! ATTENTION: nnz_x undefined problem still has to be solved!!!!!!!! … … 218 219 219 220 220 #if .NOT.defined( __check)221 #if ! defined( __check) 221 222 ! 222 223 !-- Create the virtual processor grid … … 531 532 532 533 533 #if .NOT.defined( __check)534 #if ! defined( __check) 534 535 ! 535 536 !-- Collect index bounds from other PEs (to be written to restart file later) … … 598 599 #endif 599 600 600 #if defined( __parallel ) .AND. .NOT.defined( __check)601 #if defined( __parallel ) && ! defined( __check) 601 602 #if defined( __mpi2 ) 602 603 ! … … 942 943 943 944 IF ( i == mg_switch_to_pe0_level ) THEN 944 #if defined( __parallel ) .AND. .NOT.defined( __check )945 #if defined( __parallel ) && ! defined( __check ) 945 946 ! 946 947 !-- Save the grid size of the subdomain at the switch level, because … … 975 976 ( nzt_l - nzb + 2 ) 976 977 977 #elif .NOT.defined ( __parallel )978 #elif ! defined ( __parallel ) 978 979 message_string = 'multigrid gather/scatter impossible ' // & 979 980 'in non parallel mode' … … 1017 1018 grid_level = 0 1018 1019 1019 #if defined( __parallel ) .AND. .NOT.defined ( __check )1020 #if defined( __parallel ) && ! defined ( __check ) 1020 1021 ! 1021 1022 !-- Gridpoint number for the exchange of ghost points (y-line for 2D-arrays) … … 1100 1101 #endif 1101 1102 1102 #if defined( __parallel ) .AND. .NOT.defined ( __check )1103 #if defined( __parallel ) && ! defined ( __check ) 1103 1104 ! 1104 1105 !-- Setting of flags for inflow/outflow conditions in case of non-cyclic … … 1160 1161 comm1dx, ierr ) 1161 1162 1162 #elif .NOT.defined ( __parallel )1163 #elif ! defined ( __parallel ) 1163 1164 IF ( bc_lr == 'dirichlet/radiation' ) THEN 1164 1165 inflow_l = .TRUE. -
palm/trunk/SOURCE/local_stop.f90
r808 r809 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 7 7 ! 8 8 ! Former revisions: … … 45 45 46 46 47 #if defined( __parallel ) .AND. .NOT.defined ( __check )47 #if defined( __parallel ) && ! defined ( __check ) 48 48 IF ( coupling_mode == 'uncoupled' ) THEN 49 49 IF ( abort_mode == 1 ) THEN -
palm/trunk/SOURCE/modules.f90
r808 r809 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 7 7 ! 8 8 ! Former revisions: … … 1262 1262 !------------------------------------------------------------------------------! 1263 1263 1264 #if defined( __parallel ) .AND. .NOT.defined ( __check )1264 #if defined( __parallel ) && ! defined ( __check ) 1265 1265 #if defined( __lc ) 1266 1266 USE MPI … … 1294 1294 INTEGER :: ibuf(12), pcoord(2), pdims(2) 1295 1295 1296 #if .NOT.defined ( __check )1296 #if ! defined ( __check ) 1297 1297 INTEGER :: status(MPI_STATUS_SIZE) 1298 1298 #endif -
palm/trunk/SOURCE/parin.f90
r808 r809 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 7 7 ! 8 8 ! Former revisions: … … 288 288 289 289 12 IF ( TRIM( initializing_actions ) == 'read_restart_data' ) THEN 290 #if .NOT.defined ( __check )290 #if ! defined ( __check ) 291 291 CALL read_var_list 292 292 ! … … 361 361 362 362 ENDIF 363 #if defined( __parallel ) .AND. .NOT.( __check )363 #if defined( __parallel ) && ! ( __check ) 364 364 CALL MPI_BARRIER( MPI_COMM_WORLD, ierr ) 365 365 #endif -
palm/trunk/SOURCE/poisfft.f90
r808 r809 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 7 7 ! 8 8 ! Former revisions: … … 111 111 PRIVATE 112 112 113 #if .NOT.defined ( __check )113 #if ! defined ( __check ) 114 114 PUBLIC poisfft, poisfft_init 115 115 … … 137 137 END SUBROUTINE poisfft_init 138 138 139 #if .NOT.defined ( __check )139 #if ! defined ( __check ) 140 140 SUBROUTINE poisfft( ar, work ) 141 141 -
palm/trunk/SOURCE/poisfft_hybrid.f90
r808 r809 5 5 ! Current revisions: 6 6 ! ----------------- 7 ! 7 ! Bugfix: replaced .AND. and .NOT. with && and ! in the preprocessor directives 8 8 ! 9 9 ! Former revisions: … … 92 92 93 93 94 #if .NOT.defined ( __check )94 #if ! defined ( __check ) 95 95 PUBLIC poisfft_hybrid, poisfft_hybrid_ini 96 96 … … 172 172 nwords = ( nxr_p-nxl_p+1 ) * nz * ( nyn_p-nys_p+1 ) 173 173 174 #if defined( __KKMP ) .AND. .NOT.defined ( __check )174 #if defined( __KKMP ) && ! defined ( __check ) 175 175 CALL LOCAL_GETENV( 'OMP_NUM_THREADS', 15, cdummy, idummy ) 176 176 READ ( cdummy, '(I8)' ) n_omp_threads … … 228 228 IF ( tasks_per_logical_node >= 2 ) THEN 229 229 230 #if defined( __parallel ) .AND. .NOT.defined ( __check )230 #if defined( __parallel ) && ! defined ( __check ) 231 231 nodes = ( numprocs + tasks_per_logical_node - 1 ) / & 232 232 tasks_per_logical_node … … 250 250 ! write(0,*) 'who am i',myid,me,me_node,me_task,nodes,& 251 251 ! tasks_per_logical_node 252 #elif .NOT.defined( __parallel )252 #elif ! defined( __parallel ) 253 253 message_string = 'parallel environment (MPI) required' 254 254 CALL message( 'poisfft_hybrid_ini', 'PA0282', 1, 2, 0, 6, 0 ) … … 258 258 END SUBROUTINE poisfft_hybrid_ini 259 259 260 #if .NOT.defined ( __check )260 #if ! defined ( __check ) 261 261 SUBROUTINE poisfft_hybrid( ar ) 262 262 -
palm/trunk/UTIL/mrungui/mainwindow.cpp
r794 r809 2 2 // Current revisions: 3 3 // ----------------- 4 // Bugfix: waiting for 20 minutes does not suffice for local runs 4 5 // 5 6 // Former revisions: … … 221 222 // xtermoutput = xtermoutput+mrun.readAllStandardOutput(); 222 223 223 // Wait until mrun has finished or wait for 20 minutes224 mrun.waitForFinished(1200000 );224 // Wait until mrun has finished or wait for 2000 minutes 225 mrun.waitForFinished(12000000000); 225 226 226 227 -
palm/trunk/UTIL/mrungui/mainwindow.ui
r807 r809 793 793 <rect> 794 794 <x>130</x> 795 <y>1 90</y>795 <y>180</y> 796 796 <width>241</width> 797 <height> 16</height>797 <height>21</height> 798 798 </rect> 799 799 </property>
Note: See TracChangeset
for help on using the changeset viewer.
