Changeset 3648 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Jan 2, 2019 4:35:46 PM (5 years ago)

Author:

suehring

Message:

Rename surface_output_mod into surface_data_output_mod, same with all corresponding subroutines

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (6 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Rename subroutines for surface-data output
+! 
+! 3647 2019-01-02 14:10:44Z kanani
 ! Bugfix: add time_since_reference_point to IF clause for data_output calls
 ! (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,               &
                skip_time_data_output_av, sloping_surface, stop_dt,             &
-               surface_data_output, terminate_coupled, terminate_run,          &
+               surface_output, terminate_coupled, terminate_run,               &
                timestep_scheme,                                                &
                time_coupling, time_do2d_xy, time_do2d_xz, time_do2d_yz,        &
@@ -595 +598 @@
                enter_surface_arrays, exit_surface_arrays
 
-    USE surface_output_mod,                                                    &
+    USE surface_data_output_mod,                                               &
         ONLY:  average_count_surf, averaging_interval_surf, dt_dosurf,         &
-               dt_dosurf_av, surface_output, surface_output_averaging,         &
-               skip_time_dosurf, skip_time_dosurf_av, time_dosurf,             &
-               time_dosurf_av
+               dt_dosurf_av, surface_data_output,                              &
+               surface_data_output_averaging, skip_time_dosurf,                &
+               skip_time_dosurf_av, time_dosurf, time_dosurf_av
 
     USE turbulence_closure_mod,                                                &
@@ -1466 +1469 @@
 !
 !--    Increment time-counter for surface output
-       IF ( surface_data_output )  THEN
+       IF ( surface_output )  THEN
           IF ( time_since_reference_point >= skip_time_dosurf )  THEN
              time_dosurf    = time_dosurf + dt_3d
@@ -1592 +1595 @@
 !
 !--    Average surface data
-       IF ( surface_data_output )  THEN
+       IF ( surface_output )  THEN
           IF (         averaging_interval_surf /= 0.0_wp                               &
                 .AND.  ( dt_dosurf_av - time_dosurf_av ) <= averaging_interval_surf    &
                 .AND.  time_since_reference_point >= skip_time_dosurf_av )  THEN
              IF ( time_dosurf_av >= dt_averaging_input )  THEN        
-                CALL surface_output_averaging
+                CALL surface_data_output_averaging
                 average_count_surf = average_count_surf + 1
              ENDIF
@@ -1714 +1717 @@
 !
 !--    Output of surface data, instantaneous and averaged data
-       IF ( surface_data_output )  THEN
+       IF ( surface_output )  THEN
           IF (         time_dosurf >= dt_dosurf                                    &
                 .AND.  time_since_reference_point >= skip_time_dosurf )  THEN
-             CALL surface_output( 0 )
+             CALL surface_data_output( 0 )
              time_dosurf = MOD( time_dosurf, MAX( dt_dosurf, dt_3d ) )
           ENDIF
           IF (         time_dosurf_av >= dt_dosurf_av                              &
                 .AND.  time_since_reference_point >= skip_time_dosurf_av )  THEN
-             CALL surface_output( 1 )
+             CALL surface_data_output( 1 )
              time_dosurf_av = MOD( time_dosurf_av, MAX( dt_dosurf_av, dt_3d ) )
           ENDIF