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

Timestamp:

Apr 6, 2016 3:44:20 PM (8 years ago)

Author:

maronga

Message:

further modularization of land surface model

File:

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

palm/trunk/SOURCE/package_parin.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Reading of &lsmpar moved to land_surface_model_mod.
 ! 
 ! Former revisions:
@@ -129 +129 @@
                vc_alpha, vc_gradient_normals, vc_mode, vc_size_x, vc_size_y,   &
                vc_size_z
-
-    USE land_surface_model_mod,                                                &
-        ONLY: alpha_vangenuchten, c_surface, canopy_resistance_coefficient,    &
-              conserve_water_content, field_capacity,                          &
-              f_shortwave_incoming, hydraulic_conductivity,                    &
-              lambda_surface_stable, lambda_surface_unstable, leaf_area_index, &
-              land_surface, l_vangenuchten, min_canopy_resistance,             &
-              min_soil_resistance, n_vangenuchten, pave_heat_capacity,         &
-              pave_depth, pave_heat_conductivity, residual_moisture,           &
-              root_fraction, saturation_moisture, wilting_point,               &
-              skip_time_do_lsm, soil_moisture, soil_temperature, soil_type,    &
-              vegetation_coverage, veg_type, zs, z0_eb, z0h_eb, z0q_eb
 
     USE kinds
@@ -206 +194 @@
                                   vc_gradient_normals, vc_mode, vc_size_x,     &
                                   vc_size_y, vc_size_z
-
-    NAMELIST /lsm_par/            alpha_vangenuchten, c_surface,               &
-                                  canopy_resistance_coefficient,               &
-                                  conserve_water_content,                      &
-                                  f_shortwave_incoming, field_capacity,        & 
-                                  hydraulic_conductivity,                      &
-                                  lambda_surface_stable,                       &
-                                  lambda_surface_unstable, leaf_area_index,    &
-                                  l_vangenuchten, min_canopy_resistance,       &
-                                  min_soil_resistance, n_vangenuchten,         &
-                                  pave_depth, pave_heat_capacity,              &
-                                  pave_heat_conductivity,                      &
-                                  residual_moisture, root_fraction,            &
-                                  saturation_moisture, skip_time_do_lsm,       &
-                                  soil_moisture, soil_temperature, soil_type,  &
-                                  vegetation_coverage, veg_type, wilting_point,& 
-                                  zs, z0_eb, z0h_eb, z0q_eb
-
-
 
     NAMELIST /particles_par/      alloc_factor, bc_par_b, bc_par_lr,           &
@@ -345 +314 @@
  40 CONTINUE
 
-!
-!-- Try to find land surface model package
-    REWIND ( 11 )
-    line = ' '
-    DO   WHILE ( INDEX( line, '&lsm_par' ) == 0 )
-       READ ( 11, '(A)', END=50 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!
-!-- Read user-defined namelist
-    READ ( 11, lsm_par )
-
-!
-!-- Set flag that indicates that the land surface model is switched on
-    land_surface = .TRUE.
-
- 50 CONTINUE
 
 !