Changeset 3742 for palm/trunk/SOURCE/time_integration.f90
- Timestamp:
- Feb 14, 2019 11:25:22 AM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/time_integration.f90
r3739 r3742 25 25 ! ----------------- 26 26 ! $Id$ 27 ! - Moved call of bio_calculate_thermal_index_maps from biometeorology module to 28 ! time_integration to make sure averaged input is updated before calculating. 29 ! 30 ! 3739 2019-02-13 08:05:17Z dom_dwd_user 27 31 ! Removed everything related to "time_bio_results" as this is never used. 28 32 ! … … 1635 1639 IF ( time_dopr_listing >= dt_dopr_listing ) THEN 1636 1640 CALL print_1d 1637 time_dopr_listing = MOD( time_dopr_listing, MAX( dt_dopr_listing, &1641 time_dopr_listing = MOD( time_dopr_listing, MAX( dt_dopr_listing, & 1638 1642 dt_3d ) ) 1639 1643 ENDIF … … 1641 1645 ! 1642 1646 !-- Graphic output for PROFIL 1643 IF ( time_dopr >= dt_dopr &1647 IF ( time_dopr >= dt_dopr & 1644 1648 .AND. time_since_reference_point >= skip_time_dopr ) THEN 1645 1649 IF ( dopr_n /= 0 ) CALL data_output_profiles … … 1658 1662 !-- Output of spectra (formatted for use with PROFIL), in case of no 1659 1663 !-- time averaging, spectra has to be calculated before 1660 IF ( time_dosp >= dt_dosp &1664 IF ( time_dosp >= dt_dosp & 1661 1665 .AND. time_since_reference_point >= skip_time_dosp ) THEN 1662 1666 IF ( average_count_sp == 0 ) CALL calc_spectra … … 1667 1671 ! 1668 1672 !-- 2d-data output (cross-sections) 1669 IF ( time_do2d_xy >= dt_do2d_xy &1673 IF ( time_do2d_xy >= dt_do2d_xy & 1670 1674 .AND. time_since_reference_point >= skip_time_do2d_xy ) THEN 1671 1675 CALL data_output_2d( 'xy', 0 ) 1672 1676 time_do2d_xy = MOD( time_do2d_xy, MAX( dt_do2d_xy, dt_3d ) ) 1673 1677 ENDIF 1674 IF ( time_do2d_xz >= dt_do2d_xz &1678 IF ( time_do2d_xz >= dt_do2d_xz & 1675 1679 .AND. time_since_reference_point >= skip_time_do2d_xz ) THEN 1676 1680 CALL data_output_2d( 'xz', 0 ) 1677 1681 time_do2d_xz = MOD( time_do2d_xz, MAX( dt_do2d_xz, dt_3d ) ) 1678 1682 ENDIF 1679 IF ( time_do2d_yz >= dt_do2d_yz &1683 IF ( time_do2d_yz >= dt_do2d_yz & 1680 1684 .AND. time_since_reference_point >= skip_time_do2d_yz ) THEN 1681 1685 CALL data_output_2d( 'yz', 0 ) … … 1685 1689 ! 1686 1690 !-- 3d-data output (volume data) 1687 IF ( time_do3d >= dt_do3d &1691 IF ( time_do3d >= dt_do3d & 1688 1692 .AND. time_since_reference_point >= skip_time_do3d ) THEN 1689 1693 CALL data_output_3d( 0 ) … … 1694 1698 !-- Masked data output 1695 1699 DO mid = 1, masks 1696 IF ( time_domask(mid) >= dt_domask(mid) 1700 IF ( time_domask(mid) >= dt_domask(mid) & 1697 1701 .AND. time_since_reference_point >= skip_time_domask(mid) ) THEN 1698 1702 CALL data_output_mask( 0 ) 1699 time_domask(mid) = MOD( time_domask(mid), 1703 time_domask(mid) = MOD( time_domask(mid), & 1700 1704 MAX( dt_domask(mid), dt_3d ) ) 1701 1705 ENDIF … … 1704 1708 ! 1705 1709 !-- Output of time-averaged 2d/3d/masked data 1706 IF ( time_do_av >= dt_data_output_av 1710 IF ( time_do_av >= dt_data_output_av & 1707 1711 .AND. time_since_reference_point >= skip_time_data_output_av ) THEN 1708 1712 CALL average_3d_data 1713 ! 1714 !-- Udate thermal comfort indices based on updated averaged input 1715 IF ( biometeorology .AND. thermal_comfort ) THEN 1716 CALL bio_calculate_thermal_index_maps ( .TRUE. ) 1717 ENDIF 1709 1718 CALL data_output_2d( 'xy', 1 ) 1710 1719 CALL data_output_2d( 'xz', 1 ) … … 1719 1728 !-- Output of surface data, instantaneous and averaged data 1720 1729 IF ( surface_output ) THEN 1721 IF ( time_dosurf >= dt_dosurf 1730 IF ( time_dosurf >= dt_dosurf & 1722 1731 .AND. time_since_reference_point >= skip_time_dosurf ) THEN 1723 1732 CALL surface_data_output( 0 ) 1724 1733 time_dosurf = MOD( time_dosurf, MAX( dt_dosurf, dt_3d ) ) 1725 1734 ENDIF 1726 IF ( time_dosurf_av >= dt_dosurf_av 1735 IF ( time_dosurf_av >= dt_dosurf_av & 1727 1736 .AND. time_since_reference_point >= skip_time_dosurf_av ) THEN 1728 1737 CALL surface_data_output( 1 )
Note: See TracChangeset
for help on using the changeset viewer.