Downselect geojson buildings to only include buildings from sys-params file

.pre-commit-config.yaml

@@ -26,14 +26,14 @@ repos:
       # - id: check-hooks-apply # Fails if a hook doesn't apply to any file
   # Run the Ruff linter
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.3
+    rev: v0.3.0
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
         types_or: [python, pyi, jupyter]
   # Run the Ruff formatter
   # https://docs.astral.sh/ruff/integrations/#pre-commit
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.3
+    rev: v0.3.0
     hooks:
       - id: ruff-format

demos/sdk_output_skeleton_1_ghe/run/baseline_scenario/ghe_dir/sys_params.json

@@ -1,7 +1,7 @@
 {
   "buildings": [
     {
-      "geojson_id": "2",
+      "geojson_id": "8",
       "load_model": "time_series",
       "load_model_parameters": {
         "time_series": {
@@ -43,7 +43,7 @@
       }
     },
     {
-      "geojson_id": "5",
+      "geojson_id": "9",
       "load_model": "time_series",
       "load_model_parameters": {
         "time_series": {

pyproject.toml

@@ -30,7 +30,7 @@ classifiers = [
     ]
 dependencies = [
   'click ~= 8.1',
-  'ghedesigner ~= 1.3',
+  'ghedesigner ~= 1.4',
   'pandas ~= 2.1',
   "rich ~= 13.6",
 ]
@@ -40,7 +40,7 @@ dev = [
     "pytest >= 6.0",
     "pytest-cov ~= 4.1",
     "pre-commit ~= 3.5",
-    "ruff ~= 0.1",
+    "ruff ~= 0.3",
     "jupyterlab ~= 4.0",
 ]
 

thermalnetwork/ground_heat_exchanger.py

@@ -55,6 +55,7 @@ def ghe_size(self, total_space_loads, output_path: Path) -> float:
             min_eft=self.json_data["design"]["min_eft"],
             max_height=self.json_data["geometric_constraints"]["max_height"],
             min_height=self.json_data["geometric_constraints"]["min_height"],
+            continue_if_design_unmet=True,
         )
         ghe.set_ground_loads_from_hourly_list(self.json_data["loads"]["ground_loads"])
         ghe.set_geometry_constraints_rectangle(

thermalnetwork/network.py

@@ -510,7 +510,29 @@ def run_sizer_from_cli_worker(
         return 1
 
     system_parameters_data = json.loads(system_parameter_path.read_text())
-    # print(f"system_parameters_data: {system_parameters_data}")
+
+    # Downselect the buildings in the geojson that are in the system parameters file
+
+    # List the building ids from the system parameters file
+    building_id_list = []
+    for building in system_parameters_data["buildings"]:
+        building_id_list.append(building["geojson_id"])
+
+    # Select the buildings in the geojson that are in the system parameters file
+    building_features = [
+        feature
+        for feature in geojson_data["features"]
+        if feature["properties"]["type"] == "Building" and feature["properties"]["id"] in building_id_list
+    ]
+
+    # Rebuild the geojson data using only the buildings in the system parameters file
+    # Put in everything that isn't a building
+    geojson_data["features"] = [
+        feature for feature in geojson_data["features"] if feature["properties"]["type"] != "Building"
+    ]
+    # Only add the buildings in the system parameters file back to the geojson data
+    # This has the effect of removing buildings that are not in the system parameters file
+    geojson_data["features"].extend(building_features)
 
     # load all input data
     sys_param_version: int = system_parameters_data["district_system"]["fifth_generation"]["ghe_parameters"]["version"]