Changeset 4021 for palm

Timestamp:

Jun 12, 2019 6:33:33 AM (5 years ago)

Author:

maronga

Message:

minor changes in palm_csd

Location:

palm/trunk/SCRIPTS/palm_csd_files

Files:

• palm_csd_canopy_generator.py (modified) (6 diffs)
• palm_csd_tools.py (modified) (2 diffs)

palm/trunk/SCRIPTS/palm_csd_files/palm_csd_canopy_generator.py

@@ -20 +20 @@
 # Current revisions:
 # -----------------
-# 
+# Added support for tree shape
 # 
 # Former revisions:
@@ -79 +79 @@
                tree_id_counter = tree_id_counter + 1
 #               print("   Processing tree No " +  str(tree_id_counter) + " ...", end="")
-               lad_loc, bad_loc, x_loc, y_loc, z_loc, status = process_single_tree(dx,dz,tree_type[j,i],tree_height[j,i],tree_lai[j,i],tree_dia[j,i],trunk_dia[j,i],season)
+               lad_loc, bad_loc, x_loc, y_loc, z_loc, status = process_single_tree(dx,dz,tree_type[j,i],fill,tree_height[j,i],tree_lai[j,i],tree_dia[j,i],trunk_dia[j,i],season)
                if ( np.any(lad_loc) != fill ):
  
@@ -116 +116 @@
 
 
-def process_single_tree(dx,dz,tree_type,tree_height,tree_lai,tree_dia,trunk_dia,season):
+def process_single_tree(dx,dz,tree_type,tree_shape,tree_height,tree_lai,tree_dia,trunk_dia,season):
 
 #  Set some parameters
@@ -236 +236 @@
       tree_type = int(tree_type)
 
+   if ( tree_shape == fillvalues["tree_data"] ):
+      tree_shape = default_trees[tree_type].shape
+
    if ( tree_height == fillvalues["tree_data"] ):
       tree_height = default_trees[tree_type].height
@@ -254 +257 @@
  
 #  Assign values that are not defined as user input from lookup table
-   tree_shape          = default_trees[tree_type].shape
    tree_ratio          = default_trees[tree_type].ratio
    lad_max_height      = default_trees[tree_type].lad_max_height
@@ -453 +455 @@
 
 
-#  Dreate BAD array and populate
-   bad_loc = np.where(lad_loc != fillvalues["tree_data"],lad_loc*0.01,lad_loc)
+#  Create BAD array and populate. TODO: revise as low LAD inside the foliage does not result in low BAD values.
+   bad_loc = np.where(lad_loc != fillvalues["tree_data"],(1.0 - lad_loc)*0.1,lad_loc)
    
 

palm/trunk/SCRIPTS/palm_csd_files/palm_csd_tools.py

@@ -20 +20 @@
 # Current revisions:
 # -----------------
-# 
+# Bugfix: missing conversion to integer
+#
 # 
 # Former revisions:
 # -----------------
 # $Id: palm_csd_tools.py 3773 2019-03-01 08:56:57Z maronga $
-# Unspecificed changes
+# Unspecified changes
 # 
 # 3726 2019-02-07 18:22:49Z maronga
@@ -125 +126 @@
          for m in range(0,len(y)-1):
             if array_2d[m,l] != fill:
-               k_min = max( int(array_2d[m,l] - width)/dz, 0 )
+               k_min = max( int((array_2d[m,l] - width)/dz), 0 )
                k_max = int(round(array_2d[m,l]/dz))
                array_3d[k_min:k_max+1,m,l] = 1