Merge pull request #270 from urbanopt/uo-resstock_connection

Added UO-ResStock connection variable to the site properties schema
urbanopt · Jun 25, 2024 · 220c594 · 220c594
2 parents adcaf19 + 3d3b721
commit 220c594
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/lib/urbanopt/geojson/geo_file.rb b/lib/urbanopt/geojson/geo_file.rb
@@ -196,7 +196,10 @@ def merge_site_properties(feature)
           { site: :electricity_emissions_annual_historical_subregion, feature: :electricity_emissions_annual_historical_subregion },
           { site: :electricity_emissions_future_year, feature: :electricity_emissions_future_year },
           { site: :electricity_emissions_hourly_historical_year, feature: :electricity_emissions_hourly_historical_year },
-          { site: :electricity_emissions_annual_historical_year, feature: :electricity_emissions_annual_historical_year }
+          { site: :electricity_emissions_annual_historical_year, feature: :electricity_emissions_annual_historical_year },
+          { site: :characterize_residential_buildings_from_buildstock_csv, feature: :characterize_residential_buildings_from_buildstock_csv },
+          { site: :resstock_buildstock_csv_path, feature: :resstock_buildstock_csv_path },
+          { site: :uo_buildstock_mapping_csv_path, feature: :uo_buildstock_mapping_csv_path }
         ]
 
         add_props.each do |prop|

diff --git a/lib/urbanopt/geojson/schema/building_properties.json b/lib/urbanopt/geojson/schema/building_properties.json
@@ -283,6 +283,18 @@
 		"ev_curtailment_frac": {
 			"description": "Fraction between 0 and 1 that denotes curtailment of EV charging load to better align EV charging with expected energy production from a solar PV system",
 			"type": "number"
+		},
+		"characterize_residential_buildings_from_buildstock_csv":{
+		"description" : "Enable UO and ResStock connection to characterize residential buildings by matching them (and their properties) with building from the BuildStock CSV. Optional for residential buildings.",
+		"type": "boolean"
+		},
+		"resstock_buildstock_csv_path":{
+		"description" : "Path to the buildstock CSV that the users want to sample from to find the closest match to their UO residential buildings features. Optional for residential buildings.",
+		"type": "string"
+		},
+		"uo_buildstock_mapping_csv_path":{
+			"description" : "Path to the uo_buildstock mapping CSV. IN this CSV users can set a match of the UO features with a buildstock building and its characteristics and the feature will run with the assigned buildstock characteristics. Optional for residential buildings.",
+			"type": "string"
 		}
 	},
 	"required": [
@@ -515,4 +527,4 @@
 			]
 		}
 	}
-}
+}
diff --git a/lib/urbanopt/geojson/schema/site_properties.json b/lib/urbanopt/geojson/schema/site_properties.json
@@ -211,6 +211,18 @@
 				"2018",
 				"2019"
 			]
+		},
+		"characterize_residential_buildings_from_buildstock_csv":{
+		"description" : "Enable UO and ResStock connection to characterize residential buildings by matching them (and their properties) with building from the BuildStock CSV.",
+		"type": "boolean"
+		},
+		"resstock_buildstock_csv_path":{
+		"description" : "Path to the buildstock CSV that the users want to sample from to find the closest match to their UO residential buildings features.",
+		"type": "string"
+		},
+		"uo_buildstock_mapping_csv_path":{
+		"description" : "Path to the uo_buildstock mapping CSV. IN this CSV users can set a match of the UO features with a buildstock building and its characteristics and the feature will run with the assigned buildstock characteristics",
+		"type": "string"
 		}
 	},
 	"required": [