Changeset 4490 for palm

Timestamp:

Apr 10, 2020 5:32:45 AM (4 years ago)

Author:

maronga

Message:

bugfix in palm_csd

File:

• palm/trunk/SCRIPTS/palm_csd (modified) (2 diffs)

palm/trunk/SCRIPTS/palm_csd

@@ -25 +25 @@
 # -----------------
 # $Id$
+# Bugfix: call of canopy generator was not made if tree heights were only
+# available via patch_height, but not in tree_height
+# 
+# 4481 2020-03-31 18:55:54Z maronga
 # Bugfix: green roofs were assigned to all available roofs when switched on
 # 
@@ -1001 +1005 @@
       max_patch_height = max(patch_height.flatten())
       
-      if ( (max_tree_height != fillvalues["tree_data"]) | (max_patch_height == fillvalues["tree_data"]) ):
+#     Call canopy generator for single trees only if there is any tree height available in the domain.
+#     This does not guarantee that there are street trees that can be processed. This is checked in the
+#     canopy generator.
+      if ( (max_tree_height != fillvalues["tree_data"]) | (max_patch_height != fillvalues["tree_data"]) ):
 
          lad, bad, tree_ids, zlad = generate_single_tree_lad(x,y,domain_dz[i],max_tree_height,max_patch_height,tree_type,tree_height,tree_crown_diameter,tree_trunk_diameter,lai,settings_season,fillvalues["tree_data"])