Changeset 3648 for palm/trunk/SOURCE/time_integration.f90
- Timestamp:
- Jan 2, 2019 4:35:46 PM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/time_integration.f90
r3647 r3648 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Rename subroutines for surface-data output 28 ! 29 ! 3647 2019-01-02 14:10:44Z kanani 27 30 ! Bugfix: add time_since_reference_point to IF clause for data_output calls 28 31 ! (otherwise skip_time_* values don't come into affect with dt_do* = 0.0). … … 488 491 skip_time_do3d, skip_time_domask, skip_time_dopr, & 489 492 skip_time_data_output_av, sloping_surface, stop_dt, & 490 surface_ data_output, terminate_coupled, terminate_run,&493 surface_output, terminate_coupled, terminate_run, & 491 494 timestep_scheme, & 492 495 time_coupling, time_do2d_xy, time_do2d_xz, time_do2d_yz, & … … 595 598 enter_surface_arrays, exit_surface_arrays 596 599 597 USE surface_ output_mod,&600 USE surface_data_output_mod, & 598 601 ONLY: average_count_surf, averaging_interval_surf, dt_dosurf, & 599 dt_dosurf_av, surface_ output, surface_output_averaging,&600 s kip_time_dosurf, skip_time_dosurf_av, time_dosurf,&601 time_dosurf_av602 dt_dosurf_av, surface_data_output, & 603 surface_data_output_averaging, skip_time_dosurf, & 604 skip_time_dosurf_av, time_dosurf, time_dosurf_av 602 605 603 606 USE turbulence_closure_mod, & … … 1466 1469 ! 1467 1470 !-- Increment time-counter for surface output 1468 IF ( surface_ data_output ) THEN1471 IF ( surface_output ) THEN 1469 1472 IF ( time_since_reference_point >= skip_time_dosurf ) THEN 1470 1473 time_dosurf = time_dosurf + dt_3d … … 1592 1595 ! 1593 1596 !-- Average surface data 1594 IF ( surface_ data_output ) THEN1597 IF ( surface_output ) THEN 1595 1598 IF ( averaging_interval_surf /= 0.0_wp & 1596 1599 .AND. ( dt_dosurf_av - time_dosurf_av ) <= averaging_interval_surf & 1597 1600 .AND. time_since_reference_point >= skip_time_dosurf_av ) THEN 1598 1601 IF ( time_dosurf_av >= dt_averaging_input ) THEN 1599 CALL surface_ output_averaging1602 CALL surface_data_output_averaging 1600 1603 average_count_surf = average_count_surf + 1 1601 1604 ENDIF … … 1714 1717 ! 1715 1718 !-- Output of surface data, instantaneous and averaged data 1716 IF ( surface_ data_output ) THEN1719 IF ( surface_output ) THEN 1717 1720 IF ( time_dosurf >= dt_dosurf & 1718 1721 .AND. time_since_reference_point >= skip_time_dosurf ) THEN 1719 CALL surface_ output( 0 )1722 CALL surface_data_output( 0 ) 1720 1723 time_dosurf = MOD( time_dosurf, MAX( dt_dosurf, dt_3d ) ) 1721 1724 ENDIF 1722 1725 IF ( time_dosurf_av >= dt_dosurf_av & 1723 1726 .AND. time_since_reference_point >= skip_time_dosurf_av ) THEN 1724 CALL surface_ output( 1 )1727 CALL surface_data_output( 1 ) 1725 1728 time_dosurf_av = MOD( time_dosurf_av, MAX( dt_dosurf_av, dt_3d ) ) 1726 1729 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.