Changeset 1826 for palm/trunk/SOURCE/package_parin.f90

Timestamp:

Apr 7, 2016 12:01:39 PM (8 years ago)

Author:

maronga

Message:

further modularization of radiation model and plant canopy model

File:

• palm/trunk/SOURCE/package_parin.f90 (modified) (7 diffs)

palm/trunk/SOURCE/package_parin.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-!
+! Reading of &radiation_par moved to radiation_model_mod.
+! Reading of &canopy_par moved to plant_canopy_model_mod.
 ! 
 ! Former revisions:
@@ -30 +31 @@
 !
 ! 1817 2016-04-06 15:44:20Z maronga
-! Reading of &lsmpar moved to land_surface_model_mod.
+! Reading of &lsm_par moved to land_surface_model_mod.
 ! 
 ! 1788 2016-03-10 11:01:04Z maronga
@@ -152 +153 @@
                vertical_particle_advection, write_particle_statistics
 
-    USE plant_canopy_model_mod,                                                &
-        ONLY:  alpha_lad, beta_lad, calc_beta_lad_profile, canopy_drag_coeff,  &
-               canopy_mode, cthf, lad_surface,                                 &
-               lad_vertical_gradient, lad_vertical_gradient_level, lai_beta,   &
-               leaf_scalar_exch_coeff, leaf_surface_conc, pch_index,           &
-               plant_canopy
-
-    USE radiation_model_mod,                                                   &
-        ONLY: albedo, albedo_type, albedo_lw_dif, albedo_lw_dir, albedo_sw_dif,&
-              albedo_sw_dir, constant_albedo, day_init, dt_radiation,          &
-              emissivity, lambda, lw_radiation, net_radiation, radiation,      &
-              radiation_scheme, skip_time_do_radiation, sw_radiation,          &
-              time_utc_init, unscheduled_radiation_calls
-                
-
     USE spectrum,                                                              &
         ONLY:  comp_spectra_level, data_output_sp, plot_spectra_level,         &
@@ -175 +161 @@
     CHARACTER (LEN=80) ::  line  !<
 
-    NAMELIST /canopy_par/         alpha_lad, beta_lad, canopy_drag_coeff,      &
-                                  canopy_mode, cthf,                           &
-                                  lad_surface,                                 & 
-                                  lad_vertical_gradient,                       &
-                                  lad_vertical_gradient_level,                 &
-                                  lai_beta,                                    &
-                                  leaf_scalar_exch_coeff,                      &
-                                  leaf_surface_conc, pch_index
+
 
     NAMELIST /dvrp_graphics_par/  clip_dvrp_l, clip_dvrp_n, clip_dvrp_r,       &
@@ -220 +199 @@
                                   write_particle_statistics
 
-    NAMELIST /radiation_par/      albedo, albedo_type, albedo_lw_dir,          &
-                                  albedo_lw_dif, albedo_sw_dir, albedo_sw_dif, &
-                                  constant_albedo, day_init, dt_radiation,     &
-                                  lambda, lw_radiation, net_radiation,         &
-                                  radiation_scheme, skip_time_do_radiation,    &
-                                  sw_radiation, time_utc_init,                 &
-                                  unscheduled_radiation_calls
-
     NAMELIST /spectra_par/        averaging_interval_sp, comp_spectra_level,   &
                                   data_output_sp, dt_dosp, plot_spectra_level, &
@@ -237 +208 @@
 !-- file at this line. Do the same for each optionally used package.
     line = ' '
-
-!
-!-- Try to find canopy package
-    REWIND ( 11 )
-    line = ' '
-    DO   WHILE ( INDEX( line, '&canopy_par' ) == 0 )
-       READ ( 11, '(A)', END=10 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!
-!-- Read user-defined namelist
-    READ ( 11, canopy_par )
-
-!
-!-- Set flag that indicates that canopy model is switched on
-    plant_canopy = .TRUE.
-
-!
-!-- Set flag that indicates that the lad-profile shall be calculated by using
-!-- a beta probability density function
-    IF ( alpha_lad /= 9999999.9_wp  .AND.  beta_lad /= 9999999.9_wp )          &
-       calc_beta_lad_profile = .TRUE.
-
- 10 CONTINUE
 
 
@@ -317 +263 @@
 
 
-!
-!-- Try to find radiation package
-    REWIND ( 11 )
-    line = ' '
-    DO   WHILE ( INDEX( line, '&radiation_par' ) == 0 )
-       READ ( 11, '(A)', END=51 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!
-!-- Read user-defined namelist
-    READ ( 11, radiation_par )
-
-!
-!-- Set flag that indicates that the radiation scheme is switched on
-    radiation = .TRUE.
-
- 51 CONTINUE