Merge branch 'master' of transfer.hft-stuttgart.de:circulargreensimcity/circulargreensimcity

enrich-citygml-with-greenarea/src/main/java/de/hft/stuttgart/citygml/green/osm/TreeUtils.java

@@ -13,6 +13,7 @@ import org.locationtech.jts.geom.Polygon;
 import org.xmlobjects.gml.model.basictypes.Code;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurface;
 import org.xmlobjects.gml.model.geometry.aggregates.MultiSurfaceProperty;
+import org.xmlobjects.gml.model.measures.Length;
 
 public class TreeUtils {
 
@@ -96,6 +97,8 @@ public class TreeUtils {
 					crownRadius, crownHeight);
 			SolitaryVegetationObject cover = new SolitaryVegetationObject();
 			cover.setSpecies(new Code(tree.getType()));
+			cover.setCrownDiameter(new Length(crownRadius * 2));
+			cover.setHeight(new Length(trunkHeight + crownHeight));
 			cover.setId(UUID.randomUUID().toString());
 			cover.setLod2MultiSurface(new MultiSurfaceProperty(generatedTree));
 			cityModel.getCityObjectMembers().add(new AbstractCityObjectProperty(cover));

python_scripts/flow_chart/cgsc.dot

+digraph G {
+    ratio="fill";
+    size="10,6!";
+    margin=0;
+    dpi=180;
+    rankdir="LR";
+    graph [fontname = "Ubuntu"];
+    node [fontname = "Ubuntu"];
+    edge [fontname = "Ubuntu"];
+    node [shape=ellipse];
+    compound=true;
+
+    citygml [label="CityGML", shape=box3d];
+    trees [label="Trees.shp", shape=note];
+    floors [label="Floors.csv", shape=note];
+    dreso [label="DreSo.csv", shape=note];
+    lib [label="Physics.lib", shape=component];
+    weather [label="Weather.csv", shape=component];
+    simstadt [label="SimStadt", style=filled, shape=cylinder];
+
+
+
+    citygml -> simstadt;
+    trees -> citygml [label="add-trees.py"];
+    dreso -> citygml [label="?"];
+    floors -> citygml [label="add-floor.py"];
+    lib -> simstadt [label="window_ratio.py"];
+    weather -> simstadt;
+
+    shp [label="Results.shp", shape=note];
+
+    subgraph cluster_1 {
+      label="Demands";
+      node [shape=note];
+      csv1 [label="Heat.csv"];
+      csv2 [label="Cooling.csv"];
+      csv3 [label="Water.csv"];
+      color=lightgrey;
+    }
+
+    optimizer [label="TUM optimizer.py", style=filled, shape=cylinder];
+    gis [label="ArcGIS", style=filled, shape=cylinder];
+
+    csv3 -> optimizer [ltail=cluster_1];
+    csv3 -> gis [ltail=cluster_1];
+
+    simstadt -> shp;
+    simstadt -> csv1;
+    simstadt -> csv2;
+    simstadt -> csv3;
+    shp -> gis;
+
+
+
+    optimizer -> lib [style=dotted];
+    optimizer -> floors [style=dotted];
+    gis -> trees [style=dotted];
+
+    { rank=min; floors; trees; dreso}
+    { rank=max; gis; optimizer}
+}

python_scripts/run_simstadt_from_python/run_simstadt_workflow.py

@@ -150,7 +150,7 @@ def run_simstadt(simstadt_path: Path, workflow_path:Path , name: str):
     os.chdir(simstadt_path)
     try:
         logging.info("\n# Launching %s:", name)
-        result = subprocess.run(' '.join([simstadt_script(), str(workflow_path)]),
+        result = subprocess.run([simstadt_script(), str(workflow_path)],
                                 text=True,
                                 capture_output=True,
                                 check=True

python_scripts/run_simstadt_from_python/variable_window_ratio.py

@@ -12,6 +12,7 @@ logging.getLogger().setLevel(logging.WARN)
 #######################################################################
 # User params
 SIMSTADT2_GLOB = 'Desktop/SimStadt2_0.*/'
+# Check env variable?
 REPO_PATH = Path.home() / 'git' / 'simstadt2' / 'TestRepository'
 PROJECT_NAME = 'Gruenbuehl'
 CITYGML = 'Gruenbuehl_LOD2_ALKIS_1010.gml'
@@ -62,7 +63,7 @@ def parse_library(library_path: Path) -> et.ElementTree:
     return et.parse(library_path)
 
 
-def set_custom_window_ratio(tree: et.ElementTree, window_ratio_node: float, export_path: Path):
+def set_custom_window_ratio(window_ratio: float, tree: et.ElementTree, window_ratio_node: float, export_path: Path):
     root = tree.getroot()
     root.find('name', NAMESPACE).text = f"Custom Physics Library with Window Ratio : {window_ratio}"
     for surface in SURFACES:
@@ -90,14 +91,15 @@ def parse_results(window_ratio, heat_demand_csv):
             'CoolingDemand': cooling_demand_MWh}
 
 
-workflow_path, physics_processor_step = copy_workflow_from_template(TEMPLATE_NAME, PROJECT_PATH)
-custom_library_path = set_custom_library(physics_processor_step)
-lib_tree = parse_library(custom_library_path)
+def main():
+    workflow_path, physics_processor_step = copy_workflow_from_template(TEMPLATE_NAME, PROJECT_PATH)
+    custom_library_path = set_custom_library(physics_processor_step)
+    lib_tree = parse_library(custom_library_path)
 
-all_results = []
-for window_ratio in WINDOW_RATIOS:
+    all_results = []
+    for window_ratio in WINDOW_RATIOS:
         # TODO: Status quo too
-    set_custom_window_ratio(lib_tree, window_ratio, custom_library_path)
+        set_custom_window_ratio(window_ratio, lib_tree, window_ratio, custom_library_path)
 
         output_files = run_workflow(find_simstadt(SIMSTADT2_GLOB), workflow_path, [CITYGML])
 
@@ -107,9 +109,13 @@ for window_ratio in WINDOW_RATIOS:
 
         all_results.append(parse_results(window_ratio, heat_demand_csv))
 
-df = pd.DataFrame(all_results).set_index('WindowRatio')
-print(df)
-df.plot()
-plt.ylabel('MWh')
-plt.title("Demands depending on Window Ratio")
-plt.show()
+    df = pd.DataFrame(all_results).set_index('WindowRatio')
+    print(df)
+    df.plot()
+    plt.ylabel('MWh')
+    plt.title("Demands depending on Window Ratio")
+    plt.show()
+
+
+if __name__ == "__main__":
+    main()