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

Timestamp:

Oct 24, 2018 6:39:32 PM (6 years ago)

Author:

gronemeier

Message:

new surface-data output; renamed output variables (pt to theta, rho_air to rho, rho_ocean to rho_sea_water)

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Surface data output
+! 
+! 3418 2018-10-24 16:07:39Z kanani
 ! call to material_heat_model now with check if spinup runs (rvtils)
 ! 
@@ -432 +435 @@
                skip_time_do2d_xy, skip_time_do2d_xz, skip_time_do2d_yz,        &
                skip_time_do3d, skip_time_domask, skip_time_dopr,               &
-               skip_time_data_output_av, sloping_surface,                      &
-               stop_dt, terminate_coupled, terminate_run, timestep_scheme,     &
+               skip_time_data_output_av, sloping_surface, stop_dt,             &
+               surface_data_output, terminate_coupled, terminate_run,          &
+               timestep_scheme,                                                &
                time_coupling, time_do2d_xy, time_do2d_xz, time_do2d_yz,        &
                time_do3d, time_domask, time_dopr, time_dopr_av,                &
@@ -519 +523 @@
     USE surface_mod,                                                           &
         ONLY:  surf_def_h, surf_lsm_h, surf_usm_h
+        
+    USE surface_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
 
     USE turbulence_closure_mod,                                                &
@@ -1235 +1245 @@
        time_run_control   = time_run_control + dt_3d
 !
+!--    Increment time-counter for surface output
+       IF ( surface_data_output )  THEN
+          IF ( simulated_time >= skip_time_dosurf )  THEN
+             time_dosurf    = time_dosurf + dt_3d
+          ENDIF
+          IF ( simulated_time >= skip_time_dosurf_av )  THEN
+             time_dosurf_av = time_dosurf_av + dt_3d
+          ENDIF
+       ENDIF
+!
 !--    In case of synthetic turbulence generation and parametrized turbulence
 !--    information, update the time counter and if required, adjust the 
@@ -1324 +1344 @@
              average_count_3d = average_count_3d + 1
              time_do_sla = MOD( time_do_sla, MAX( dt_averaging_input, dt_3d ) )
+          ENDIF
+       ENDIF
+!
+!--    Average surface data
+       IF ( surface_data_output )  THEN
+          IF ( averaging_interval_surf /= 0.0_wp  .AND.                        & 
+               ( dt_dosurf_av - time_dosurf_av ) <= averaging_interval_surf    &
+          .AND.  simulated_time >= skip_time_dosurf_av )  THEN
+             IF ( time_dosurf_av >= dt_averaging_input )  THEN        
+                CALL surface_output_averaging
+                average_count_surf = average_count_surf + 1
+             ENDIF
           ENDIF
        ENDIF
@@ -1424 +1456 @@
           time_do_av = MOD( time_do_av, MAX( dt_data_output_av, dt_3d ) )
        ENDIF
+!
+!--    Output of surface data, instantaneous and averaged data
+       IF ( surface_data_output )  THEN
+          IF ( time_dosurf >= dt_dosurf )  THEN
+             CALL surface_output( 0 )
+             time_dosurf = MOD( time_dosurf, MAX( dt_dosurf, dt_3d ) )
+          ENDIF
+          IF ( time_dosurf_av >= dt_dosurf_av )  THEN
+             CALL surface_output( 1 )
+             time_dosurf_av = MOD( time_dosurf_av, MAX( dt_dosurf_av, dt_3d ) )
+          ENDIF
+       ENDIF
 
 !