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

Timestamp:

Oct 26, 2015 4:17:44 PM (9 years ago)

Author:

maronga

Message:

various bugfixes and modifications of the atmosphere-land-surface-radiation interaction. Completely re-written routine to calculate surface fluxes (surface_layer_fluxes.f90) that replaces prandtl_fluxes. Minor formatting corrections and renamings

File:

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

palm/trunk/SOURCE/modules.f90

@@ -14 +14 @@
 ! PALM. If not, see <http://www.gnu.org/licenses/>.
 !
-! Copyright 1997-2014 Leibniz Universitaet Hannover
+! Copyright 1997-2015 Leibniz Universitaet Hannover
 !--------------------------------------------------------------------------------!
 !
 ! Current revisions:
 ! ------------------
-! 
+! Renamed Obukhov length. Added ol, removed rif. Increased number of profiles 
+! (pr_palm). Changed default values for dissipation_1d to 'detering' and 
+! (mixing_length_1d to 'blackadar'. Added most_method. rif_min and rif_max
+! renamed to zeta_min and zeta_max and new values assigned.
 ! 
 ! Former revisions:
@@ -300 +303 @@
 !
 !
+!------------------------------------------------------------------------------!
+! Description:
+! ------------
+!> Definition of all variables
+!>
+!> @todo Add description for each variable
+!------------------------------------------------------------------------------!
+
+
+!------------------------------------------------------------------------------!
 ! Description:
 ! ------------
@@ -338 +351 @@
           flux_s_e, flux_s_nr, flux_s_pt, flux_s_q, flux_s_qr, flux_s_sa,      &
           flux_s_u, flux_s_v, flux_s_w, f1_mg, f2_mg, f3_mg,                   &
-          mean_inflow_profiles, nrs, nrsws, nrswst, ptnudge, pt_slope_ref,     &
+          mean_inflow_profiles, nrs, nrsws, nrswst,                            &
+          ol,                                                                  & !< Obukhov length
+          ptnudge, pt_slope_ref,                                               &
           qnudge, qs, qsws, qswst, qswst_remote, qrs, qrsws, qrswst, rif,      &
           saswsb, saswst, shf, tnudge, td_lsa_lpt, td_lsa_q, td_sub_lpt,       &
@@ -390 +405 @@
     USE kinds
 
-    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::  lwp_av, precipitation_rate_av,   &
-                                          qsws_av, shf_av,ts_av, us_av, z0_av, &
-                                          z0h_av
+    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::  lwp_av,                & !> Avg. liquid water path
+                                              precipitation_rate_av, & !> Avg. of precipitation rate
+                                              ol_av,                 & !> Avg. of Obukhov length
+                                              qsws_av,               & !> Avg. of surface moisture flux
+                                              shf_av,                & !> Avg. of surface heat flux
+                                              ts_av,                 & !> Avg. of characteristic temperature scale
+                                              us_av,                 & !> Avg. of friction velocity
+                                              z0_av,                 & !> Avg. of roughness length for momentum
+                                              z0h_av                   !> Avg. of roughness length for heat and moisture
 
     REAL(wp), DIMENSION(:,:,:), ALLOCATABLE, TARGET ::                         &
@@ -541 +562 @@
     CHARACTER (LEN=2)    ::  coupling_char = ''
     CHARACTER (LEN=5)    ::  write_binary = 'false'
-    CHARACTER (LEN=8)    ::  run_date, run_time
+    CHARACTER (LEN=8)    ::  most_method = 'lookup', & !< NAMELIST parameter defining method to be used to calculate Okukhov length, 
+                             run_date,               & !< 
+                             run_time                  !< 
     CHARACTER (LEN=9)    ::  simulated_time_chr
     CHARACTER (LEN=11)   ::  topography_grid_convention = ' '
@@ -563 +586 @@
                              coupling_mode = 'uncoupled', &
                              coupling_mode_remote = 'uncoupled', &
-                             dissipation_1d = 'as_in_3d_model', &
+                             dissipation_1d = 'detering', &
                              fft_method = 'system-specific', &
-                             mixing_length_1d = 'as_in_3d_model', &
+                             mixing_length_1d = 'blackadar', &
                              random_generator = 'numerical-recipes', &
                              reference_state = 'initial_profile', &
@@ -653 +676 @@
                 cloud_top_radiation = .FALSE., &
                 conserve_volume_flow = .FALSE., constant_diffusion = .FALSE., &
+                constant_flux_layer = .TRUE., &
                 constant_heatflux = .TRUE., constant_top_heatflux = .TRUE., &
                 constant_top_momentumflux = .FALSE., &
@@ -679 +703 @@
                 outflow_l = .FALSE., outflow_n = .FALSE., outflow_r = .FALSE., &
                 outflow_s = .FALSE., passive_scalar = .FALSE., &
-                prandtl_layer = .TRUE., &
                 precipitation = .FALSE., &
                 random_heatflux = .FALSE., recycling_yshift = .FALSE.,&
@@ -745 +768 @@
                  recycling_width = 9999999.9_wp, residual_limit = 1.0E-4_wp, &
                  restart_time = 9999999.9_wp, rho_reference, rho_surface, &
-                 rif_max = 1.0_wp, rif_min = -5.0_wp, roughness_length = 0.1_wp, &
+                 roughness_length = 0.1_wp, &
                  sa_surface = 35.0_wp, &
                  simulated_time = 0.0_wp, simulated_time_at_begin, sin_alpha_surface, &
@@ -768 +791 @@
                  vg_surface = 0.0_wp, vpt_reference = 9999999.9_wp, &
                  v_bulk = 0.0_wp, v_gtrans = 0.0_wp, wall_adjustment_factor = 1.8_wp, &
+                 zeta_max = 20.0_wp,    & !< Maximum value of zeta = z/L
+                 zeta_min = -9990.0_wp, & !< Minimum value of zeta = z/L
                  z_max_do2d = -1.0_wp, z0h_factor = 1.0_wp
 
@@ -1149 +1174 @@
              'wpt          ', 'pt(0)        ', 'pt(zp)       ',                &
              'w"u"0        ', 'w"v"0        ', 'w"q"0        ',                &
-             'mo_L         ', 'q*           ',                                 &
+             'ol           ', 'q*           ',                                 &
              ( 'unknown      ', i9 = 1, dots_max-23 ) /)
 
@@ -1429 +1454 @@
 
     CHARACTER (LEN=40) ::  region(0:9)
-    INTEGER(iwp) ::  pr_palm = 120, statistic_regions = 0
+    INTEGER(iwp) ::  pr_palm = 130, statistic_regions = 0
     INTEGER(iwp) ::  u_max_ijk(3) = -1, v_max_ijk(3) = -1, w_max_ijk(3) = -1
     LOGICAL ::  flow_statistics_called = .FALSE.