Changeset 1553

Timestamp:

Mar 3, 2015 5:33:54 PM (10 years ago)

Author:

maronga

Message:

further adjustments in land surface model

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• land_surface_model.f90 (modified) (3 diffs)
• package_parin.f90 (modified) (2 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Removed check for missing soil temperature profile as default values were added.
 ! 
 ! Former revisions:
@@ -961 +961 @@
     IF ( land_surface )  THEN
  
-       IF ( ANY(soil_temperature == 9999999.9_wp) )  THEN
-             message_string = '&lsm_par list requires setting'//               &
-                              'of soil_temperature(0:3)'//                     &
-                              '/= 9999999.9'
-             CALL message( 'check_parameters', 'PA0398', 1, 2, 0, 6, 0 )
-       ENDIF   
-
 !
 !--    Dirichlet boundary conditions are required as the surface fluxes are

palm/trunk/SOURCE/land_surface_model.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Improved better treatment of roughness lengths. Added default soil temperature
+! profile
 ! 
 ! Former revisions:
@@ -173 +174 @@
 
     REAL(wp), DIMENSION(nzb_soil:nzt_soil+1) ::   &
-              soil_temperature = 9999999.9_wp !: soil temperature (K)
+              soil_temperature = (/290.0_wp, 287.0_wp, 285.0_wp,  283.0_wp,    &
+                                   283.0_wp /) !: soil temperature (K)
 
 #if defined( __nopointer )
@@ -824 +826 @@
           ENDIF
 
+       ELSE
+
+          IF ( z0_eb == 9999999.9_wp )  THEN
+             z0_eb = roughness_length
+          ENDIF
+          IF ( z0h_eb == 9999999.9_wp )  THEN
+             z0h_eb = z0_eb * z0h_factor
+          ENDIF
+
        ENDIF
 

palm/trunk/SOURCE/package_parin.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Resorting of lsm_par
 ! 
 ! Former revisions:
@@ -178 +178 @@
                                   canopy_resistance_coefficient,               &
                                   conserve_water_content, dewfall,             &
-                                  f_shortwave_incoming,                        & 
+                                  f_shortwave_incoming, field_capacity,        & 
                                   hydraulic_conductivity,                      &
                                   lambda_surface_stable,                       &
                                   lambda_surface_unstable, leaf_area_index,    &
                                   l_vangenuchten, min_canopy_resistance,       &
-                                  min_soil_resistance, field_capacity,         &
-                                  residual_moisture, saturation_moisture,      &
-                                  wilting_point, n_vangenuchten, root_fraction,&
-                                  soil_moisture, soil_temperature, soil_type,  &
-                                  vegetation_coverage, veg_type, zs, z0_eb,    &
-                                  z0h_eb
+                                  min_soil_resistance, n_vangenuchten,         &
+                                  residual_moisture, root_fraction,            &
+                                  saturation_moisture, soil_moisture,          &
+                                  soil_temperature, soil_type,                 &
+                                  vegetation_coverage, veg_type, wilting_point,& 
+                                  zs, z0_eb, z0h_eb