Changeset 1804 for palm/trunk/SOURCE
- Timestamp:
- Apr 5, 2016 4:30:18 PM (9 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 deleted
- 13 edited
-
Makefile_check (deleted)
-
check_namelist_files.f90 (deleted)
-
check_open.f90 (modified) (14 diffs)
-
check_parameters.f90 (modified) (18 diffs)
-
exchange_horiz.f90 (modified) (5 diffs)
-
exchange_horiz_2d.f90 (modified) (5 diffs)
-
init_grid.f90 (modified) (5 diffs)
-
init_masks.f90 (modified) (3 diffs)
-
init_pegrid.f90 (modified) (11 diffs)
-
local_stop.f90 (modified) (2 diffs)
-
modules.f90 (modified) (4 diffs)
-
parin.f90 (modified) (5 diffs)
-
poisfft.f90 (modified) (5 diffs)
-
tridia_solver.f90 (modified) (2 diffs)
-
user_statistics.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/check_open.f90
r1784 r1804 11 11 ! A PARTICULAR PURPOSE. See the GNU General Public License for more details. 12 12 ! 13 ! You should have received a copy of the GNU General Public License along with13 ! You should have received a copy of the GNU fGeneral Public License along with 14 14 ! PALM. If not, see <http://www.gnu.org/licenses/>. 15 15 ! … … 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 208 208 IF ( openfile(file_id)%opened ) RETURN 209 209 210 #if ! defined ( __check )211 210 ! 212 211 !-- Only certain files are allowed to be re-opened … … 231 230 END SELECT 232 231 ENDIF 233 #endif234 232 235 233 ! … … 283 281 CASE ( 11 ) 284 282 285 #if defined ( __check )286 !287 !-- In case of a prior parameter file check, the p3d data is stored in288 !-- PARIN, while the p3df is stored in PARINF. This only applies to289 !-- check_namelist_files!290 IF ( check_restart == 2 ) THEN291 OPEN ( 11, FILE='PARINF'//TRIM( coupling_char ), &292 FORM='FORMATTED', STATUS='OLD' )293 ELSE294 OPEN ( 11, FILE='PARIN'//TRIM( coupling_char ), FORM='FORMATTED', &295 STATUS='OLD' )296 END IF297 #else298 299 283 OPEN ( 11, FILE='PARIN'//TRIM( coupling_char ), FORM='FORMATTED', & 300 284 STATUS='OLD' ) 301 #endif302 285 303 286 CASE ( 13 ) … … 328 311 CALL local_system( 'mkdir BINOUT' // TRIM( coupling_char ) ) 329 312 ENDIF 330 #if defined( __parallel ) && ! defined ( __check )313 #if defined( __parallel ) 331 314 ! 332 315 !-- Set a barrier in order to allow that all other processors in the … … 371 354 FORM='UNFORMATTED', POSITION='APPEND' ) 372 355 ELSE 373 #if defined( __parallel ) && ! defined ( __check )356 #if defined( __parallel ) 374 357 ! 375 358 !-- Set a barrier in order to allow that all other processors in the … … 563 546 TRIM( coupling_char ) ) 564 547 ENDIF 565 #if defined( __parallel ) && ! defined ( __check )548 #if defined( __parallel ) 566 549 ! 567 550 !-- Set a barrier in order to allow that thereafter all other … … 615 598 TRIM( coupling_char ) ) 616 599 ENDIF 617 #if defined( __parallel ) && ! defined ( __check )600 #if defined( __parallel ) 618 601 ! 619 602 !-- Set a barrier in order to allow that thereafter all other … … 673 656 CALL netcdf_handle_error( 'check_open', 21 ) 674 657 IF ( myid == 0 ) CALL local_system( 'rm ' // TRIM( filename ) ) 675 #if defined( __parallel ) && ! defined ( __check )658 #if defined( __parallel ) 676 659 ! 677 660 !-- Set a barrier in order to assure that PE0 deleted the old file … … 735 718 CALL netcdf_handle_error( 'check_open', 24 ) 736 719 IF ( myid == 0 ) CALL local_system( 'rm ' // TRIM( filename ) ) 737 #if defined( __parallel ) && ! defined ( __check )720 #if defined( __parallel ) 738 721 ! 739 722 !-- Set a barrier in order to assure that PE0 deleted the old file … … 797 780 CALL netcdf_handle_error( 'check_open', 27 ) 798 781 IF ( myid == 0 ) CALL local_system( 'rm ' // TRIM( filename ) ) 799 #if defined( __parallel ) && ! defined ( __check )782 #if defined( __parallel ) 800 783 ! 801 784 !-- Set a barrier in order to assure that PE0 deleted the old file … … 940 923 CALL netcdf_handle_error( 'check_open', 36 ) 941 924 IF ( myid == 0 ) CALL local_system( 'rm ' // TRIM( filename ) ) 942 #if defined( __parallel ) && ! defined ( __check )925 #if defined( __parallel ) 943 926 ! 944 927 !-- Set a barrier in order to assure that PE0 deleted the old file … … 1057 1040 TRIM( coupling_char ) // '/' ) 1058 1041 ENDIF 1059 #if defined( __parallel ) && ! defined ( __check )1042 #if defined( __parallel ) 1060 1043 ! 1061 1044 !-- Set a barrier in order to allow that all other processors in the -
palm/trunk/SOURCE/check_parameters.f90
r1796 r1804 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 425 425 426 426 427 #if ! defined( __check )428 427 IF ( myid == 0 ) THEN 429 428 CALL MPI_SEND( dt_coupling, 1, MPI_REAL, target_id, 11, comm_inter, & … … 433 432 ENDIF 434 433 CALL MPI_BCAST( remote, 1, MPI_REAL, 0, comm2d, ierr) 435 #endif434 436 435 IF ( dt_coupling /= remote ) THEN 437 436 WRITE( message_string, * ) 'coupling mode "', TRIM( coupling_mode ), & … … 441 440 ENDIF 442 441 IF ( dt_coupling <= 0.0_wp ) THEN 443 #if ! defined( __check ) 442 444 443 IF ( myid == 0 ) THEN 445 444 CALL MPI_SEND( dt_max, 1, MPI_REAL, target_id, 19, comm_inter, ierr ) … … 448 447 ENDIF 449 448 CALL MPI_BCAST( remote, 1, MPI_REAL, 0, comm2d, ierr) 450 #endif449 451 450 dt_coupling = MAX( dt_max, remote ) 452 451 WRITE( message_string, * ) 'coupling mode "', TRIM( coupling_mode ), & … … 455 454 CALL message( 'check_parameters', 'PA0005', 0, 1, 0, 6, 0 ) 456 455 ENDIF 457 #if ! defined( __check ) 456 458 457 IF ( myid == 0 ) THEN 459 458 CALL MPI_SEND( restart_time, 1, MPI_REAL, target_id, 12, comm_inter, & … … 463 462 ENDIF 464 463 CALL MPI_BCAST( remote, 1, MPI_REAL, 0, comm2d, ierr) 465 #endif464 466 465 IF ( restart_time /= remote ) THEN 467 466 WRITE( message_string, * ) 'coupling mode "', TRIM( coupling_mode ), & … … 470 469 CALL message( 'check_parameters', 'PA0006', 1, 2, 0, 6, 0 ) 471 470 ENDIF 472 #if ! defined( __check ) 471 473 472 IF ( myid == 0 ) THEN 474 473 CALL MPI_SEND( dt_restart, 1, MPI_REAL, target_id, 13, comm_inter, & … … 478 477 ENDIF 479 478 CALL MPI_BCAST( remote, 1, MPI_REAL, 0, comm2d, ierr) 480 #endif479 481 480 IF ( dt_restart /= remote ) THEN 482 481 WRITE( message_string, * ) 'coupling mode "', TRIM( coupling_mode ), & … … 487 486 488 487 simulation_time_since_reference = end_time - coupling_start_time 489 #if ! defined( __check ) 488 490 489 IF ( myid == 0 ) THEN 491 490 CALL MPI_SEND( simulation_time_since_reference, 1, MPI_REAL, target_id, & … … 495 494 ENDIF 496 495 CALL MPI_BCAST( remote, 1, MPI_REAL, 0, comm2d, ierr) 497 #endif496 498 497 IF ( simulation_time_since_reference /= remote ) THEN 499 498 WRITE( message_string, * ) 'coupling mode "', TRIM( coupling_mode ), & … … 504 503 ENDIF 505 504 506 #if ! defined( __check )507 505 IF ( myid == 0 ) THEN 508 506 CALL MPI_SEND( dx, 1, MPI_REAL, target_id, 15, comm_inter, ierr ) … … 512 510 CALL MPI_BCAST( remote, 1, MPI_REAL, 0, comm2d, ierr) 513 511 514 #endif 512 515 513 IF ( coupling_mode == 'atmosphere_to_ocean') THEN 516 514 … … 531 529 ENDIF 532 530 533 #if ! defined( __check )534 531 IF ( myid == 0) THEN 535 532 CALL MPI_SEND( dy, 1, MPI_REAL, target_id, 16, comm_inter, ierr ) … … 538 535 ENDIF 539 536 CALL MPI_BCAST( remote, 1, MPI_REAL, 0, comm2d, ierr) 540 #endif 537 541 538 IF ( coupling_mode == 'atmosphere_to_ocean') THEN 542 539 … … 579 576 ENDIF 580 577 581 #if defined( __parallel ) && ! defined ( __check )578 #if defined( __parallel ) 582 579 ! 583 580 !-- Exchange via intercommunicator … … 3856 3853 ! 3857 3854 !-- Check the NetCDF data format 3858 #if ! defined ( __check )3859 3855 IF ( netcdf_data_format > 2 ) THEN 3860 3856 #if defined( __netcdf4 ) … … 3879 3875 #endif 3880 3876 ENDIF 3881 #endif3882 3877 3883 3878 ! -
palm/trunk/SOURCE/exchange_horiz.f90
r1683 r1804 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 102 102 nxl-nbgp_local:nxr+nbgp_local) :: ar !< 103 103 104 105 #if ! defined( __check )106 104 107 105 CALL cpu_log( log_point_s(2), 'exchange_horiz', 'start' ) … … 290 288 CALL cpu_log( log_point_s(2), 'exchange_horiz', 'stop' ) 291 289 292 #endif293 290 END SUBROUTINE exchange_horiz 294 291 … … 319 316 nxl-nbgp_local:nxr+nbgp_local) :: ar !< treated array 320 317 321 #if ! defined( __check )322 318 323 319 #if defined( __parallel ) … … 386 382 387 383 #endif 388 #endif389 384 390 385 -
palm/trunk/SOURCE/exchange_horiz_2d.f90
r1763 r1804 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 86 86 87 87 88 #if ! defined( __check )89 88 CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'start' ) 90 89 … … 181 180 CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'stop' ) 182 181 183 #endif184 182 END SUBROUTINE exchange_horiz_2d 185 183 … … 215 213 INTEGER(iwp) :: ar(nysg:nyng,nxlg:nxrg) !< 216 214 217 #if ! defined( __check )218 215 CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'start' ) 219 216 … … 308 305 CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'stop' ) 309 306 310 #endif311 307 END SUBROUTINE exchange_horiz_2d_int -
palm/trunk/SOURCE/init_grid.f90
r1780 r1804 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 703 703 704 704 ENDIF 705 #if defined( __parallel ) && ! defined ( __check )705 #if defined( __parallel ) 706 706 CALL MPI_BARRIER( comm2d, ierr ) 707 707 #endif … … 925 925 ENDIF 926 926 ENDDO 927 #if ! defined ( __check ) 927 928 928 ! 929 929 !-- Exchange of lateral boundary values (parallel computers) and cyclic … … 962 962 ENDDO 963 963 ENDDO 964 #endif 964 965 965 ENDIF 966 966 967 #if ! defined ( __check )968 967 ! 969 968 !-- Preliminary: to be removed after completion of the topography code! … … 1736 1735 nzb_tmp, vertical_influence, wall_l, wall_n, wall_r, wall_s ) 1737 1736 1738 #endif1739 1737 1740 1738 END SUBROUTINE init_grid -
palm/trunk/SOURCE/init_masks.f90
r1784 r1804 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 444 444 !-- Set global masks along all three dimensions (required by 445 445 !-- define_netcdf_header). 446 #if defined( __parallel ) && ! defined ( __check )446 #if defined( __parallel ) 447 447 ! 448 448 !-- PE0 receives partial arrays from all processors of the respective mask … … 536 536 ENDIF 537 537 538 #el if ! defined ( __parallel )538 #else 539 539 ! 540 540 !-- Local arrays can be relocated directly. -
palm/trunk/SOURCE/init_pegrid.f90
r1780 r1804 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 267 267 268 268 269 #if ! defined( __check)270 269 ! 271 270 !-- Create the virtual processor grid … … 293 292 CALL MPI_COMM_RANK( comm1dy, myidy, ierr ) 294 293 295 #endif296 294 297 295 ! … … 489 487 490 488 491 #if ! defined( __check)492 489 ! 493 490 !-- Collect index bounds from other PEs (to be written to restart file later) … … 520 517 ENDIF 521 518 522 #endif523 519 524 520 #if defined( __print ) … … 556 552 #endif 557 553 558 #if defined( __parallel ) && ! defined( __check)554 #if defined( __parallel ) 559 555 #if defined( __mpi2 ) 560 556 ! … … 897 893 898 894 IF ( i == mg_switch_to_pe0_level ) THEN 899 #if defined( __parallel ) && ! defined( __check )895 #if defined( __parallel ) 900 896 ! 901 897 !-- Save the grid size of the subdomain at the switch level, because … … 930 926 ( nzt_l - nzb + 2 ) 931 927 932 #el if ! defined ( __parallel )928 #else 933 929 message_string = 'multigrid gather/scatter impossible ' // & 934 930 'in non parallel mode' … … 972 968 grid_level = 0 973 969 974 #if defined( __parallel ) && ! defined ( __check )970 #if defined( __parallel ) 975 971 ! 976 972 !-- Gridpoint number for the exchange of ghost points (y-line for 2D-arrays) … … 1068 1064 #endif 1069 1065 1070 #if defined( __parallel ) && ! defined ( __check )1066 #if defined( __parallel ) 1071 1067 ! 1072 1068 !-- Setting of flags for inflow/outflow/nesting conditions in case of non-cyclic … … 1138 1134 CALL location_message( 'finished', .TRUE. ) 1139 1135 1140 #el if ! defined ( __parallel )1136 #else 1141 1137 IF ( bc_lr == 'dirichlet/radiation' ) THEN 1142 1138 inflow_l = .TRUE. -
palm/trunk/SOURCE/local_stop.f90
r1765 r1804 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 68 68 ONLY: nested_run 69 69 70 #if defined( __parallel ) && ! defined ( __check )70 #if defined( __parallel ) 71 71 IF ( coupling_mode == 'uncoupled' ) THEN 72 72 IF ( nested_run ) THEN -
palm/trunk/SOURCE/modules.f90
r1789 r1804 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 687 687 subs_vertical_gradient_level_i(10) = -9999 688 688 689 #if defined ( __check )690 INTEGER(iwp) :: check_restart = 0691 #endif692 689 693 690 INTEGER(iwp), DIMENSION(0:1) :: ntdim_2d_xy, ntdim_2d_xz, ntdim_2d_yz, ntdim_3d … … 1176 1173 USE kinds 1177 1174 1178 #if defined( __parallel ) && ! defined ( __check )1175 #if defined( __parallel ) 1179 1176 #if defined( __lc ) 1180 1177 USE MPI … … 1211 1208 1212 1209 INTEGER(iwp) :: ibuf(12), pcoord(2) 1213 1214 #if ! defined ( __check )1215 1210 INTEGER(iwp) :: status(MPI_STATUS_SIZE) 1216 1211 INTEGER(iwp), DIMENSION(MPI_STATUS_SIZE,100) :: wait_stat 1217 #endif1218 1212 1219 1213 INTEGER(iwp) :: ngp_yz_int, type_xz_int, type_yz_int -
palm/trunk/SOURCE/parin.f90
r1784 r1804 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 363 363 READ ( 11, inipar, ERR=10, END=11 ) 364 364 365 #if defined ( __check )366 !367 !-- In case of a namelist file check, &inipar from the p3d file is368 !-- used. The p3d file here must be closed and the p3df file for reading369 !-- 3dpar is opened.370 IF ( check_restart == 1 ) THEN371 CALL close_file( 11 )372 check_restart = 2373 CALL check_open( 11 )374 initializing_actions = 'read_restart_data'375 ENDIF376 #endif377 365 GOTO 12 378 366 … … 389 377 !-- check_open) 390 378 12 IF ( TRIM( initializing_actions ) == 'read_restart_data' ) THEN 391 #if ! defined ( __check )392 379 CALL read_var_list 393 380 ! … … 398 385 !-- Increment the run count 399 386 runnr = runnr + 1 400 #endif401 387 ENDIF 402 388 … … 510 496 511 497 ENDIF 512 #if defined( __parallel ) && ! ( __check )498 #if defined( __parallel ) 513 499 CALL MPI_BARRIER( MPI_COMM_WORLD, ierr ) 514 500 #endif -
palm/trunk/SOURCE/poisfft.f90
r1683 r1804 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 150 150 PRIVATE 151 151 152 #if ! defined ( __check )153 152 PUBLIC poisfft, poisfft_init 154 153 … … 160 159 MODULE PROCEDURE poisfft_init 161 160 END INTERFACE poisfft_init 162 #else 163 PUBLIC poisfft_init 164 165 INTERFACE poisfft_init 166 MODULE PROCEDURE poisfft_init 167 END INTERFACE poisfft_init 168 #endif 161 169 162 170 163 CONTAINS … … 196 189 197 190 198 #if ! defined ( __check ) 191 199 192 !------------------------------------------------------------------------------! 200 193 ! Description: … … 1499 1492 END SUBROUTINE ffty_tri_ffty 1500 1493 1501 #endif1502 1503 1494 END MODULE poisfft_mod -
palm/trunk/SOURCE/tridia_solver.f90
r1683 r1804 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 130 130 ! 131 131 !-- Calculate constant coefficients of the tridiagonal matrix 132 #if ! defined ( __check )133 132 CALL maketri 134 133 CALL split 135 #endif136 134 137 135 END SUBROUTINE tridia_init -
palm/trunk/SOURCE/user_statistics.f90
r1784 r1804 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Removed code for parameter file check (__check) 22 22 ! 23 23 ! Former revisions: … … 140 140 !-- value on all PEs, you can omit the MPI_ALLREDUCE call and 141 141 !-- assign ts_value(dots_num_palm+1:,sr) = ts_value_l directly. 142 !#if defined( __parallel ) && ! defined ( __check )142 !#if defined( __parallel ) 143 143 ! IF ( collective_wait ) CALL MPI_BARRIER( comm2d, ierr ) 144 144 ! CALL MPI_ALLREDUCE( ts_value_l(dots_num_palm+1), &
Note: See TracChangeset
for help on using the changeset viewer.
