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

Timestamp:

Aug 9, 2012 8:28:32 AM (12 years ago)

Author:

fricke

Message:

merge fricke branch back into trunk

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/modules.f90 (modified) (10 diffs)

palm/trunk/SOURCE/modules.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! +c_u_m, c_u_m_l, c_v_m, c_v_m_l, c_w_m, c_w_m_l,
+! +bc_lr_dirneu, bc_lr_neudir, bc_ns_dirneu, bc_ns_neudir
+! -km_damp_x, km_damp_y, km_damp_max, outflow_damping_width
+! +z0h, z0h_av, z0h_factor, z0h1d
+! +ptdf_x, ptdf_y, pt_damping_width, pt_damping_factor 
 !
 ! Former revisions:
@@ -324 +328 @@
 
     REAL, DIMENSION(:), ALLOCATABLE ::                                         &
-          ddzu, ddzu_pres, dd2zu, dzu, ddzw, dzw, hyp, inflow_damping_factor,  &
-          km_damp_x, km_damp_y, lad, l_grid, pt_init, q_init, rdf, rdf_sc,     &
-          sa_init, ug, u_init, u_nzb_p1_for_vfc, vg, v_init, v_nzb_p1_for_vfc, &
-          w_subs, zu, zw
+          c_u_m, c_u_m_l, c_v_m, c_v_m_l, c_w_m, c_w_m_l, ddzu, ddzu_pres,     &
+          dd2zu, dzu, ddzw, dzw, hyp, inflow_damping_factor, lad, l_grid,      &
+          ptdf_x, ptdf_y, pt_init, q_init, rdf, rdf_sc, sa_init, ug, u_init,   &
+          u_nzb_p1_for_vfc, vg, v_init, v_nzb_p1_for_vfc, w_subs, zu, zw 
 
     REAL, DIMENSION(:,:), ALLOCATABLE ::                                       &
-          c_u, c_v, c_w, dzu_mg, dzw_mg, f1_mg, f2_mg, f3_mg,                  &
-          mean_inflow_profiles, pt_slope_ref, qs, qswst_remote, ts, us, z0,    &
-          flux_s_pt, diss_s_pt, flux_s_e, diss_s_e, flux_s_q, diss_s_q,        &
-          flux_s_sa, diss_s_sa, flux_s_u, flux_s_v, flux_s_w, diss_s_u,        &
-          diss_s_v, diss_s_w, total_2d_o, total_2d_a
+          c_u, c_v, c_w, diss_s_e, diss_s_pt, diss_s_q, diss_s_sa, diss_s_u,   &
+          diss_s_v, diss_s_w, dzu_mg, dzw_mg, flux_s_e, flux_s_pt, flux_s_q,   &
+          flux_s_sa, flux_s_u, flux_s_v, flux_s_w, f1_mg, f2_mg, f3_mg,        &
+          mean_inflow_profiles, pt_slope_ref, qs, qswst_remote, total_2d_a,    &
+          total_2d_o, ts, us, z0, z0h
 
     REAL, DIMENSION(:,:), ALLOCATABLE, TARGET ::                               &
@@ -347 +351 @@
 
     REAL, DIMENSION(:,:,:), ALLOCATABLE ::                                     &
-          canopy_heat_flux, cdc, d, de_dx, de_dy, de_dz, diss, lad_s, lad_u,   &
-          lad_v, lad_w, lai, l_wall, p_loc, sec, sls, tend, u_m_l, u_m_n,      &
-          u_m_r, u_m_s, v_m_l, v_m_n, v_m_r, v_m_s, w_m_l, w_m_n, w_m_r,       &
-          w_m_s, flux_l_pt, diss_l_pt, flux_l_e, diss_l_e, flux_l_q, diss_l_q, &
-          flux_l_sa, diss_l_sa, flux_l_u, flux_l_v, flux_l_w, diss_l_u,        &
-          diss_l_v, diss_l_w
+          canopy_heat_flux, cdc, d, de_dx, de_dy, de_dz, diss, diss_l_e,       &
+          diss_l_pt, diss_l_q, diss_l_sa, diss_l_u, diss_l_v, diss_l_w,        &
+          flux_l_e, flux_l_pt, flux_l_q, flux_l_sa, flux_l_u, flux_l_v,        &
+          flux_l_w, lad_s, lad_u, lad_v, lad_w, lai, l_wall, p_loc, sec, sls,  &
+          tend, u_m_l, u_m_n, u_m_r, u_m_s, v_m_l, v_m_n, v_m_r, v_m_s, w_m_l, &
+          w_m_n, w_m_r, w_m_s
 
     REAL, DIMENSION(:,:,:), ALLOCATABLE, TARGET ::                             &
@@ -388 +392 @@
 
     REAL, DIMENSION(:,:), ALLOCATABLE ::  lwp_av, precipitation_rate_av,       &
-                                          qsws_av, shf_av,ts_av, us_av, z0_av
+                                          qsws_av, shf_av,ts_av, us_av, z0_av, &
+                                          z0h_av
 
     REAL, DIMENSION(:,:,:), ALLOCATABLE, TARGET :: &
@@ -549 +554 @@
                 netcdf_data_format = 2, ngsrb = 2, nsor = 20, &
                 nsor_ini = 100, n_sor, normalizing_region = 0, &
-                nz_do3d = -9999, outflow_damping_width = -1, &
-                pch_index = 0, prt_time_count = 0, recycling_plane, runnr = 0, &
+                nz_do3d = -9999, pch_index = 0, prt_time_count = 0, &
+                recycling_plane, runnr = 0, &
                 skip_do_avs = 0, subdomain_size, terminate_coupled = 0, &
                 terminate_coupled_remote = 0, timestep_count = 0
@@ -582 +587 @@
 
     LOGICAL ::  adjust_mixing_length = .FALSE., avs_output = .FALSE., &
-                bc_lr_cyc =.TRUE., bc_lr_dirrad = .FALSE., &
+                bc_lr_cyc =.TRUE., bc_lr_dirneu = .FALSE., &
+                bc_lr_dirrad = .FALSE., bc_lr_neudir = .FALSE., &
                 bc_lr_raddir = .FALSE., bc_ns_cyc = .TRUE., &
-                bc_ns_dirrad = .FALSE., bc_ns_raddir = .FALSE., &
+                bc_ns_dirneu = .FALSE., bc_ns_dirrad = .FALSE., &
+                bc_ns_neudir = .FALSE., bc_ns_raddir = .FALSE., &
                 call_psolver_at_all_substeps = .TRUE., &
                 cloud_droplets = .FALSE., cloud_physics = .FALSE., &
@@ -659 +666 @@
              f = 0.0, fs = 0.0, g = 9.81, inflow_damping_height = 9999999.9, &
              inflow_damping_width = 9999999.9, kappa = 0.4, km_constant = -1.0,&
-             km_damp_max = -1.0, lad_surface = 0.0,  &
+             lad_surface = 0.0,  &
              leaf_surface_concentration = 0.0, long_filter_factor = 0.0, &
              mask_scale_x = 1.0, mask_scale_y = 1.0, mask_scale_z = 1.0, &
@@ -670 +677 @@
              phi = 55.0, prandtl_number = 1.0, &
              precipitation_amount_interval = 9999999.9, prho_reference, &
+             pt_damping_factor = 0.0, pt_damping_width = 0.0, &
              pt_reference = 9999999.9, pt_slope_offset = 0.0, &
              pt_surface = 300.0, pt_surface_initial_change = 0.0, &
@@ -700 +708 @@
              ups_limit_v = 0.0, ups_limit_w = 0.0, vg_surface = 0.0, &
              v_bulk = 0.0, v_gtrans = 0.0, wall_adjustment_factor = 1.8, &
-             z_max_do2d = -1.0
+             z_max_do2d = -1.0, z0h_factor = 1.0
 
     REAL ::  do2d_xy_last_time(0:1) = -1.0, do2d_xz_last_time(0:1) = -1.0, &
@@ -1057 +1065 @@
                 qs1d, simulated_time_1d = 0.0, time_pr_1d = 0.0, &
                 time_run_control_1d = 0.0, ts1d, us1d, usws1d, usws1d_m, &
-                vsws1d, vsws1d_m, z01d
+                vsws1d, vsws1d_m, z01d, z0h1d