From 8429ba170e8db43810e90f864c6fe760a010a10e Mon Sep 17 00:00:00 2001 From: Rawad <40804728+rawadelkontar@users.noreply.github.com> Date: Sat, 10 Feb 2024 21:58:06 -0500 Subject: [PATCH 1/7] Added UO-ResStock connection variable to the site properties schema --- lib/urbanopt/geojson/schema/site_properties.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/urbanopt/geojson/schema/site_properties.json b/lib/urbanopt/geojson/schema/site_properties.json index bdb54029..33f11434 100644 --- a/lib/urbanopt/geojson/schema/site_properties.json +++ b/lib/urbanopt/geojson/schema/site_properties.json @@ -211,6 +211,14 @@ "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" } }, "required": [ From 65371bf1c88b71ac7895e42bf2743deb7c465fda Mon Sep 17 00:00:00 2001 From: Rawad <40804728+rawadelkontar@users.noreply.github.com> Date: Sat, 10 Feb 2024 22:33:48 -0500 Subject: [PATCH 2/7] Added uo-resstock connection properties to buildings schema --- lib/urbanopt/geojson/schema/building_properties.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/urbanopt/geojson/schema/building_properties.json b/lib/urbanopt/geojson/schema/building_properties.json index e73ec352..57307c99 100644 --- a/lib/urbanopt/geojson/schema/building_properties.json +++ b/lib/urbanopt/geojson/schema/building_properties.json @@ -283,6 +283,14 @@ "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.", + "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" } }, "required": [ From 8f3ab398da2dfd36559dda6e18c90bb626ad7fea Mon Sep 17 00:00:00 2001 From: Rawad <40804728+rawadelkontar@users.noreply.github.com> Date: Sat, 10 Feb 2024 22:53:49 -0500 Subject: [PATCH 3/7] added uo resstock connection properties to building.rb --- lib/urbanopt/geojson/building.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/urbanopt/geojson/building.rb b/lib/urbanopt/geojson/building.rb index f1dcf8b6..81211543 100644 --- a/lib/urbanopt/geojson/building.rb +++ b/lib/urbanopt/geojson/building.rb @@ -35,6 +35,8 @@ def initialize(feature = {}) @mixed_type_3_percentage = feature[:properties][:mixed_type_3_percentage] @mixed_type_4 = feature[:properties][:mixed_type_4] @mixed_type_4_percentage = feature[:properties][:mixed_type_4_percentage] + @characterize_residential_buildings_from_buildstock_csv = feature[:properties][:characterize_residential_buildings_from_buildstock_csv] + @resstock_buildstock_csv_path = feature[:properties][:resstock_buildstock_csv_path] end ## @@ -294,6 +296,8 @@ def to_hash result[:mixed_type_3_percentage] = @mixed_type_3_percentage if @mixed_type_3_percentage result[:mixed_type_4] = @mixed_type_4 if @mixed_type_4 result[:mixed_type_4_percentage] = @mixed_type_4_percentage if @mixed_type_4_percentage + result[:characterize_residential_buildings_from_buildstock_csv] = @characterize_residential_buildings_from_buildstock_csv if @mixed_type_4_percentage + result[:resstock_buildstock_csv_path] = @resstock_buildstock_csv_path if @resstock_buildstock_csv_path return result end From 8564ebd83a22c2d534dc86abd2cff1ac1ba0a7c0 Mon Sep 17 00:00:00 2001 From: Rawad <40804728+rawadelkontar@users.noreply.github.com> Date: Sun, 11 Feb 2024 02:03:16 -0500 Subject: [PATCH 4/7] removed the added properties in building.rb --- lib/urbanopt/geojson/building.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/urbanopt/geojson/building.rb b/lib/urbanopt/geojson/building.rb index 81211543..f1dcf8b6 100644 --- a/lib/urbanopt/geojson/building.rb +++ b/lib/urbanopt/geojson/building.rb @@ -35,8 +35,6 @@ def initialize(feature = {}) @mixed_type_3_percentage = feature[:properties][:mixed_type_3_percentage] @mixed_type_4 = feature[:properties][:mixed_type_4] @mixed_type_4_percentage = feature[:properties][:mixed_type_4_percentage] - @characterize_residential_buildings_from_buildstock_csv = feature[:properties][:characterize_residential_buildings_from_buildstock_csv] - @resstock_buildstock_csv_path = feature[:properties][:resstock_buildstock_csv_path] end ## @@ -296,8 +294,6 @@ def to_hash result[:mixed_type_3_percentage] = @mixed_type_3_percentage if @mixed_type_3_percentage result[:mixed_type_4] = @mixed_type_4 if @mixed_type_4 result[:mixed_type_4_percentage] = @mixed_type_4_percentage if @mixed_type_4_percentage - result[:characterize_residential_buildings_from_buildstock_csv] = @characterize_residential_buildings_from_buildstock_csv if @mixed_type_4_percentage - result[:resstock_buildstock_csv_path] = @resstock_buildstock_csv_path if @resstock_buildstock_csv_path return result end From 29ec85f6486930b62f92e692c03611ce1172535e Mon Sep 17 00:00:00 2001 From: Rawad <40804728+rawadelkontar@users.noreply.github.com> Date: Sun, 11 Feb 2024 02:12:01 -0500 Subject: [PATCH 5/7] make the site inputs for uo-resstock connections apply to all features --- lib/urbanopt/geojson/geo_file.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/urbanopt/geojson/geo_file.rb b/lib/urbanopt/geojson/geo_file.rb index 6a1fbe46..6c64782d 100644 --- a/lib/urbanopt/geojson/geo_file.rb +++ b/lib/urbanopt/geojson/geo_file.rb @@ -196,7 +196,9 @@ 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 } ] add_props.each do |prop| From 43d1677236f1f6d05d489c69a04bbbe3ec3a49e5 Mon Sep 17 00:00:00 2001 From: Rawad <40804728+rawadelkontar@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:27:08 -0500 Subject: [PATCH 6/7] added uo_buildstock_mapping_csv_path input to the geojson file --- lib/urbanopt/geojson/geo_file.rb | 3 ++- lib/urbanopt/geojson/schema/building_properties.json | 4 ++++ lib/urbanopt/geojson/schema/site_properties.json | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/urbanopt/geojson/geo_file.rb b/lib/urbanopt/geojson/geo_file.rb index 6c64782d..f5b9e223 100644 --- a/lib/urbanopt/geojson/geo_file.rb +++ b/lib/urbanopt/geojson/geo_file.rb @@ -198,7 +198,8 @@ def merge_site_properties(feature) { 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: :characterize_residential_buildings_from_buildstock_csv, feature: :characterize_residential_buildings_from_buildstock_csv }, - { site: :resstock_buildstock_csv_path, feature: :resstock_buildstock_csv_path } + { 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 index 57307c99..fa29721c 100644 --- a/lib/urbanopt/geojson/schema/building_properties.json +++ b/lib/urbanopt/geojson/schema/building_properties.json @@ -291,6 +291,10 @@ "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": [ diff --git a/lib/urbanopt/geojson/schema/site_properties.json b/lib/urbanopt/geojson/schema/site_properties.json index 33f11434..b1c954ac 100644 --- a/lib/urbanopt/geojson/schema/site_properties.json +++ b/lib/urbanopt/geojson/schema/site_properties.json @@ -219,6 +219,10 @@ "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": [ From 3d3b72114e29640b97bbd3bb3b656b025c7f7ad1 Mon Sep 17 00:00:00 2001 From: Katherine Fleming <2205659+kflemin@users.noreply.github.com> Date: Mon, 24 Jun 2024 13:12:05 -0600 Subject: [PATCH 7/7] adding optional for residential buildings descriptors --- lib/urbanopt/geojson/schema/building_properties.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/urbanopt/geojson/schema/building_properties.json b/lib/urbanopt/geojson/schema/building_properties.json index fa29721c..40ffdf65 100644 --- a/lib/urbanopt/geojson/schema/building_properties.json +++ b/lib/urbanopt/geojson/schema/building_properties.json @@ -285,15 +285,15 @@ "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.", + "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.", + "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", + "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" } }, @@ -527,4 +527,4 @@ ] } } -} \ No newline at end of file +}