Changeset 240 for palm/trunk/SOURCE/modules.f90

Timestamp:

Feb 18, 2009 5:50:38 PM (15 years ago)

Author:

letzel

Message:

• External pressure gradient (check_parameters, init_3d_model, header, modules, parin, prognostic_equations)
• New topography case 'single_street_canyon'

File:

• palm/trunk/SOURCE/modules.f90 (modified) (8 diffs)

palm/trunk/SOURCE/modules.f90

@@ -6 +6 @@
 ! -----------------
 ! +cluster_size in dvrp_variables
+! +dp_external, dp_level_b, dp_level_ind_b, dp_smooth, dp_smooth_factor, dpdxy,
+! in control_parameters
+! +canyon_height, canyon_width_x, canyon_width_y, canyon_wall_left, 
+! canyon_wall_south in control_parameters
 !
 ! Former revisions:
@@ -313 +317 @@
                 dosp_time_count = 0, dots_time_count = 0, &
                 do2d_xy_n = 0, do2d_xz_n = 0, do2d_yz_n = 0, do3d_avs_n = 0, &
+                dp_level_ind_b = 0, &
                 dvrp_filecount = 0, dz_stretch_level_index, gamma_mg, &
                 grid_level, ibc_e_b, ibc_p_b, ibc_p_t, ibc_pt_b, ibc_pt_t, &
@@ -323 +328 @@
                 nsor_ini = 100, n_sor, normalizing_region = 0, &
                 nz_do1d, nz_do3d = -9999, outflow_damping_width = -1, &
-                prt_time_count = 0, recycling_plane, runnr = 0, &
+                pch_index = 0, prt_time_count = 0, recycling_plane, runnr = 0, &
                 skip_do_avs = 0, terminate_coupled = 0, &
                 terminate_coupled_remote = 0, timestep_count = 0
@@ -332 +337 @@
                 do3d_no(0:1) = 0, do3d_time_count(0:1), &
                 lad_vertical_gradient_level_ind(10) = -9999, &
-                pch_index = 0, &
                 pt_vertical_gradient_level_ind(10) = -9999, &
                 q_vertical_gradient_level_ind(10) = -9999, &
@@ -354 +358 @@
                 data_output_2d_on_each_pe = .TRUE., do2d_at_begin = .FALSE., &
                 do3d_at_begin = .FALSE., do3d_compress = .FALSE., &
-                do_sum = .FALSE., dt_changed = .FALSE., dt_fixed = .FALSE., &
+                do_sum = .FALSE., dp_external = .FALSE., dp_smooth = .FALSE., &
+                dt_changed = .FALSE., dt_fixed = .FALSE., &
                 disturbance_created = .FALSE., &
                 first_call_advec_particles = .TRUE., &
@@ -388 +393 @@
              building_height = 50.0, building_length_x = 50.0, &
              building_length_y = 50.0, building_wall_left = 9999999.9, &
-             building_wall_south = 9999999.9, cthf = 0.0, cfl_factor = -1.0, &
+             building_wall_south = 9999999.9, canyon_height = 50.0, &
+             canyon_width_x = 9999999.9, canyon_width_y = 9999999.9, &
+             canyon_wall_left = 9999999.9, canyon_wall_south = 9999999.9, &
+             cthf = 0.0, cfl_factor = -1.0, &
              cos_alpha_surface, disturbance_amplitude = 0.25, &
              disturbance_energy_limit = 0.01, &
              disturbance_level_b = -9999999.9, &
              disturbance_level_t = -9999999.9, &
-             drag_coefficient = 0.0, &
+             dp_level_b = 0.0, drag_coefficient = 0.0, &
              dt = -1.0, dt_averaging_input = 0.0, &
              dt_averaging_input_pr = 9999999.9, dt_coupling = 9999999.9, &
@@ -452 +460 @@
 
     REAL ::  do2d_xy_last_time(0:1) = -1.0, do2d_xz_last_time(0:1) = -1.0, &
-             do2d_yz_last_time(0:1) = -1.0, &
+             do2d_yz_last_time(0:1) = -1.0, dpdxy(1:2) = 0.0, &
              lad_vertical_gradient(10) = 0.0, &
              lad_vertical_gradient_level(10) = -9999999.9, &
@@ -472 +480 @@
              wall_humidityflux(0:4) = 0.0, wall_qflux(0:4) = 0.0, &
              wall_salinityflux(0:4) = 0.0, wall_scalarflux(0:4) = 0.0
+
+    REAL, DIMENSION(:), ALLOCATABLE ::  dp_smooth_factor