Changeset 3349 for palm/trunk

Timestamp:

Oct 15, 2018 4:39:41 PM (6 years ago)

Author:

suehring

Message:

Bugfix in initialization of soil properties from dynamic input file

Location:

palm/trunk/SOURCE

Files:

• land_surface_model_mod.f90 (modified) (4 diffs)
• synthetic_turbulence_generator_mod.f90 (modified) (1 diff)

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in initialization of soil properties from dynamic input file
+! 
+! 3347 2018-10-15 14:21:08Z suehring
 ! Assign real value instead of integer
 ! 
@@ -2757 +2760 @@
                    surf_lsm_v(l)%building_covered(m) = .FALSE.
 !
-!--                      Wall grid point is building-covered. This case, set 
-!--                      flag indicating that surface properties are initialized 
-!--                      from neighboring reference grid point, which is not 
-!--                      building_covered. 
+!--                Wall grid point is building-covered. This case, set 
+!--                flag indicating that surface properties are initialized 
+!--                from neighboring reference grid point, which is not 
+!--                building_covered. 
                    IF ( building_type_f%from_file )  THEN
                       i = surf_lsm_v(l)%i(m)
@@ -4356 +4359 @@
                 DO  l = 0, 3
                    DO  m = 1, surf_lsm_v(l)%ns
-                      i = surf_lsm_v(l)%i(m) + MERGE( 0, surf_lsm_v(l)%ioff,   &
-                                             surf_lsm_v(l)%building_covered(m) ) 
-                      j = surf_lsm_v(l)%j(m) + MERGE( 0, surf_lsm_v(l)%joff,   &
-                                             surf_lsm_v(l)%building_covered(m) ) 
+!
+!--                   Note, in contrast to the static input data the dynamic
+!--                   input do not need to be checked whether a grid point
+!--                   is building covered. This is because soil data in the
+!--                   dynamic input is provided for the whole domain.  
+                      i = surf_lsm_v(l)%i(m)
+                      j = surf_lsm_v(l)%j(m)
 
                       IF ( init_3d%msoil_3d(0,j,i) /= init_3d%fill_msoil )     &
@@ -4417 +4423 @@
                 DO  l = 0, 3
                    DO  m = 1, surf_lsm_v(l)%ns
-                      i = surf_lsm_v(l)%i(m) + MERGE( 0, surf_lsm_v(l)%ioff,   &
-                                                surf_lsm_v(l)%building_covered(m) ) 
-                      j = surf_lsm_v(l)%j(m) + MERGE( 0, surf_lsm_v(l)%joff,   &
-                                                surf_lsm_v(l)%building_covered(m) ) 
+!
+!--                   Note, in contrast to the static input data the dynamic
+!--                   input do not need to be checked whether a grid point
+!--                   is building covered. This is because soil data in the
+!--                   dynamic input is provided for the whole domain.  
+                      i = surf_lsm_v(l)%i(m)
+                      j = surf_lsm_v(l)%j(m)
 
                       IF ( init_3d%tsoil_3d(0,j,i) /= init_3d%fill_tsoil )     &

palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! Fix for format descriptor
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Fix for format descriptor
+! 
+! 3348 2018-10-15 14:30:51Z suehring
 ! - Revise structure of init routine
 ! - introduce new parameters to skip STG for some timesteps