Changeset 3987
- Timestamp:
- May 22, 2019 9:52:13 AM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 17 edited
-
data_output_2d.f90 (modified) (4 diffs)
-
data_output_3d.f90 (modified) (4 diffs)
-
init_3d_model.f90 (modified) (15 diffs)
-
land_surface_model_mod.f90 (modified) (6 diffs)
-
message.f90 (modified) (10 diffs)
-
module_interface.f90 (modified) (43 diffs)
-
modules.f90 (modified) (2 diffs)
-
multi_agent_system_mod.f90 (modified) (4 diffs)
-
nesting_offl_mod.f90 (modified) (6 diffs)
-
netcdf_data_input_mod.f90 (modified) (3 diffs)
-
parin.f90 (modified) (3 diffs)
-
pmc_interface_mod.f90 (modified) (8 diffs)
-
prognostic_equations.f90 (modified) (6 diffs)
-
radiation_model_mod.f90 (modified) (6 diffs)
-
surface_layer_fluxes_mod.f90 (modified) (4 diffs)
-
synthetic_turbulence_generator_mod.f90 (modified) (6 diffs)
-
urban_surface_mod.f90 (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/data_output_2d.f90
r3943 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3943 2019-05-02 09:50:41Z maronga 27 30 ! Added output of qsws for green roofs. 28 31 ! … … 306 309 ONLY: data_output_2d_on_each_pe, & 307 310 data_output_xy, data_output_xz, data_output_yz, & 308 debug_output , debug_string,&311 debug_output_timestep, & 309 312 do2d, & 310 313 do2d_xy_last_time, do2d_xy_time_count, & … … 404 407 405 408 406 IF ( debug_output ) THEN 407 WRITE( debug_string, * ) 'data_output_2d' 408 CALL debug_message( debug_string, 'start' ) 409 ENDIF 409 IF ( debug_output_timestep ) CALL debug_message( 'data_output_2d', 'start' ) 410 410 ! 411 411 !-- Immediate return, if no output is requested (no respective sections … … 2284 2284 CALL cpu_log( log_point(3), 'data_output_2d', 'stop' ) 2285 2285 2286 IF ( debug_output ) THEN 2287 WRITE( debug_string, * ) 'data_output_2d' 2288 CALL debug_message( debug_string, 'end' ) 2289 ENDIF 2286 IF ( debug_output_timestep ) CALL debug_message( 'data_output_2d', 'end' ) 2287 2290 2288 2291 2289 END SUBROUTINE data_output_2d -
palm/trunk/SOURCE/data_output_3d.f90
r3885 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3885 2019-04-11 11:29:34Z kanani 27 30 ! Changes related to global restructuring of location messages and introduction 28 31 ! of additional debug messages … … 262 265 263 266 USE control_parameters, & 264 ONLY: debug_output , debug_string,&267 ONLY: debug_output_timestep, & 265 268 do3d, do3d_no, do3d_time_count, io_blocks, io_group, & 266 269 land_surface, message_string, ntdim_3d, nz_do3d, psolver, & … … 341 344 IF ( do3d_no(av) == 0 ) RETURN 342 345 343 IF ( debug_output ) THEN 344 WRITE( debug_string, * ) 'data_output_3d' 345 CALL debug_message( debug_string, 'start' ) 346 ENDIF 346 IF ( debug_output_timestep ) CALL debug_message( 'data_output_3d', 'start' ) 347 347 348 348 CALL cpu_log (log_point(14),'data_output_3d','start') … … 876 876 CALL cpu_log( log_point(14), 'data_output_3d', 'stop' ) 877 877 878 IF ( debug_output ) THEN 879 WRITE( debug_string, * ) 'data_output_3d' 880 CALL debug_message( debug_string, 'end' ) 881 ENDIF 878 IF ( debug_output_timestep ) CALL debug_message( 'data_output_3d', 'end' ) 879 882 880 883 881 END SUBROUTINE data_output_3d -
palm/trunk/SOURCE/init_3d_model.f90
r3939 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Convert most location messages to debug messages to reduce output in 28 ! job logfile to a minimum 29 ! 30 ! 27 31 ! unused variable removed 28 32 ! … … 737 741 INTEGER(iwp) :: nz_s_shift_l !< topography-top index on scalar-grid, used to vertically shift initial profiles 738 742 739 CALL location_message( 'init_3d_model', 'start' ) 740 CALL location_message( 'allocating arrays', 'start' ) 743 744 CALL location_message( 'model initialization', 'start' ) 745 746 IF ( debug_output ) CALL debug_message( 'allocating arrays', 'start' ) 741 747 ! 742 748 !-- Allocate arrays … … 1087 1093 intermediate_timestep_count = 0 ! needed when simulated_time = 0.0 1088 1094 1089 CALL location_message( 'allocating arrays', 'finished' )1095 IF ( debug_output ) CALL debug_message( 'allocating arrays', 'end' ) 1090 1096 1091 1097 ! … … 1110 1116 !-- Initialization with provided input data derived from larger-scale model 1111 1117 IF ( INDEX( initializing_actions, 'inifor' ) /= 0 ) THEN 1112 CALL location_message( 'initializing with INIFOR', 'start' )1118 IF ( debug_output ) CALL debug_message( 'initializing with INIFOR', 'start' ) 1113 1119 ! 1114 1120 !-- Read initial 1D profiles or 3D data from NetCDF file, depending … … 1313 1319 CALL init_surfaces 1314 1320 1315 CALL location_message( 'initializing with INIFOR', 'finished' )1321 IF ( debug_output ) CALL debug_message( 'initializing with INIFOR', 'end' ) 1316 1322 ! 1317 1323 !-- Initialization via computed 1D-model profiles 1318 1324 ELSEIF ( INDEX( initializing_actions, 'set_1d-model_profiles' ) /= 0 ) THEN 1319 1325 1320 CALL location_message( 'initializing with 1D model profiles', 'start' )1326 IF ( debug_output ) CALL debug_message( 'initializing with 1D model profiles', 'start' ) 1321 1327 ! 1322 1328 !-- Use solutions of the 1D model as initial profiles, … … 1380 1386 CALL init_surfaces 1381 1387 1382 CALL location_message( 'initializing with 1D model profiles', 'finished' )1388 IF ( debug_output ) CALL debug_message( 'initializing with 1D model profiles', 'end' ) 1383 1389 1384 1390 ELSEIF ( INDEX(initializing_actions, 'set_constant_profiles') /= 0 ) & 1385 1391 THEN 1386 1392 1387 CALL location_message( 'initializing with constant profiles', 'start' )1393 IF ( debug_output ) CALL debug_message( 'initializing with constant profiles', 'start' ) 1388 1394 1389 1395 ! … … 1448 1454 CALL init_surfaces 1449 1455 1450 CALL location_message( 'initializing with constant profiles', 'finished' )1456 IF ( debug_output ) CALL debug_message( 'initializing with constant profiles', 'end' ) 1451 1457 1452 1458 ELSEIF ( INDEX(initializing_actions, 'by_user') /= 0 ) & 1453 1459 THEN 1454 1460 1455 CALL location_message( 'initializing by user', 'start' )1461 IF ( debug_output ) CALL debug_message( 'initializing by user', 'start' ) 1456 1462 ! 1457 1463 !-- Pre-initialize surface variables, i.e. setting start- and end-indices … … 1463 1469 CALL user_init_3d_model 1464 1470 1465 CALL location_message( 'initializing by user', 'finished' )1466 1467 ENDIF 1468 1469 CALL location_message( 'initializing statistics, boundary conditions, etc.', 'start' )1471 IF ( debug_output ) CALL debug_message( 'initializing by user', 'end' ) 1472 1473 ENDIF 1474 1475 IF ( debug_output ) CALL debug_message( 'initializing statistics, boundary conditions, etc.', 'start' ) 1470 1476 1471 1477 ! … … 1601 1607 ENDIF 1602 1608 1603 CALL location_message( 'initializing statistics, boundary conditions, etc.', 'finished' )1609 IF ( debug_output ) CALL debug_message( 'initializing statistics, boundary conditions, etc.', 'end' ) 1604 1610 1605 1611 ELSEIF ( TRIM( initializing_actions ) == 'read_restart_data' .OR. & … … 1607 1613 THEN 1608 1614 1609 CALL location_message( 'initializing in case of restart / cyclic_fill', 'start' )1615 IF ( debug_output ) CALL debug_message( 'initializing in case of restart / cyclic_fill', 'start' ) 1610 1616 ! 1611 1617 !-- Initialize surface elements and its attributes, e.g. heat- and … … 1867 1873 IF ( passive_scalar ) ts_m = 0.0_wp 1868 1874 1869 CALL location_message( 'initializing in case of restart / cyclic_fill', 'finished' )1875 IF ( debug_output ) CALL debug_message( 'initializing in case of restart / cyclic_fill', 'end' ) 1870 1876 1871 1877 ELSE … … 2228 2234 TRIM( initializing_actions ) /= 'cyclic_fill' ) THEN 2229 2235 2236 IF ( debug_output ) CALL debug_message( 'creating disturbances + applying pressure solver', 'start' ) 2230 2237 ! 2231 2238 !-- Needed for both disturb_field and pres … … 2235 2242 !$ACC COPY(v(nzb:nzt+1,nysg:nyng,nxlg:nxrg)) 2236 2243 2237 CALL location_message( 'creating initial disturbances', 'start' )2238 2244 CALL disturb_field( 'u', tend, u ) 2239 2245 CALL disturb_field( 'v', tend, v ) 2240 CALL location_message( 'creating initial disturbances', 'finished' )2241 2246 2242 2247 !$ACC DATA & … … 2255 2260 !$ACC COPYIN(bc_h(1)%k(1:bc_h(1)%ns)) 2256 2261 2257 CALL location_message( 'applying pressure solver', 'start' )2258 2262 n_sor = nsor_ini 2259 2263 CALL pres 2260 2264 n_sor = nsor 2261 CALL location_message( 'applying pressure solver', 'finished' )2262 2265 2263 2266 !$ACC END DATA 2264 2267 !$ACC END DATA 2268 2269 IF ( debug_output ) CALL debug_message( 'creating disturbances + applying pressure solver', 'end' ) 2265 2270 2266 2271 ENDIF … … 2466 2471 2467 2472 2468 CALL location_message( ' init_3d_model', 'finished' )2473 CALL location_message( 'model initialization', 'finished' ) 2469 2474 2470 2475 END SUBROUTINE init_3d_model -
palm/trunk/SOURCE/land_surface_model_mod.f90
r3964 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3964 2019-05-09 09:48:32Z suehring 27 30 ! In a nested child domain, distinguish between soil moisture and temperature 28 31 ! initialization from parent via dynamic input file. Further, initialize soil … … 565 568 USE control_parameters, & 566 569 ONLY: cloud_droplets, coupling_start_time, & 567 debug_output, debug_ string,&570 debug_output, debug_output_timestep, debug_string, & 568 571 dt_3d, & 569 572 end_time, humidity, intermediate_timestep_count, & 570 573 initializing_actions, intermediate_timestep_count_max, & 571 land_surface, max_masks, pt_surface, &574 land_surface, max_masks, pt_surface, & 572 575 rho_surface, spinup, spinup_pt_mean, spinup_time, & 573 576 surface_pressure, timestep_scheme, tsc, & … … 1908 1911 TYPE(surf_type), POINTER :: surf !< surface-date type variable 1909 1912 1910 ! 1911 !-- Debug location message 1912 IF ( debug_output ) THEN 1913 1914 IF ( debug_output_timestep ) THEN 1913 1915 WRITE( debug_string, * ) 'lsm_energy_balance', horizontal, l 1914 1916 CALL debug_message( debug_string, 'start' ) … … 2472 2474 IF ( horizontal .AND. .NOT. constant_roughness ) CALL calc_z0_water_surface 2473 2475 2474 IF ( debug_output ) THEN2476 IF ( debug_output_timestep ) THEN 2475 2477 WRITE( debug_string, * ) 'lsm_energy_balance', horizontal, l 2476 2478 CALL debug_message( debug_string, 'end' ) … … 5338 5340 5339 5341 5340 IF ( debug_output ) THEN5342 IF ( debug_output_timestep ) THEN 5341 5343 WRITE( debug_string, * ) 'lsm_soil_model', horizontal, l, calc_soil_moisture 5342 5344 CALL debug_message( debug_string, 'start' ) … … 5640 5642 ! 5641 5643 !-- Debug location message 5642 IF ( debug_output ) THEN5644 IF ( debug_output_timestep ) THEN 5643 5645 WRITE( debug_string, * ) 'lsm_soil_model', horizontal, l, calc_soil_moisture 5644 5646 CALL debug_message( debug_string, 'end' ) -
palm/trunk/SOURCE/message.f90
r3885 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Improved formatting of job logfile output, 28 ! changed output of DEBUG file 29 ! 30 ! 3885 2019-04-11 11:29:34Z kanani 27 31 ! Changes related to global restructuring of location messages and introduction 28 32 ! of additional debug messages … … 123 127 CHARACTER(LEN=*) :: routine_name !< 124 128 CHARACTER(LEN=200) :: header_string !< 129 CHARACTER(LEN=200) :: header_string_2 !< for message ID and routine name 125 130 CHARACTER(LEN=200) :: information_string_1 !< 126 131 CHARACTER(LEN=200) :: information_string_2 !< … … 151 156 IF ( message_level == 0 ) THEN 152 157 header_string = '--- informative message' // TRIM(nest_string) // & 153 ' --- ID:'158 ' ---' 154 159 ELSEIF ( message_level == 1 ) THEN 155 header_string = '+++ warning message' // TRIM(nest_string) // ' --- ID:'160 header_string = '+++ warning message' // TRIM(nest_string) // ' ---' 156 161 ELSEIF ( message_level == 2 ) THEN 157 header_string = '+++ error message' // TRIM(nest_string) // ' --- ID:'162 header_string = '+++ error message' // TRIM(nest_string) // ' ---' 158 163 ELSE 159 164 WRITE( header_string,'(A,I2)' ) '+++ unknown message level' // & … … 164 169 ! 165 170 !-- Add the message identifier and the generating routine 166 header_string = TRIM( header_string ) // '' // message_identifier // &167 'generated by routine: ' // TRIM( routine_name )171 header_string_2 = 'ID: ' // message_identifier // & 172 ' generated by routine: ' // TRIM( routine_name ) 168 173 169 174 information_string_1 = 'Further information can be found at' … … 203 208 ! 204 209 !-- Output on stdout 205 WRITE( *, '(6X,A)' ) TRIM( header_string ) 210 WRITE( *, '(16X,A)' ) TRIM( header_string ) 211 WRITE( *, '(20X,A)' ) TRIM( header_string_2 ) 206 212 ! 207 213 !-- Cut message string into pieces and output one piece per line. … … 210 216 i = INDEX( message_string, '&' ) 211 217 DO WHILE ( i /= 0 ) 212 WRITE( *, '( 4X,A)' ) ADJUSTL( message_string(1:i-1) )218 WRITE( *, '(20X,A)' ) ADJUSTL( message_string(1:i-1) ) 213 219 message_string = ADJUSTL( message_string(i+1:) ) 214 220 i = INDEX( message_string, '&' ) 215 221 ENDDO 216 WRITE( *, '( 10X,A)' ) ''217 WRITE( *, '( 10X,A)' ) TRIM( message_string )218 WRITE( *, '( 10X,A)' ) ''219 WRITE( *, '( 10X,A)' ) TRIM( information_string_1 )220 WRITE( *, '( 10X,A)' ) TRIM( information_string_2 )221 WRITE( *, '( 10X,A)' ) ''222 WRITE( *, '(20X,A)' ) '' 223 WRITE( *, '(20X,A)' ) TRIM( message_string ) 224 WRITE( *, '(20X,A)' ) '' 225 WRITE( *, '(20X,A)' ) TRIM( information_string_1 ) 226 WRITE( *, '(20X,A)' ) TRIM( information_string_2 ) 227 WRITE( *, '(20X,A)' ) '' 222 228 223 229 ELSE … … 286 292 287 293 CHARACTER(LEN=*) :: location !< text to be output on stdout 294 CHARACTER(LEN=60) :: location_string = ' ' !< 288 295 CHARACTER(LEN=*) :: message_type !< attribute marking 'start' or 'end' of routine 289 296 CHARACTER(LEN=11) :: message_type_string = ' ' !< … … 305 312 IF ( TRIM( message_type ) == 'finished' ) WRITE( message_type_string, * ) '-', TRIM( message_type ), '-' 306 313 ! 314 !-- Write dummy location_string in order to allow left-alignment of text despite the fixed (=A60) 315 !-- format. 316 WRITE( location_string, * ) TRIM( location ) 317 ! 307 318 !-- Write and flush debug location or info message to file 308 WRITE( OUTPUT_UNIT, 200 ) TRIM( message_type_string ), TRIM( location ), TRIM( system_time )319 WRITE( OUTPUT_UNIT, 200 ) TRIM( message_type_string ), location_string, TRIM( system_time ) 309 320 FLUSH( OUTPUT_UNIT ) 310 321 ! 311 322 !-- Message formats 312 200 FORMAT ( 3X, A, ' ', A, '| System time: ', A )323 200 FORMAT ( 3X, A, ' ', A60, ' | System time: ', A ) 313 324 314 325 ENDIF … … 328 339 329 340 USE control_parameters, & 330 ONLY: current_timestep_number341 ONLY: time_since_reference_point 331 342 332 343 IMPLICIT NONE … … 353 364 ! 354 365 !-- Write and flush debug location or info message to file 355 WRITE( debug_output_unit, 201 ) TRIM( system_time ), current_timestep_number, TRIM( message_type_string ), TRIM( debug_string )366 WRITE( debug_output_unit, 201 ) TRIM( system_time ), time_since_reference_point, TRIM( message_type_string ), TRIM( debug_string ) 356 367 FLUSH( debug_output_unit ) 357 368 358 369 ! 359 370 !-- Message formats 360 201 FORMAT ( 'System time: ', A, ' | timestep: ', I6, ' | ', A, ' ', A )371 201 FORMAT ( 'System time: ', A, ' | simulated time (s): ', F12.3, ' | ', A, ' ', A ) 361 372 362 373 -
palm/trunk/SOURCE/module_interface.f90
r3956 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce switchable DEBUG file output via debug_message routine 28 ! 29 ! 3956 2019-05-07 12:32:52Z monakurppa 27 30 ! - Added calls for salsa_non_advective_processes and 28 31 ! salsa_exchange_horiz_bounds … … 122 125 !-- ToDo: move all of them to respective module or a dedicated central module 123 126 USE control_parameters, & 124 ONLY: biometeorology, & 125 air_chemistry, & 127 ONLY: air_chemistry, & 128 biometeorology, & 129 debug_output, & 130 debug_output_timestep, & 126 131 indoor_model, & 127 132 land_surface, & … … 539 544 540 545 546 IF ( debug_output ) CALL debug_message( 'reading module-specific parameters', 'start' ) 547 541 548 CALL bio_parin 542 549 CALL bcm_parin … … 563 570 CALL package_parin ! ToDo: deprecated, needs to be dissolved 564 571 572 IF ( debug_output ) CALL debug_message( 'reading module-specific parameters', 'end' ) 573 565 574 566 575 END SUBROUTINE module_interface_parin … … 574 583 SUBROUTINE module_interface_check_parameters 575 584 585 586 IF ( debug_output ) CALL debug_message( 'checking module-specific parameters', 'start' ) 576 587 577 588 IF ( bulk_cloud_model ) CALL bcm_check_parameters … … 594 605 IF ( user_module_enabled ) CALL user_check_parameters 595 606 607 IF ( debug_output ) CALL debug_message( 'checking module-specific parameters', 'end' ) 608 596 609 597 610 END SUBROUTINE module_interface_check_parameters … … 612 625 613 626 627 IF ( debug_output ) CALL debug_message( 'checking module-specific data output ts', 'start' ) 628 614 629 IF ( radiation ) THEN 615 630 CALL radiation_check_data_output_ts( dots_max, dots_num ) … … 619 634 CALL user_check_data_output_ts( dots_max, dots_num, dots_label, dots_unit ) 620 635 ENDIF 636 637 IF ( debug_output ) CALL debug_message( 'checking module-specific data output ts', 'end' ) 621 638 622 639 … … 638 655 CHARACTER (LEN=*), INTENT(OUT) :: dopr_unit !< local value of dopr_unit 639 656 657 658 IF ( debug_output ) CALL debug_message( 'checking module-specific data output pr', 'start' ) 659 640 660 IF ( unit == 'illegal' .AND. bulk_cloud_model ) THEN 641 661 CALL bcm_check_data_output_pr( variable, var_count, unit, dopr_unit ) … … 670 690 CALL user_check_data_output_pr( variable, var_count, unit, dopr_unit ) 671 691 ENDIF 692 693 IF ( debug_output ) CALL debug_message( 'checking module-specific data output pr', 'end' ) 672 694 673 695 … … 690 712 INTEGER(iwp), INTENT(IN) :: k !< ToDo: remove dummy argument, instead pass string from data_output 691 713 714 715 IF ( debug_output ) CALL debug_message( 'checking module-specific data output 2d/3d', 'start' ) 716 692 717 IF ( unit == 'illegal' .AND. biometeorology ) THEN 693 718 CALL bio_check_data_output( variable, unit, i, j, ilen, k ) … … 742 767 ENDIF 743 768 769 IF ( debug_output ) CALL debug_message( 'checking module-specific data output 2d/3d', 'end' ) 770 744 771 745 772 END SUBROUTINE module_interface_check_data_output … … 757 784 CHARACTER (LEN=*), INTENT(IN) :: variable !< variable name 758 785 CHARACTER (LEN=*), INTENT(INOUT) :: unit !< physical unit of variable 786 787 788 IF ( debug_output ) CALL debug_message( 'initializing module-specific masks', 'start' ) 759 789 760 790 IF ( unit == 'illegal' .AND. air_chemistry & … … 775 805 CALL user_check_data_output( variable, unit ) 776 806 ENDIF 807 808 IF ( debug_output ) CALL debug_message( 'initializing module-specific masks', 'end' ) 777 809 778 810 … … 795 827 CHARACTER (LEN=*), INTENT(OUT) :: grid_y !< netcdf dimension in y-direction 796 828 CHARACTER (LEN=*), INTENT(OUT) :: grid_z !< netcdf dimension in z-direction 829 830 831 IF ( debug_output ) CALL debug_message( 'defining module-specific netcdf grids', 'start' ) 797 832 ! 798 833 !-- As long as no action is done in this subroutine, initialize strings with … … 806 841 IF ( var == ' ' ) RETURN 807 842 843 IF ( debug_output ) CALL debug_message( 'defining module-specific netcdf grids', 'end' ) 844 845 808 846 END SUBROUTINE module_interface_define_netcdf_grid 809 847 … … 817 855 818 856 819 CALL location_message( 'initializing module-specific arrays', 'start' )857 IF ( debug_output ) CALL debug_message( 'initializing module-specific arrays', 'start' ) 820 858 821 859 IF ( bulk_cloud_model ) CALL bcm_init_arrays … … 830 868 IF ( user_module_enabled ) CALL user_init_arrays 831 869 832 CALL location_message( 'initializing module-specific arrays', 'finished' )870 IF ( debug_output ) CALL debug_message( 'initializing module-specific arrays', 'end' ) 833 871 834 872 … … 844 882 845 883 846 CALL location_message( 'initializing module features', 'start' )884 IF ( debug_output ) CALL debug_message( 'module-specific initialization', 'start' ) 847 885 848 886 IF ( biometeorology ) CALL bio_init … … 864 902 IF ( user_module_enabled ) CALL user_init 865 903 866 CALL location_message( 'initializing module features', 'finished' )904 IF ( debug_output ) CALL debug_message( 'module-specific initialization', 'end' ) 867 905 868 906 … … 878 916 879 917 918 IF ( debug_output ) CALL debug_message( 'module-specific post-initialization checks', 'start' ) 919 880 920 IF ( biometeorology ) CALL bio_init_checks 881 921 922 IF ( debug_output ) CALL debug_message( 'module-specific post-initialization checks', 'end' ) 923 882 924 883 925 END SUBROUTINE module_interface_init_checks … … 894 936 INTEGER(iwp), INTENT(IN) :: io !< unit of the output file 895 937 938 939 IF ( debug_output ) CALL debug_message( 'module-specific header output', 'start' ) 896 940 897 941 IF ( biometeorology ) CALL bio_header ( io ) … … 911 955 IF ( user_module_enabled ) CALL user_header( io ) 912 956 957 IF ( debug_output ) CALL debug_message( 'module-specific header output', 'end' ) 958 913 959 914 960 END SUBROUTINE module_interface_header … … 966 1012 ! Description: 967 1013 ! ------------ 968 !> Compute module-specific cnon_advective_processes (vector-optimized)1014 !> Compute module-specific non_advective_processes (vector-optimized) 969 1015 !------------------------------------------------------------------------------! 970 1016 SUBROUTINE module_interface_non_advective_processes() … … 1006 1052 1007 1053 1054 IF ( debug_output_timestep ) CALL debug_message( 'module-specific exchange_horiz', 'start' ) 1055 1008 1056 IF ( bulk_cloud_model ) CALL bcm_exchange_horiz() 1009 1057 IF ( air_chemistry ) CALL chem_exchange_horiz_bounds() 1010 1058 IF ( salsa ) CALL salsa_exchange_horiz_bounds() 1059 1060 IF ( debug_output_timestep ) CALL debug_message( 'module-specific exchange_horiz', 'end' ) 1061 1011 1062 1012 1063 END SUBROUTINE module_interface_exchange_horiz … … 1064 1115 1065 1116 INTEGER(iwp), INTENT(IN) :: swap_mode !< determines procedure of pointer swap 1117 1118 1119 IF ( debug_output_timestep ) CALL debug_message( 'module-specific swap timelevel', 'start' ) 1066 1120 1067 1121 IF ( bulk_cloud_model ) CALL bcm_swap_timelevel( swap_mode ) … … 1073 1127 IF ( urban_surface ) CALL usm_swap_timelevel( swap_mode ) 1074 1128 1129 IF ( debug_output_timestep ) CALL debug_message( 'module-specific swap timelevel', 'end' ) 1130 1075 1131 1076 1132 END SUBROUTINE module_interface_swap_timelevel … … 1088 1144 CHARACTER (LEN=*), INTENT(IN) :: mode !< averaging interface mode 1089 1145 CHARACTER (LEN=*), INTENT(IN) :: variable !< variable name 1146 1147 1148 IF ( debug_output_timestep ) CALL debug_message( 'module-specific 3d data averaging', 'start' ) 1090 1149 1091 1150 IF ( biometeorology ) CALL bio_3d_data_averaging( mode, variable ) … … 1100 1159 IF ( user_module_enabled ) CALL user_3d_data_averaging( mode, variable ) 1101 1160 1161 IF ( debug_output_timestep ) CALL debug_message( 'module-specific 3d data averaging', 'end' ) 1162 1102 1163 1103 1164 END SUBROUTINE module_interface_3d_data_averaging … … 1126 1187 1127 1188 1189 IF ( debug_output_timestep ) CALL debug_message( 'module-specific 2d data output', 'start' ) 1190 1128 1191 IF ( .NOT. found .AND. biometeorology ) THEN 1129 1192 CALL bio_data_output_2d( & … … 1179 1242 ) 1180 1243 ENDIF 1244 1245 IF ( debug_output_timestep ) CALL debug_message( 'module-specific 2d data output', 'end' ) 1246 1181 1247 1182 1248 END SUBROUTINE module_interface_data_output_2d … … 1204 1270 1205 1271 1272 IF ( debug_output_timestep ) CALL debug_message( 'module-specific 3d data output', 'start' ) 1273 1206 1274 IF ( .NOT. found .AND. biometeorology ) THEN 1207 1275 CALL bio_data_output_3d( av, variable, found, local_pf, nzb_do, nzt_do ) … … 1254 1322 ENDIF 1255 1323 1324 IF ( debug_output_timestep ) CALL debug_message( 'module-specific 3d data output', 'end' ) 1325 1256 1326 1257 1327 END SUBROUTINE module_interface_data_output_3d … … 1271 1341 INTEGER(iwp), INTENT(IN) :: dots_max !< maximum number of timeseries 1272 1342 1343 1344 IF ( debug_output_timestep ) CALL debug_message( 'module-specific statistics', 'start' ) 1345 1273 1346 IF ( gust_module_enabled ) CALL gust_statistics( mode, sr, tn, dots_max ) 1274 1347 IF ( air_chemistry ) CALL chem_statistics( mode, sr, tn ) 1275 1348 IF ( user_module_enabled ) CALL user_statistics( mode, sr, tn ) 1276 1349 1350 IF ( debug_output_timestep ) CALL debug_message( 'module-specific statistics', 'end' ) 1351 1277 1352 1278 1353 END SUBROUTINE module_interface_statistics … … 1288 1363 1289 1364 LOGICAL, INTENT(INOUT) :: found !< flag if variable was found 1365 1366 1367 IF ( debug_output ) CALL debug_message( 'module-specific read global restart data', 'start' ) 1290 1368 1291 1369 IF ( .NOT. found ) CALL bio_rrd_global( found ) ! ToDo: change interface to pass variable … … 1299 1377 IF ( .NOT. found ) CALL user_rrd_global( found ) ! ToDo: change interface to pass variable 1300 1378 1379 IF ( debug_output ) CALL debug_message( 'module-specific read global restart data', 'end' ) 1380 1301 1381 1302 1382 END SUBROUTINE module_interface_rrd_global … … 1310 1390 SUBROUTINE module_interface_wrd_global 1311 1391 1392 1393 IF ( debug_output ) CALL debug_message( 'module-specific write global restart data', 'start' ) 1312 1394 1313 1395 IF ( biometeorology ) CALL bio_wrd_global … … 1320 1402 IF ( surface_output ) CALL surface_data_output_wrd_global 1321 1403 IF ( user_module_enabled ) CALL user_wrd_global 1404 1405 IF ( debug_output ) CALL debug_message( 'module-specific write global restart data', 'end' ) 1322 1406 1323 1407 … … 1357 1441 1358 1442 1443 IF ( debug_output ) CALL debug_message( 'module-specific read local restart data', 'start' ) 1444 1359 1445 IF ( .NOT. found ) CALL bio_rrd_local( & 1360 1446 found & … … 1445 1531 ) ! ToDo: change interface to pass variable 1446 1532 1533 IF ( debug_output ) CALL debug_message( 'module-specific read local restart data', 'end' ) 1534 1447 1535 1448 1536 END SUBROUTINE module_interface_rrd_local … … 1456 1544 SUBROUTINE module_interface_wrd_local 1457 1545 1546 1547 IF ( debug_output ) CALL debug_message( 'module-specific write local restart data', 'start' ) 1458 1548 1459 1549 IF ( biometeorology ) CALL bio_wrd_local … … 1469 1559 IF ( user_module_enabled ) CALL user_wrd_local 1470 1560 1561 IF ( debug_output ) CALL debug_message( 'module-specific write local restart data', 'end' ) 1562 1471 1563 1472 1564 END SUBROUTINE module_interface_wrd_local … … 1480 1572 SUBROUTINE module_interface_last_actions 1481 1573 1574 1575 IF ( debug_output ) CALL debug_message( 'module-specific last actions', 'start' ) 1482 1576 1483 1577 IF ( virtual_measurement ) CALL vm_last_actions 1484 1578 IF ( user_module_enabled ) CALL user_last_actions 1485 1579 1580 IF ( debug_output ) CALL debug_message( 'module-specific last actions', 'end' ) 1581 1486 1582 1487 1583 END SUBROUTINE module_interface_last_actions -
palm/trunk/SOURCE/modules.f90
r3885 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3885 2019-04-11 11:29:34Z kanani 27 30 ! Changes related to global restructuring of location messages and introduction 28 31 ! of additional debug messages … … 1324 1327 LOGICAL :: data_output_2d_on_each_pe = .TRUE. !< namelist parameter 1325 1328 LOGICAL :: debug_output = .FALSE. !< namelist parameter 1329 LOGICAL :: debug_output_timestep = .FALSE. !< namelist parameter 1326 1330 LOGICAL :: disturbance_created = .FALSE. !< flow disturbance imposed? 1327 1331 LOGICAL :: do2d_at_begin = .FALSE. !< namelist parameter -
palm/trunk/SOURCE/multi_agent_system_mod.f90
r3885 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3885 2019-04-11 11:29:34Z kanani 27 30 ! Changes related to global restructuring of location messages and introduction 28 31 ! of additional debug messages … … 114 117 USE control_parameters, & 115 118 ONLY: biometeorology, & 116 debug_output, & 117 debug_string, & 119 debug_output_timestep, & 118 120 dt_3d, & 119 121 dt_write_agent_data, & … … 396 398 LOGICAL :: first_loop_stride !< flag for first loop stride of agent sub-timesteps 397 399 LOGICAL, SAVE :: first_call = .TRUE. !< first call of mas flag for output 398 ! 399 !-- Debug location message 400 IF ( debug_output ) THEN 401 WRITE( debug_string, * ) 'multi_agent_system' 402 CALL debug_message( debug_string, 'start' ) 403 ENDIF 400 401 402 IF ( debug_output_timestep ) CALL debug_message( 'multi_agent_system', 'start' ) 404 403 405 404 CALL cpu_log( log_point(9), 'mas', 'start' ) … … 622 621 623 622 CALL cpu_log( log_point(9), 'mas', 'stop' ) 624 ! 625 !-- Debug location message 626 IF ( debug_output ) THEN 627 WRITE( debug_string, * ) 'multi_agent_system' 628 CALL debug_message( debug_string, 'end' ) 629 ENDIF 623 624 IF ( debug_output_timestep ) CALL debug_message( 'multi_agent_system', 'end' ) 625 630 626 631 627 END SUBROUTINE multi_agent_system -
palm/trunk/SOURCE/nesting_offl_mod.f90
r3964 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3964 2019-05-09 09:48:32Z suehring 27 30 ! Ensure that veloctiy term in calculation of bulk Richardson number does not 28 31 ! become zero … … 85 88 ONLY: air_chemistry, bc_dirichlet_l, bc_dirichlet_n, bc_dirichlet_r, & 86 89 bc_dirichlet_s, dt_3d, dz, constant_diffusion, & 87 debug_output, debug_string, humidity, initializing_actions, & 90 debug_output_timestep, & 91 humidity, & 92 initializing_actions, & 88 93 message_string, nesting_offline, neutral, passive_scalar, & 89 94 rans_mode, rans_tke_e, time_since_reference_point, volume_flow … … 167 172 REAL(wp), DIMENSION(1:3) :: volume_flow_l !< local volume flow 168 173 169 ! 170 !-- Debug location message 171 IF ( debug_output ) THEN 172 WRITE( debug_string, * ) 'nesting_offl_mass_conservation' 173 CALL debug_message( debug_string, 'start' ) 174 ENDIF 175 174 175 IF ( debug_output_timestep ) CALL debug_message( 'nesting_offl_mass_conservation', 'start' ) 176 176 177 CALL cpu_log( log_point(58), 'offline nesting', 'start' ) 177 178 … … 249 250 250 251 CALL cpu_log( log_point(58), 'offline nesting', 'stop' ) 251 ! 252 !-- Debug location message 253 IF ( debug_output ) THEN 254 WRITE( debug_string, * ) 'nesting_offl_mass_conservation' 255 CALL debug_message( debug_string, 'end' ) 256 ENDIF 252 253 IF ( debug_output_timestep ) CALL debug_message( 'nesting_offl_mass_conservation', 'end' ) 257 254 258 255 END SUBROUTINE nesting_offl_mass_conservation … … 287 284 REAL(wp), DIMENSION(nzb:nzt+1) :: v_ref_l !< reference profile for v-component on subdomain 288 285 289 ! 290 !-- Debug location message 291 IF ( debug_output ) THEN 292 WRITE( debug_string, * ) 'nesting_offl_bc' 293 CALL debug_message( debug_string, 'start' ) 294 ENDIF 286 287 IF ( debug_output_timestep ) CALL debug_message( 'nesting_offl_bc', 'start' ) 295 288 296 289 CALL cpu_log( log_point(58), 'offline nesting', 'start' ) … … 828 821 829 822 CALL cpu_log( log_point(58), 'offline nesting', 'stop' ) 830 ! 831 !-- Debug location message 832 IF ( debug_output ) THEN 833 WRITE( debug_string, * ) 'nesting_offl_bc' 834 CALL debug_message( debug_string, 'end' ) 835 ENDIF 823 824 IF ( debug_output_timestep ) CALL debug_message( 'nesting_offl_bc', 'end' ) 825 836 826 837 827 END SUBROUTINE nesting_offl_bc -
palm/trunk/SOURCE/netcdf_data_input_mod.f90
r3976 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Remove single location message 28 ! 29 ! 3976 2019-05-15 11:02:34Z hellstea 27 30 ! Remove unused variables from last commit 28 31 ! … … 329 332 !> @todo - depreciate subroutines get_variable_4d_to_3d_real and 330 333 !> get_variable_5d_to_4d_real (ecc) 334 !> @todo - introduce useful debug_message(s) 331 335 !------------------------------------------------------------------------------! 332 336 MODULE netcdf_data_input_mod … … 1441 1445 ! 1442 1446 !-- Start processing data 1443 1444 CALL location_message( 'starting allocation of chemistry emissions arrays', .FALSE. )1445 1446 1447 ! 1447 1448 !-- Emission LOD 0 (Parameterized mode) -
palm/trunk/SOURCE/parin.f90
r3885 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3885 2019-04-11 11:29:34Z kanani 27 30 ! Changes related to global restructuring of location messages and introduction 28 31 ! of additional debug messages … … 696 699 data_output_pr, data_output_2d_on_each_pe, & 697 700 debug_output, & 701 debug_output_timestep, & 698 702 disturbance_amplitude, & 699 703 disturbance_energy_limit, disturbance_level_b, & … … 720 724 data_output_pr, data_output_2d_on_each_pe, & 721 725 debug_output, & 726 debug_output_timestep, & 722 727 disturbance_amplitude, & 723 728 disturbance_energy_limit, disturbance_level_b, & -
palm/trunk/SOURCE/pmc_interface_mod.f90
r3984 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3984 2019-05-16 15:17:03Z hellstea 27 30 ! Commenting improved, pmci_map_fine_to_coarse_grid renamed as pmci_map_child_grid_to_parent_grid, 28 31 ! set_child_edge_coords renamed as pmci_set_child_edge_coords, some variables renamed, etc. … … 443 446 constant_diffusion, constant_flux_layer, & 444 447 coupling_char, & 445 debug_output , debug_string,&448 debug_output_timestep, & 446 449 dt_3d, dz, humidity, message_string, & 447 450 neutral, passive_scalar, rans_mode, rans_tke_e, & … … 3219 3222 REAL(wp) :: dtg !< Global time step defined as the global minimum of dtl of all processes 3220 3223 3221 IF ( debug_output ) THEN 3222 WRITE( debug_string, * ) 'pmci_synchronize' 3223 CALL debug_message( debug_string, 'start' ) 3224 ENDIF 3224 3225 IF ( debug_output_timestep ) CALL debug_message( 'pmci_synchronize', 'start' ) 3225 3226 3226 3227 dtl = dt_3d … … 3228 3229 dt_3d = dtg 3229 3230 3230 IF ( debug_output ) THEN 3231 WRITE( debug_string, * ) 'pmci_synchronize' 3232 CALL debug_message( debug_string, 'end' ) 3233 ENDIF 3231 IF ( debug_output_timestep ) CALL debug_message( 'pmci_synchronize', 'end' ) 3234 3232 3235 3233 #endif … … 3278 3276 3279 3277 #if defined( __parallel ) 3280 ! 3281 !-- Debug location message 3282 IF ( debug_output ) THEN 3283 WRITE( debug_string, * ) 'pmci_datatrans' 3284 CALL debug_message( debug_string, 'start' ) 3285 ENDIF 3278 3279 IF ( debug_output_timestep ) CALL debug_message( 'pmci_datatrans', 'start' ) 3286 3280 3287 3281 IF ( TRIM( local_nesting_mode ) == 'one-way' ) THEN … … 3319 3313 3320 3314 ENDIF 3321 ! 3322 !-- Debug location message 3323 IF ( debug_output ) THEN 3324 WRITE( debug_string, * ) 'pmci_datatrans' 3325 CALL debug_message( debug_string, 'end' ) 3326 ENDIF 3315 3316 IF ( debug_output_timestep ) CALL debug_message( 'pmci_datatrans', 'end' ) 3327 3317 3328 3318 #endif … … 4790 4780 INTEGER(iwp) :: n !< Running index for number of chemical species 4791 4781 4792 ! 4793 !-- Debug location message 4794 IF ( debug_output ) THEN 4795 WRITE( debug_string, * ) 'pmci_boundary_conds' 4796 CALL debug_message( debug_string, 'start' ) 4797 ENDIF 4782 4783 IF ( debug_output_timestep ) CALL debug_message( 'pmci_boundary_conds', 'start' ) 4798 4784 ! 4799 4785 !-- Set Dirichlet boundary conditions for horizontal velocity components … … 4982 4968 ENDIF 4983 4969 ENDIF 4984 ! 4985 !-- Debug location message 4986 IF ( debug_output ) THEN 4987 WRITE( debug_string, * ) 'pmci_boundary_conds' 4988 CALL debug_message( debug_string, 'end' ) 4989 ENDIF 4970 4971 IF ( debug_output_timestep ) CALL debug_message( 'pmci_boundary_conds', 'end' ) 4990 4972 4991 4973 #endif -
palm/trunk/SOURCE/prognostic_equations.f90
r3956 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3956 2019-05-07 12:32:52Z monakurppa 27 30 ! Removed salsa calls. 28 31 ! … … 409 412 USE control_parameters, & 410 413 ONLY: constant_diffusion, & 411 debug_output , debug_string,&414 debug_output_timestep, & 412 415 dp_external, dp_level_ind_b, dp_smooth_factor, dpdxy, dt_3d, & 413 416 humidity, intermediate_timestep_count, & … … 523 526 524 527 525 526 IF ( debug_output ) THEN 527 WRITE( debug_string, * ) 'prognostic_equations_cache' 528 CALL debug_message( debug_string, 'start' ) 529 ENDIF 528 IF ( debug_output_timestep ) CALL debug_message( 'prognostic_equations_cache', 'start' ) 530 529 ! 531 530 !-- Time measurement can only be performed for the whole set of equations … … 1071 1070 CALL cpu_log( log_point(32), 'all progn.equations', 'stop' ) 1072 1071 1073 IF ( debug_output ) THEN 1074 WRITE( debug_string, * ) 'prognostic_equations_cache' 1075 CALL debug_message( debug_string, 'end' ) 1076 ENDIF 1072 IF ( debug_output_timestep ) CALL debug_message( 'prognostic_equations_cache', 'end' ) 1077 1073 1078 1074 END SUBROUTINE prognostic_equations_cache … … 1095 1091 1096 1092 1097 IF ( debug_output ) THEN 1098 WRITE( debug_string, * ) 'prognostic_equations_vector' 1099 CALL debug_message( debug_string, 'start' ) 1100 ENDIF 1093 IF ( debug_output_timestep ) CALL debug_message( 'prognostic_equations_vector', 'start' ) 1101 1094 ! 1102 1095 !-- Calculate non advective processes for all other modules … … 1783 1776 CALL module_interface_prognostic_equations() 1784 1777 1785 IF ( debug_output ) THEN 1786 WRITE( debug_string, * ) 'prognostic_equations_vector' 1787 CALL debug_message( debug_string, 'end' ) 1788 ENDIF 1778 IF ( debug_output_timestep ) CALL debug_message( 'prognostic_equations_vector', 'end' ) 1789 1779 1790 1780 END SUBROUTINE prognostic_equations_vector -
palm/trunk/SOURCE/radiation_model_mod.f90
r3943 r3987 28 28 ! ----------------- 29 29 ! $Id$ 30 ! Introduce alternative switch for debug output during timestepping 31 ! 32 ! 3943 2019-05-02 09:50:41Z maronga 30 33 ! Missing blank characteer added. 31 34 ! … … 623 626 USE control_parameters, & 624 627 ONLY: cloud_droplets, coupling_char, & 625 debug_output, debug_ string,&628 debug_output, debug_output_timestep, debug_string, & 626 629 dz, dt_spinup, end_time, & 627 630 humidity, & … … 1359 1362 1360 1363 1361 IF ( debug_output ) CALL debug_message( 'radiation_control', 'start' )1364 IF ( debug_output_timestep ) CALL debug_message( 'radiation_control', 'start' ) 1362 1365 1363 1366 … … 1377 1380 END SELECT 1378 1381 1379 IF ( debug_output ) CALL debug_message( 'radiation_control', 'end' )1382 IF ( debug_output_timestep ) CALL debug_message( 'radiation_control', 'end' ) 1380 1383 1381 1384 END SUBROUTINE radiation_control … … 5111 5114 5112 5115 5113 IF ( debug_output ) CALL debug_message( 'radiation_interaction', 'start' )5116 IF ( debug_output_timestep ) CALL debug_message( 'radiation_interaction', 'start' ) 5114 5117 5115 5118 IF ( plant_canopy ) THEN … … 5857 5860 (emissivity_urb*sigma_sb * area_hor) )**0.25_wp 5858 5861 5859 IF ( debug_output ) CALL debug_message( 'radiation_interaction', 'end' )5862 IF ( debug_output_timestep ) CALL debug_message( 'radiation_interaction', 'end' ) 5860 5863 5861 5864 -
palm/trunk/SOURCE/surface_layer_fluxes_mod.f90
r3885 r3987 26 26 ! ----------------- 27 27 ! $Id$ 28 ! Introduce alternative switch for debug output during timestepping 29 ! 30 ! 3885 2019-04-11 11:29:34Z kanani 28 31 ! Changes related to global restructuring of location messages and introduction 29 32 ! of additional debug messages … … 278 281 constant_heatflux, constant_scalarflux, & 279 282 constant_waterflux, coupling_mode, & 280 debug_output , debug_string,&283 debug_output_timestep, & 281 284 do_output_at_2m, humidity, & 282 285 ibc_e_b, ibc_pt_b, indoor_model, initializing_actions, & … … 364 367 365 368 366 IF ( debug_output ) CALL debug_message( 'surface_layer_fluxes', 'start' )369 IF ( debug_output_timestep ) CALL debug_message( 'surface_layer_fluxes', 'start' ) 367 370 368 371 surf_vertical = .FALSE. !< flag indicating vertically orientated surface elements … … 726 729 mom_tke = .FALSE. 727 730 728 IF ( debug_output ) CALL debug_message( 'surface_layer_fluxes', 'end' )731 IF ( debug_output_timestep ) CALL debug_message( 'surface_layer_fluxes', 'end' ) 729 732 730 733 END SUBROUTINE surface_layer_fluxes -
palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90
r3938 r3987 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Introduce alternative switch for debug output during timestepping 28 ! 29 ! 3938 2019-04-29 16:06:25Z suehring 27 30 ! Remove unused variables 28 31 ! … … 209 212 210 213 USE control_parameters, & 211 ONLY: debug_output, & 212 debug_string, & 214 ONLY: debug_output_timestep, & 213 215 initializing_actions, & 214 216 message_string, & … … 1146 1148 REAL(wp) :: volume_flow_l !< local mass flux through lateral boundary 1147 1149 1148 ! 1149 !-- Debug location message 1150 IF ( debug_output ) THEN 1151 WRITE( debug_string, * ) 'stg_main' 1152 CALL debug_message( debug_string, 'start' ) 1153 ENDIF 1150 1151 IF ( debug_output_timestep ) CALL debug_message( 'stg_main', 'start' ) 1154 1152 ! 1155 1153 !-- Calculate time step which is needed for filter functions … … 1493 1491 !-- Finally, set time counter for calling STG to zero 1494 1492 time_stg_call = 0.0_wp 1495 ! 1496 !-- Debug location message 1497 IF ( debug_output ) THEN 1498 WRITE( debug_string, * ) 'stg_main' 1499 CALL debug_message( debug_string, 'end' ) 1500 ENDIF 1493 1494 IF ( debug_output_timestep ) CALL debug_message( 'stg_main', 'end' ) 1501 1495 1502 1496 END SUBROUTINE stg_main … … 1900 1894 IMPLICIT NONE 1901 1895 1902 ! 1903 !-- Debug location message 1904 IF ( debug_output ) THEN 1905 WRITE( debug_string, * ) 'stg_adjust' 1906 CALL debug_message( debug_string, 'start' ) 1907 ENDIF 1896 1897 IF ( debug_output_timestep ) CALL debug_message( 'stg_adjust', 'start' ) 1908 1898 ! 1909 1899 !-- Compute mean boundary layer height according to Richardson-Bulk … … 1938 1928 !-- Reset time counter for controlling next adjustment to zero 1939 1929 time_stg_adjust = 0.0_wp 1940 ! 1941 !-- Debug location message 1942 IF ( debug_output ) THEN 1943 WRITE( debug_string, * ) 'stg_adjust' 1944 CALL debug_message( debug_string, 'end' ) 1945 ENDIF 1930 1931 IF ( debug_output_timestep ) CALL debug_message( 'stg_adjust', 'end' ) 1946 1932 1947 1933 END SUBROUTINE stg_adjust -
palm/trunk/SOURCE/urban_surface_mod.f90
r3943 r3987 28 28 ! ----------------- 29 29 ! $Id$ 30 ! Introduce alternative switch for debug output during timestepping 31 ! 32 ! 3943 2019-05-02 09:50:41Z maronga 30 33 ! Removed qsws_eb. Bugfix in calculation of qsws. 31 34 ! … … 489 492 USE control_parameters, & 490 493 ONLY: coupling_start_time, topography, & 491 debug_output, debug_ string,&494 debug_output, debug_output_timestep, debug_string, & 492 495 dt_3d, humidity, indoor_model, & 493 496 intermediate_timestep_count, initializing_actions, & … … 5267 5270 5268 5271 5269 IF ( debug_output ) THEN5272 IF ( debug_output_timestep ) THEN 5270 5273 WRITE( debug_string, * ) 'usm_material_heat_model | spinup: ', spinup 5271 5274 CALL debug_message( debug_string, 'start' ) … … 5644 5647 !$OMP END PARALLEL 5645 5648 5646 IF ( debug_output ) THEN5649 IF ( debug_output_timestep ) THEN 5647 5650 WRITE( debug_string, * ) 'usm_material_heat_model | spinup: ', spinup 5648 5651 CALL debug_message( debug_string, 'end' ) … … 5682 5685 5683 5686 5684 IF ( debug_output ) CALL debug_message( 'usm_green_heat_model', 'start' )5687 IF ( debug_output_timestep ) CALL debug_message( 'usm_green_heat_model', 'start' ) 5685 5688 5686 5689 drho_l_lv = 1.0_wp / (rho_l * l_v) … … 6012 6015 ENDDO 6013 6016 6014 IF ( debug_output ) CALL debug_message( 'usm_green_heat_model', 'end' )6017 IF ( debug_output_timestep ) CALL debug_message( 'usm_green_heat_model', 'end' ) 6015 6018 6016 6019 END SUBROUTINE usm_green_heat_model … … 7707 7710 7708 7711 7709 IF ( debug_output ) THEN7712 IF ( debug_output_timestep ) THEN 7710 7713 WRITE( debug_string, * ) 'usm_surface_energy_balance | spinup: ', spinup 7711 7714 CALL debug_message( debug_string, 'start' ) … … 8753 8756 ! END SUBROUTINE calc_q_surface_usm 8754 8757 8755 IF ( debug_output ) THEN8758 IF ( debug_output_timestep ) THEN 8756 8759 WRITE( debug_string, * ) 'usm_surface_energy_balance | spinup: ', spinup 8757 8760 CALL debug_message( debug_string, 'end' )
Note: See TracChangeset
for help on using the changeset viewer.
