Changeset 4667 for palm/trunk/SOURCE

Timestamp:

Sep 9, 2020 12:52:40 PM (4 years ago)

Author:

pavelkrc

Message:

Limit vertical r_a in USM similarly to horizontal; improve debug messages

Location:

palm/trunk/SOURCE

Files:

• radiation_model_mod.f90 (modified) (2 diffs)
• time_integration.f90 (modified) (4 diffs)
• time_integration_spinup.f90 (modified) (4 diffs)
• urban_surface_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -23 +23 @@
 ! Current revisions:
 ! ------------------
-!
+! Improve debug messages during timestepping
 !
 ! Former revisions:
@@ -5884 +5884 @@
 #endif
 
-     IF ( debug_output_timestep )  CALL debug_message( 'radiation_interaction', 'start' )
+     IF ( debug_output_timestep )  THEN
+         WRITE( debug_string, * ) 'radiation_interaction', time_since_reference_point
+         CALL debug_message( debug_string, 'start' )
+     ENDIF
 
      IF ( plant_canopy )  THEN

palm/trunk/SOURCE/time_integration.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Improve debug messages during timestepping
 ! 
 ! Former revisions:
@@ -274 +274 @@
                averaging_interval, averaging_interval_pr, bc_lr_cyc, bc_ns_cyc, bc_pt_t_val,       &
                bc_q_t_val, biometeorology, call_psolver_at_all_substeps,  child_domain,            &
-               constant_flux_layer, constant_heatflux, create_disturbances,        &
+               constant_flux_layer, constant_heatflux, create_disturbances,                        &
                dopr_n, constant_diffusion, coupling_mode, coupling_start_time,                     &
-               current_timestep_number, disturbance_created, disturbance_energy_limit, dist_range, &
+               current_timestep_number, debug_output_timestep, debug_string,                       &
+               disturbance_created, disturbance_energy_limit, dist_range,                          &
                do_sum, dt_3d, dt_averaging_input, dt_averaging_input_pr, dt_coupling,              &
                dt_data_output_av, dt_disturb, dt_do2d_xy, dt_do2d_xz, dt_do2d_yz, dt_do3d,         &
@@ -646 +647 @@
 
        CALL cpu_log( log_point_s(10), 'timesteps', 'start' )
+
+       IF ( debug_output_timestep )  THEN
+           WRITE( debug_string, * ) 'time_integration', simulated_time
+           CALL debug_message( debug_string, 'start' )
+       ENDIF
 
 !
@@ -1688 +1694 @@
        IF ( myid == 0 )  CALL output_progress_bar
 
+       IF ( debug_output_timestep )  THEN
+           WRITE( debug_string, * ) 'time_integration', simulated_time
+           CALL debug_message( debug_string, 'end' )
+       ENDIF
+
        CALL cpu_log( log_point_s(10), 'timesteps', 'stop' )
 

palm/trunk/SOURCE/time_integration_spinup.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-!
+! Improve debug messages during timestepping
 !
 ! Former revisions:
@@ -100 +100 @@
                coupling_start_time,                                                                &
                data_output_during_spinup,                                                          &
+               debug_output_timestep,                                                              &
+               debug_string,                                                                       &
                dopr_n,                                                                             &
                do_sum,                                                                             &
@@ -305 +307 @@
        CALL cpu_log( log_point_s(15), 'timesteps spinup', 'start' )
 
+       IF ( debug_output_timestep )  THEN
+           WRITE( debug_string, * ) 'time_integration_spinup', simulated_time
+           CALL debug_message( debug_string, 'start' )
+       ENDIF
+
 !
 !--    Start of intermediate step loop
@@ -606 +613 @@
        ENDIF
 
+       IF ( debug_output_timestep )  THEN
+           WRITE( debug_string, * ) 'time_integration_spinup', simulated_time
+           CALL debug_message( debug_string, 'end' )
+       ENDIF
 
 

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -22 +22 @@
 ! Current revisions:
 ! -----------------
-!
+! Limit vertical r_a similarly to horizontal
 !
 ! Former revisions:
@@ -8070 +8070 @@
 !--        Limit aerodynamic resistance
            IF ( surf_usm_v(l)%r_a(m) < 1.0_wp )  surf_usm_v(l)%r_a(m) = 1.0_wp
+           IF ( surf_usm_v(l)%r_a(m) > 300.0_wp )  surf_usm_v(l)%r_a(m) = 300.0_wp
 
            f_shf         = rho_cp / surf_usm_v(l)%r_a(m)