Changeset 3719 for palm/trunk
- Timestamp:
- Feb 6, 2019 1:10:18 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 10 edited
-
chemistry_model_mod.f90 (modified) (7 diffs)
-
disturb_heatflux.f90 (modified) (3 diffs)
-
large_scale_forcing_nudging_mod.f90 (modified) (2 diffs)
-
ocean_mod.f90 (modified) (5 diffs)
-
palm.f90 (modified) (2 diffs)
-
prognostic_equations.f90 (modified) (7 diffs)
-
synthetic_turbulence_generator_mod.f90 (modified) (8 diffs)
-
time_integration.f90 (modified) (11 diffs)
-
time_integration_spinup.f90 (modified) (8 diffs)
-
turbulence_closure_mod.f90 (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/chemistry_model_mod.f90
r3700 r3719 27 27 ! ----------------- 28 28 ! $Id$ 29 ! Resolved cpu logpoint overlap with all progn.equations, moved cpu_log call 30 ! to prognostic_equations for better overview 31 ! 32 ! 3700 2019-01-26 17:03:42Z knoop 29 33 ! Some interface calls moved to module_interface + cleanup 30 34 ! … … 275 279 vl_dim, nvar, nreact, atol, rtol, nphot, phot_names 276 280 277 USE cpulog, &278 ONLY: cpu_log, log_point279 280 281 USE chem_modules 281 282 … … 2006 2007 SUBROUTINE chem_integrate_ij( i, j ) 2007 2008 2008 USE cpulog, &2009 ONLY: cpu_log, log_point2010 2009 USE statistics, & 2011 ONLY: weight_pres 2010 ONLY: weight_pres 2011 2012 2012 USE control_parameters, & 2013 2013 ONLY: dt_3d, intermediate_timestep_count, time_since_reference_point 2014 2014 2015 2015 IMPLICIT NONE 2016 2016 2017 INTEGER,INTENT(IN) :: i 2017 2018 INTEGER,INTENT(IN) :: j … … 2051 2052 REAL(kind=wp) :: dt_chem 2052 2053 2053 CALL cpu_log( log_point(80), '[chem_integrate_ij]', 'start' ) 2054 !< set chem_gasphase_on to .FALSE. if you want to skip computation of gas phase chemistry2054 ! 2055 !-- Set chem_gasphase_on to .FALSE. if you want to skip computation of gas phase chemistry 2055 2056 IF (chem_gasphase_on) THEN 2056 2057 nacc = 0 … … 2098 2099 cs_time_step = dt_chem 2099 2100 2100 CALL cpu_log( log_point(81), '{chem_gasphase_integrate}', 'start' )2101 2102 2101 IF(maxval(rcntrl) > 0.0) THEN ! Only if rcntrl is set 2103 2102 IF( time_since_reference_point <= 2*dt_3d) THEN … … 2113 2112 icntrl_i = icntrl, rcntrl_i = rcntrl_local, xnacc = nacc, xnrej = nrej, istatus=istatus ) 2114 2113 2115 CALL cpu_log( log_point(81), '{chem_gasphase_integrate}', 'stop' )2116 2117 2114 DO lsp = 1,nspec 2118 2115 chem_species(lsp)%conc (nzb+1:nzt,j,i) = tmp_conc(:,lsp) * tmp_fact_i(:) … … 2121 2118 2122 2119 ENDIF 2123 CALL cpu_log( log_point(80), '[chem_integrate_ij]', 'stop' )2124 2120 2125 2121 RETURN -
palm/trunk/SOURCE/disturb_heatflux.f90
r3655 r3719 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Moved log_points out of subroutine into time_integration for better overview. 28 ! 29 ! 3655 2019-01-07 16:51:22Z knoop 27 30 ! unused variable removed 28 31 ! … … 112 115 113 116 114 CALL cpu_log( log_point(23), 'disturb_heatflux', 'start' )115 116 117 ! 117 118 !-- Generate random disturbances and store them. Note, if … … 163 164 ENDIF 164 165 165 CALL cpu_log( log_point(23), 'disturb_heatflux', 'stop' )166 167 166 168 167 END SUBROUTINE disturb_heatflux -
palm/trunk/SOURCE/large_scale_forcing_nudging_mod.f90
r3655 r3719 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed USE cpulog (unused) 28 ! 29 ! 3655 2019-01-07 16:51:22Z knoop 27 30 ! unused variables removed 28 31 ! … … 107 110 topography, use_subsidence_tendencies 108 111 109 USE cpulog, &110 ONLY: cpu_log, log_point111 112 112 USE grid_variables 113 113 -
palm/trunk/SOURCE/ocean_mod.f90
r3684 r3719 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Changed log_point to log_point_s, otherwise this overlaps with 28 ! 'all progn.equations' cpu measurement. 29 ! 30 ! 3684 2019-01-20 20:20:58Z knoop 27 31 ! nopointer option removed 28 32 ! … … 1492 1496 1493 1497 USE cpulog, & 1494 ONLY: cpu_log, log_point 1498 ONLY: cpu_log, log_point_s 1495 1499 1496 1500 USE diffusion_s_mod, & … … 1529 1533 IF ( salinity ) THEN 1530 1534 1531 CALL cpu_log( log_point (37), 'sa-equation', 'start' )1535 CALL cpu_log( log_point_s(20), 'sa-equation', 'start' ) 1532 1536 1533 1537 ! … … 1616 1620 ENDIF 1617 1621 1618 CALL cpu_log( log_point (37), 'sa-equation', 'stop' )1622 CALL cpu_log( log_point_s(20), 'sa-equation', 'stop' ) 1619 1623 1620 1624 ENDIF … … 1622 1626 ! 1623 1627 !-- Calculate density by the equation of state for seawater 1624 CALL cpu_log( log_point (38), 'eqns-seawater', 'start' )1628 CALL cpu_log( log_point_s(21), 'eqns-seawater', 'start' ) 1625 1629 CALL eqn_state_seawater 1626 CALL cpu_log( log_point (38), 'eqns-seawater', 'stop' )1630 CALL cpu_log( log_point_s(21), 'eqns-seawater', 'stop' ) 1627 1631 1628 1632 END SUBROUTINE ocean_prognostic_equations -
palm/trunk/SOURCE/palm.f90
r3703 r3719 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Included cpu measurement for wall/soil spinup 28 ! 29 ! 3703 2019-01-29 16:43:53Z knoop 27 30 ! Some interface calls moved to module_interface + cleanup 28 31 ! … … 536 539 !-- surface model) 537 540 IF ( spinup ) THEN 541 CALL cpu_log( log_point(41), 'wall/soil spinup', 'start' ) 538 542 CALL time_integration_spinup 543 CALL cpu_log( log_point(41), 'wall/soil spinup', 'stop' ) 539 544 ENDIF 540 545 -
palm/trunk/SOURCE/prognostic_equations.f90
r3684 r3719 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Cleaned up chemistry cpu measurements 28 ! 29 ! 3684 2019-01-20 20:20:58Z knoop 27 30 ! OpenACC port for SPEC 28 31 ! … … 509 512 lsp_usr = 1 510 513 ! 511 !-- Chemical reactions 512 CALL cpu_log( log_point(82), '(chem react + exch_h)', 'start' ) 513 514 !-- Chemical reactions and deposition 514 515 IF ( chem_gasphase_on ) THEN 515 516 ! … … 524 525 IF ( intermediate_timestep_count == 1 .OR. & 525 526 call_chem_at_all_substeps ) THEN 527 528 CALL cpu_log( log_point_s(19), 'chem.reactions', 'start' ) 526 529 CALL chem_integrate (i,j) 530 CALL cpu_log( log_point_s(19), 'chem.reactions', 'stop' ) 531 527 532 IF ( do_depo ) THEN 533 CALL cpu_log( log_point_s(24), 'chem.deposition', 'start' ) 528 534 CALL chem_depo(i,j) 535 CALL cpu_log( log_point_s(24), 'chem.deposition', 'stop' ) 529 536 ENDIF 530 537 ENDIF … … 534 541 ! 535 542 !-- Loop over chemical species 536 CALL cpu_log( log_point_s(84), 'chem istry exch-horiz', 'start' )543 CALL cpu_log( log_point_s(84), 'chem.exch-horiz', 'start' ) 537 544 DO lsp = 1, nspec 538 545 CALL exchange_horiz( chem_species(lsp)%conc, nbgp ) … … 550 557 551 558 ENDDO 552 CALL cpu_log( log_point_s(84), 'chemistry exch-horiz ', 'stop' ) 553 554 CALL cpu_log( log_point(82), '(chem react + exch_h)', 'stop' ) 559 CALL cpu_log( log_point_s(84), 'chem.exch-horiz', 'stop' ) 555 560 556 561 ENDIF … … 2611 2616 !-- Calculate prognostic equation for chemical quantites 2612 2617 IF ( air_chemistry ) THEN 2613 CALL cpu_log( log_point (83), '(chem advec+diff+prog)', 'start' )2618 CALL cpu_log( log_point_s(25), 'chem.advec+diff+prog', 'start' ) 2614 2619 ! 2615 2620 !-- Loop over chemical species … … 2622 2627 ENDDO 2623 2628 2624 CALL cpu_log( log_point (83), '(chem advec+diff+prog)', 'stop' )2629 CALL cpu_log( log_point_s(25), 'chem.advec+diff+prog', 'stop' ) 2625 2630 ENDIF ! Chemicals equations 2626 2631 -
palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90
r3646 r3719 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed log_point measurement from stg_init, since this part is counted to 28 ! log_point(2) 'initialisation' already. Moved other log_points to calls of 29 ! the subroutines in time_integration for better overview. 30 ! 31 ! 3646 2018-12-28 17:58:49Z kanani 27 32 ! Bugfix: use time_since_reference_point instead of simulated_time (relevant 28 33 ! when using wall/soil spinup) … … 182 187 syn_turb_gen 183 188 184 USE cpulog, &185 ONLY: cpu_log, log_point186 187 189 USE indices, & 188 190 ONLY: nbgp, nzb, nzt, nxl, nxlg, nxr, nxrg, nys, nyn, nyng, nysg … … 573 575 #endif 574 576 575 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'start' )576 577 577 #if defined( __parallel ) 578 578 ! … … 885 885 ENDIF 886 886 887 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'stop' )888 889 887 END SUBROUTINE stg_init 890 888 … … 1085 1083 REAL(wp) :: volume_flow_l !< local mass flux through lateral boundary 1086 1084 1087 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'start' )1088 1085 1089 1086 ! … … 1429 1426 time_stg_call = 0.0_wp 1430 1427 1431 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'stop' )1432 1428 1433 1429 END SUBROUTINE stg_main … … 1833 1829 INTEGER(iwp) :: k 1834 1830 1835 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'start' ) 1831 1836 1832 ! 1837 1833 !-- Compute mean boundary layer height according to Richardson-Bulk … … 1867 1863 time_stg_adjust = 0.0_wp 1868 1864 1869 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'stop' )1870 1865 1871 1866 END SUBROUTINE stg_adjust -
palm/trunk/SOURCE/time_integration.f90
r3705 r3719 25 25 ! ----------------- 26 26 ! $Id$ 27 ! - removed wind_turbine cpu measurement, since same time is measured inside 28 ! wtm_forces subroutine as special measures 29 ! - moved the numerous vnest cpulog to special measures 30 ! - extended radiation cpulog over entire radiation part, 31 ! moved radiation_interactions cpulog to special measures 32 ! - moved some cpu_log calls to this routine for better overview 33 ! 34 ! 3705 2019-01-29 19:56:39Z suehring 27 35 ! Data output for virtual measurements added 28 36 ! … … 795 803 IF ( vnested ) THEN 796 804 IF ( .NOT. vnest_init .AND. simulated_time >= vnest_start_time ) THEN 797 CALL cpu_log( log_point (80), 'vnest_init', 'start' )805 CALL cpu_log( log_point_s(22), 'vnest_init', 'start' ) 798 806 CALL vnest_init_fine 799 807 vnest_init = .TRUE. 800 CALL cpu_log( log_point (80), 'vnest_init', 'stop' )808 CALL cpu_log( log_point_s(22), 'vnest_init', 'stop' ) 801 809 ENDIF 802 810 ENDIF … … 841 849 ! 842 850 !-- Calculate forces by wind turbines 843 IF ( wind_turbine ) THEN 844 845 CALL cpu_log( log_point(55), 'wind_turbine', 'start' ) 846 847 CALL wtm_forces 848 849 CALL cpu_log( log_point(55), 'wind_turbine', 'stop' ) 850 851 ENDIF 851 IF ( wind_turbine ) CALL wtm_forces 852 852 853 853 ! … … 1049 1049 !-- Vertical nesting: Interpolate fine grid data to the coarse grid 1050 1050 IF ( vnest_init ) THEN 1051 CALL cpu_log( log_point (81), 'vnest_anterpolate', 'start' )1051 CALL cpu_log( log_point_s(37), 'vnest_anterpolate', 'start' ) 1052 1052 CALL vnest_anterpolate 1053 CALL cpu_log( log_point (81), 'vnest_anterpolate', 'stop' )1053 CALL cpu_log( log_point_s(37), 'vnest_anterpolate', 'stop' ) 1054 1054 ENDIF 1055 1055 … … 1125 1125 ! 1126 1126 !-- Impose a turbulent inflow using the recycling method 1127 IF ( turbulent_inflow ) CALL 1127 IF ( turbulent_inflow ) CALL inflow_turbulence 1128 1128 1129 1129 ! 1130 1130 !-- Set values at outflow boundary using the special outflow condition 1131 IF ( turbulent_outflow ) CALL 1131 IF ( turbulent_outflow ) CALL outflow_turbulence 1132 1132 1133 1133 ! … … 1170 1170 !-- only once per time step. 1171 1171 IF ( use_syn_turb_gen .AND. time_stg_call >= dt_stg_call .AND. & 1172 intermediate_timestep_count == intermediate_timestep_count_max ) THEN! & 1172 intermediate_timestep_count == intermediate_timestep_count_max ) THEN 1173 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'start' ) 1173 1174 CALL stg_main 1175 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'stop' ) 1174 1176 ENDIF 1175 1177 ! … … 1191 1193 IF ( coupling_mode == 'vnested_crse' ) CALL pres 1192 1194 1193 CALL cpu_log( log_point (82), 'vnest_bc', 'start' )1195 CALL cpu_log( log_point_s(30), 'vnest_bc', 'start' ) 1194 1196 CALL vnest_boundary_conds 1195 CALL cpu_log( log_point (82), 'vnest_bc', 'stop' )1197 CALL cpu_log( log_point_s(30), 'vnest_bc', 'stop' ) 1196 1198 1197 1199 IF ( coupling_mode == 'vnested_fine' ) CALL pres 1198 1200 1199 1201 !-- Anterpolate TKE, satisfy Germano Identity 1200 CALL cpu_log( log_point (83), 'vnest_anter_e', 'start' )1202 CALL cpu_log( log_point_s(28), 'vnest_anter_e', 'start' ) 1201 1203 CALL vnest_anterpolate_e 1202 CALL cpu_log( log_point (83), 'vnest_anter_e', 'stop' )1204 CALL cpu_log( log_point_s(28), 'vnest_anter_e', 'stop' ) 1203 1205 1204 1206 ELSE … … 1347 1349 CALL radiation_control 1348 1350 1349 CALL cpu_log( log_point(50), 'radiation', 'stop' )1350 1351 1351 IF ( ( urban_surface .OR. land_surface ) .AND. & 1352 1352 radiation_interactions ) THEN 1353 CALL cpu_log( log_point (75), 'radiation_interaction', 'start' )1353 CALL cpu_log( log_point_s(75), 'radiation_interaction', 'start' ) 1354 1354 CALL radiation_interaction 1355 CALL cpu_log( log_point (75), 'radiation_interaction', 'stop' )1355 CALL cpu_log( log_point_s(75), 'radiation_interaction', 'stop' ) 1356 1356 ENDIF 1357 1357 … … 1359 1359 !-- Return the current time to its original value 1360 1360 time_since_reference_point = time_since_reference_point_save 1361 1362 CALL cpu_log( log_point(50), 'radiation', 'stop' ) 1361 1363 1362 1364 ENDIF … … 1477 1479 IF ( parametrize_inflow_turbulence ) THEN 1478 1480 time_stg_adjust = time_stg_adjust + dt_3d 1479 IF ( time_stg_adjust >= dt_stg_adjust ) CALL stg_adjust 1481 IF ( time_stg_adjust >= dt_stg_adjust ) THEN 1482 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'start' ) 1483 CALL stg_adjust 1484 CALL cpu_log( log_point(57), 'synthetic_turbulence_gen', 'stop' ) 1485 ENDIF 1480 1486 ENDIF 1481 1487 time_stg_call = time_stg_call + dt_3d … … 1745 1751 1746 1752 ! 1747 !-- If required, set the heat flux for the next time step ata random value1753 !-- If required, set the heat flux for the next time step to a random value 1748 1754 IF ( constant_heatflux .AND. random_heatflux ) THEN 1749 IF ( surf_def_h(0)%ns >= 1 ) CALL disturb_heatflux( surf_def_h(0) ) 1750 IF ( surf_lsm_h%ns >= 1 ) CALL disturb_heatflux( surf_lsm_h ) 1751 IF ( surf_usm_h%ns >= 1 ) CALL disturb_heatflux( surf_usm_h ) 1755 IF ( surf_def_h(0)%ns >= 1 ) THEN 1756 CALL cpu_log( log_point(23), 'disturb_heatflux', 'start' ) 1757 CALL disturb_heatflux( surf_def_h(0) ) 1758 CALL cpu_log( log_point(23), 'disturb_heatflux', 'stop' ) 1759 ENDIF 1760 IF ( surf_lsm_h%ns >= 1 ) THEN 1761 CALL cpu_log( log_point(23), 'disturb_heatflux', 'start' ) 1762 CALL disturb_heatflux( surf_lsm_h ) 1763 CALL cpu_log( log_point(23), 'disturb_heatflux', 'stop' ) 1764 ENDIF 1765 IF ( surf_usm_h%ns >= 1 ) THEN 1766 CALL cpu_log( log_point(23), 'disturb_heatflux', 'start' ) 1767 CALL disturb_heatflux( surf_usm_h ) 1768 CALL cpu_log( log_point(23), 'disturb_heatflux', 'stop' ) 1769 ENDIF 1752 1770 ENDIF 1753 1771 -
palm/trunk/SOURCE/time_integration_spinup.f90
r3655 r3719 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed log_point(19,54,74,50,75), since they count together with same log 28 ! points in time_integration, impossible to separate the contributions. 29 ! Instead, the entire spinup gets an individual log_point in palm.f90 30 ! 31 ! 3655 2019-01-07 16:51:22Z knoop 27 32 ! Removed call to calculation of near air (10 cm) potential temperature (now in 28 33 ! surface layer fluxes) … … 360 365 !-- (constant flux) layer are computed 361 366 IF ( constant_flux_layer ) THEN 362 CALL cpu_log( log_point(19), 'surface_layer_fluxes', 'start' )363 367 CALL surface_layer_fluxes 364 CALL cpu_log( log_point(19), 'surface_layer_fluxes', 'stop' )365 368 ENDIF 366 369 … … 371 374 IF ( land_surface ) THEN 372 375 373 CALL cpu_log( log_point(54), 'land_surface', 'start' )374 376 ! 375 377 !-- Call for horizontal upward-facing surfaces … … 392 394 CALL lsm_energy_balance( .FALSE., 3 ) 393 395 CALL lsm_soil_model( .FALSE., 3, calc_soil_moisture_during_spinup ) 394 395 CALL cpu_log( log_point(54), 'land_surface', 'stop' ) 396 396 397 ENDIF 397 398 … … 400 401 !-- the material heat model 401 402 IF (urban_surface) THEN 402 CALL cpu_log( log_point(74), 'urban_surface', 'start' ) 403 403 404 CALL usm_surface_energy_balance( .TRUE. ) 404 405 IF ( usm_material_model ) THEN … … 406 407 CALL usm_material_heat_model( .TRUE. ) 407 408 ENDIF 408 409 CALL cpu_log( log_point(74), 'urban_surface', 'stop' ) 409 410 410 ENDIF 411 411 … … 422 422 THEN 423 423 424 CALL cpu_log( log_point(50), 'radiation', 'start' )425 426 424 IF ( .NOT. force_radiation_call ) THEN 427 425 time_radiation = time_radiation - dt_3d … … 430 428 CALL radiation_control 431 429 432 CALL cpu_log( log_point(50), 'radiation', 'stop' )433 434 430 IF ( radiation_interactions ) THEN 435 CALL cpu_log( log_point(75), 'radiation_interaction', 'start' )436 431 CALL radiation_interaction 437 CALL cpu_log( log_point(75), 'radiation_interaction', 'stop' )438 432 ENDIF 439 433 ENDIF -
palm/trunk/SOURCE/turbulence_closure_mod.f90
r3684 r3719 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Changed log_point to log_point_s, otherwise this overlaps with 28 ! 'all progn.equations' cpu measurement. 29 ! 30 ! 3684 2019-01-20 20:20:58Z knoop 27 31 ! Remove unused variable simulated_time 28 32 ! … … 214 218 215 219 USE cpulog, & 216 ONLY: cpu_log, log_point , log_point_s220 ONLY: cpu_log, log_point_s 217 221 218 222 USE indices, & … … 1945 1949 IF ( .NOT. constant_diffusion ) THEN 1946 1950 1947 CALL cpu_log( log_point (16), 'tke-equation', 'start' )1951 CALL cpu_log( log_point_s(16), 'tke-equation', 'start' ) 1948 1952 1949 1953 sbt = tsc(2) … … 2053 2057 ENDIF 2054 2058 2055 CALL cpu_log( log_point (16), 'tke-equation', 'stop' )2059 CALL cpu_log( log_point_s(16), 'tke-equation', 'stop' ) 2056 2060 2057 2061 ENDIF ! TKE equation … … 2061 2065 IF ( rans_tke_e ) THEN 2062 2066 2063 CALL cpu_log( log_point (33), 'diss-equation', 'start' )2067 CALL cpu_log( log_point_s(33), 'diss-equation', 'start' ) 2064 2068 2065 2069 sbt = tsc(2) … … 2153 2157 ENDIF 2154 2158 2155 CALL cpu_log( log_point (33), 'diss-equation', 'stop' )2159 CALL cpu_log( log_point_s(33), 'diss-equation', 'stop' ) 2156 2160 2157 2161 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.
