Changeset 4794 for palm

Timestamp:

Nov 24, 2020 10:40:20 AM (4 years ago)

Author:

maronga

Message:

use negative numbers for tree ids and tree types for vegetation patches

Location:

palm/trunk/SCRIPTS

Files:

• palm_csd (modified) (3 diffs)
• palm_csd_files/palm_csd_canopy_generator.py (modified) (2 diffs)

palm/trunk/SCRIPTS/palm_csd

@@ -25 +25 @@
 # -----------------
 # $Id$
+# Removed debug output; assign negative ids for tree patches
+#
+# 4793 2020-11-24 09:48:21Z maronga
 # Added output of tree_type (species or classification). Added tree_id for
 # vegetation patches. Allow for overlapping vegetation with buildings
@@ -1105 +1108 @@
          lai = nc_read_from_file_2d(input_file_lai[ii[i]], 'Band1', domain_x0[i], domain_x1[i], domain_y0[i], domain_y1[i])   
     
-         nc_write_to_file_2d(filename[i], 'patch_height', patch_height, datatypes["tree_data"],'y','x',fillvalues["tree_data"]) 
-         nc_write_attribute(filename[i], 'patch_height', 'long_name', 'tree type')
-         nc_write_attribute(filename[i], 'patch_height', 'units', '')
-         nc_write_attribute(filename[i], 'patch_height', 'res_orig', domain_px[i])  
-         nc_write_attribute(filename[i], 'patch_height', 'coordinates', 'E_UTM N_UTM lon lat') 
-         nc_write_attribute(filename[i], 'patch_height', 'grid_mapping', 'E_UTM N_UTM lon lat')      
 
 #        Determine all pixels that do not already have an LAD but which are high vegetation to a dummy value of 1.0 and remove all other pixels
@@ -1153 +1150 @@
             lad_patch, patch_id, patch_types, patch_nz, status = process_patch(domain_dz[i],patch_height,vegetation_type,max(zlad),lai_high,settings_lai_alpha,settings_lai_beta)
 
-#           Increase the patch ids by the maximum id for street trees to avoid double ids
-            max_id = max(tree_id.flatten())
-            patch_id = np.where( patch_id != fillvalues["tree_id"], patch_id+max_id, patch_id)
+#           Set negative ids for patches
+            patch_id = np.where( patch_id != fillvalues["tree_id"], -patch_id, patch_id)
 
 #           2D loop in order to avoid memory problems with large arrays

palm/trunk/SCRIPTS/palm_csd_files/palm_csd_canopy_generator.py

@@ -25 +25 @@
 # -----------------
 # $Id: palm_csd_canopy_generator.py 3773 2019-03-01 08:56:57Z maronga $
+# tree_type for patches is now considered by negative values accrordng to the
+# vegetation_type classification
+#
+# 3773 2019-03-01 08:56:57Z maronga
 # Bugfix: do not allow BAD < 0, revised treatment of tree trunks
 # 
@@ -550 +554 @@
       vegetation_type_int = vegetation_type.astype(int)
       patch_id[k,:,:]   = np.where((patch_id_2d != 0) & (lad_loc[k,:,:] != fillvalues["tree_data"]), patch_id_2d, fillvalues["tree_id"])
-      patch_type[k,:,:] = np.where((patch_id_2d != 0) & (lad_loc[k,:,:] != fillvalues["tree_data"]), np.byte(100+vegetation_type), fillvalues["tree_type"])
+      patch_type[k,:,:] = np.where((patch_id_2d != 0) & (lad_loc[k,:,:] != fillvalues["tree_data"]), np.byte(-vegetation_type), fillvalues["tree_type"])
 
    return lad_loc, patch_id, patch_type, nz, 0