From e0c9e8302026ab78866775d922a9bd8579ea62ee Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Mon, 13 May 2024 10:42:43 +0200 Subject: [PATCH] Update tree column names --- cea/resources/radiation/geometry_generator.py | 2 +- cea/resources/radiation/main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cea/resources/radiation/geometry_generator.py b/cea/resources/radiation/geometry_generator.py index d9224b3b9..49ec4d09b 100644 --- a/cea/resources/radiation/geometry_generator.py +++ b/cea/resources/radiation/geometry_generator.py @@ -590,7 +590,7 @@ def tree_geometry_generator(tree_df, terrain_raster): surfaces = [ fetch.faces_frm_solid(result) for result in pool.starmap( process_geometries, ( - (geom, elevation_map, (0, 1), z) for geom, z in zip(tree_df['geometry'], tree_df['Z']) + (geom, elevation_map, (0, 1), z) for geom, z in zip(tree_df['geometry'], tree_df['height_tc']) ) ) ] diff --git a/cea/resources/radiation/main.py b/cea/resources/radiation/main.py index a91e1d7d1..d49c7d84e 100644 --- a/cea/resources/radiation/main.py +++ b/cea/resources/radiation/main.py @@ -174,7 +174,7 @@ def main(config): trees_df = gpd.GeoDataFrame.from_file(trees_path) tree_surfaces = geometry_generator.tree_geometry_generator(trees_df, terrain_raster) print("Creating radiance shading file") - tree_lad = trees_df["density"] + tree_lad = trees_df["density_la"] cea_daysim.create_radiance_shading(tree_surfaces, tree_lad) print("Converting files for DAYSIM")