From 7734fdac1aa86a035fdfb720fce7a3c07f190078 Mon Sep 17 00:00:00 2001 From: Tanushree Date: Tue, 5 Oct 2021 10:37:06 -0600 Subject: [PATCH 1/6] Adds example project file with PV --- example_project/example_project_with_PV.json | 751 +++++++++++++++++++ 1 file changed, 751 insertions(+) create mode 100644 example_project/example_project_with_PV.json diff --git a/example_project/example_project_with_PV.json b/example_project/example_project_with_PV.json new file mode 100644 index 000000000..87875ff31 --- /dev/null +++ b/example_project/example_project_with_PV.json @@ -0,0 +1,751 @@ +{ + "type": "FeatureCollection", + "project": { + "id": "7c33a001-bccb-413e-ac87-67558b5d4b07", + "name": "New Project", + "surface_elevation": null, + "import_surrounding_buildings_as_shading": null, + "weather_filename": "USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.epw", + "tarrif_filename": null, + "climate_zone": "6A", + "cec_climate_zone": null, + "begin_date": "2017-01-01T07:00:00.000Z", + "end_date": "2017-12-31T07:00:00.000Z", + "timesteps_per_hour": 1, + "default_template": "90.1-2013", + "tariff_filename": null + }, + "features": [ + { + "type": "Feature", + "properties": { + "id": "53340c2c-ab20-40db-aba1-11ac607c52a7", + "name": "Site Origin", + "type": "Site Origin", + "begin_date": "2017-01-01T07:00:00.000Z", + "end_date": "2017-12-31T07:00:00.000Z", + "cec_climate_zone": null, + "climate_zone": "6A", + "default_template": "90.1-2013", + "import_surrounding_buildings_as_shading": null, + "surface_elevation": null, + "tariff_filename": null, + "timesteps_per_hour": 1, + "weather_filename": "USA_NY_Buffalo-Greater.Buffalo.Intl.AP.725280_TMY3.epw" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -78.84948467732347, + 42.81677154451123 + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "1", + "name": "Mixed_use 1", + "type": "Building", + "building_type": "Mixed use", + "floor_area": 752184, + "footprint_area": 188046, + "number_of_stories": 4, + "mixed_type_1": "Office", + "mixed_type_1_percentage": 50, + "mixed_type_2": "Food service", + "mixed_type_2_percentage": 50, + "mixed_type_3": "Strip shopping mall", + "mixed_type_3_percentage": 0, + "mixed_type_4": "Lodging", + "mixed_type_4_percentage": 0 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84650338745196, + 42.81331301863236 + ], + [ + -78.84652443964629, + 42.81463974371101 + ], + [ + -78.84680142363833, + 42.815293654042534 + ], + [ + -78.84744455124724, + 42.81514110006128 + ], + [ + -78.84728610028628, + 42.81478165791734 + ], + [ + -78.84786797764677, + 42.814643631760134 + ], + [ + -78.84721106637106, + 42.813153418927016 + ], + [ + -78.84650338745196, + 42.81331301863236 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "2", + "name": "Restaurant 1", + "type": "Building", + "building_type": "Food service", + "floor_area": 22313, + "footprint_area": 22313, + "number_of_stories": 1, + "ev_charging": true, + "ev_charging_behavior": "Business as Usual", + "ev_percent": 100, + "ev_curtailment_frac": 0.5 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.8500120420453, + 42.81812185529549 + ], + [ + -78.85038975191084, + 42.81803226424341 + ], + [ + -78.850630729414, + 42.81857888627522 + ], + [ + -78.85025301954843, + 42.81866847653532 + ], + [ + -78.8500120420453, + 42.81812185529549 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "3", + "name": "Restaurant 10", + "type": "Building", + "building_type": "Food service", + "floor_area": 125631, + "footprint_area": 41877, + "number_of_stories": 3, + "ev_charging": true, + "ev_charging_station_type": "Typical Public" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84962224800356, + 42.81329273502644 + ], + [ + -78.84929833482822, + 42.81337083838241 + ], + [ + -78.84983265832118, + 42.814563298664666 + ], + [ + -78.85015657149653, + 42.81448519681467 + ], + [ + -78.84962224800356, + 42.81329273502644 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "4", + "name": "Restaurant 12", + "type": "Building", + "building_type": "Food service", + "floor_area": 31623, + "footprint_area": 10541, + "number_of_stories": 3, + "ev_charging": true, + "ev_charging_station_type": "Typical Public" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84907318596754, + 42.81342719667407 + ], + [ + -78.84862090048105, + 42.81353625345659 + ], + [ + -78.84871721918239, + 42.813751210926796 + ], + [ + -78.84916950466888, + 42.81364215452331 + ], + [ + -78.84907318596754, + 42.81342719667407 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "5", + "name": "District Office 1", + "type": "Building", + "building_type": "Office", + "system_type": "VAV district chilled water with district hot water reheat", + "floor_area": 8804, + "footprint_area": 8804, + "number_of_stories": 1, + "ev_charging": true, + "ev_charging_station_type": "Typical Work" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84809175426629, + 42.81367038997507 + ], + [ + -78.84848670778973, + 42.81357515750889 + ], + [ + -78.84857883872144, + 42.81378076888831 + ], + [ + -78.84818388519801, + 42.81387600103781 + ], + [ + -78.84809175426629, + 42.81367038997507 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "6", + "name": "District Office 2", + "type": "Building", + "building_type": "Office", + "system_type": "VAV district chilled water with district hot water reheat", + "floor_area": 10689, + "footprint_area": 10689, + "number_of_stories": 1, + "ev_charging": true + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84846106738529, + 42.814495803077364 + ], + [ + -78.8486903952376, + 42.81444050756261 + ], + [ + -78.8484977578349, + 42.81401059666683 + ], + [ + -78.84826842998261, + 42.81406589256599 + ], + [ + -78.84846106738529, + 42.814495803077364 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "7", + "name": "Office 1", + "type": "Building", + "building_type": "Office", + "system_type": "VAV district chilled water with district hot water reheat", + "number_of_stories": 6, + "detailed_model_filename": "7.osm" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84733878006863, + 42.816466983030836 + ], + [ + -78.84854275129324, + 42.81617669028003 + ], + [ + -78.848356395545, + 42.81576080994094 + ], + [ + -78.84715242432038, + 42.81605110464406 + ], + [ + -78.84733878006863, + 42.816466983030836 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "8", + "name": "Hospital 1", + "type": "Building", + "building_type": "Outpatient health care", + "system_type": "VAV district chilled water with district hot water reheat", + "number_of_stories": 10, + "detailed_model_filename": "8.osm" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84973966335251, + 42.8154441454509 + ], + [ + -78.85049562542395, + 42.81525669280299 + ], + [ + -78.85078257620685, + 42.81588131780643 + ], + [ + -78.8505086568277, + 42.81594736368234 + ], + [ + -78.85041233812638, + 42.815732413845666 + ], + [ + -78.84991755499783, + 42.81585689105046 + ], + [ + -78.84973966335251, + 42.8154441454509 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "9", + "name": "Hospital 2", + "type": "Building", + "building_type": "Inpatient health care", + "number_of_stories": 3, + "detailed_model_filename": "9.osm" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85083627755732, + 42.81600678613279 + ], + [ + -78.85056039001891, + 42.816076133580566 + ], + [ + -78.85072568130569, + 42.816450649528036 + ], + [ + -78.84940134236577, + 42.81677160705479 + ], + [ + -78.84958014898304, + 42.81716858994267 + ], + [ + -78.8507262115271, + 42.816890840117026 + ], + [ + -78.8508565789851, + 42.81719595796099 + ], + [ + -78.85132137101688, + 42.81708331517635 + ], + [ + -78.85083627755732, + 42.81600678613279 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "10", + "name": "Mixed use 2", + "type": "Building", + "building_type": "Mixed use", + "floor_area": 1278384, + "footprint_area": 159798, + "number_of_stories": 8, + "mixed_type_1": "Strip shopping mall", + "mixed_type_1_percentage": 25, + "mixed_type_2": "Food service", + "mixed_type_2_percentage": 25, + "mixed_type_3": "Office", + "mixed_type_3_percentage": 15, + "mixed_type_4": "Lodging", + "mixed_type_4_percentage": 35 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85115264550463, + 42.81786093060211 + ], + [ + -78.85163483958878, + 42.81774467026972 + ], + [ + -78.85246596719499, + 42.819583261120755 + ], + [ + -78.85082390085432, + 42.819979162017745 + ], + [ + -78.85060552295334, + 42.81947573727234 + ], + [ + -78.85174564783776, + 42.81920483484765 + ], + [ + -78.85115264550463, + 42.81786093060211 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "11", + "name": "Restaurant 13", + "type": "Building", + "building_type": "Food service", + "floor_area": 32511, + "footprint_area": 10837, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84961163640645, + 42.81460851835703 + ], + [ + -78.84914661048371, + 42.81472064501696 + ], + [ + -78.84905029178236, + 42.81450569091638 + ], + [ + -78.84951531770513, + 42.81439356386673 + ], + [ + -78.84961163640645, + 42.81460851835703 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "12", + "name": "Mall 1", + "type": "Building", + "building_type": "Strip shopping mall", + "floor_area": 374409, + "footprint_area": 124803, + "number_of_stories": 3 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84768338040897, + 42.817161656757065 + ], + [ + -78.8482630702579, + 42.8170218879136 + ], + [ + -78.84915297130291, + 42.81900776764229 + ], + [ + -78.84857328145401, + 42.81914753199706 + ], + [ + -78.84768338040897, + 42.817161656757065 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "13", + "name": "Hotel 1", + "type": "Building", + "building_type": "Lodging", + "floor_area": 316160, + "footprint_area": 31616, + "number_of_stories": 10 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.8494955083645, + 42.819748790984335 + ], + [ + -78.84891089471263, + 42.81989327725856 + ], + [ + -78.8491389243777, + 42.82038967009544 + ], + [ + -78.84972353802956, + 42.82024518498119 + ], + [ + -78.8494955083645, + 42.819748790984335 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "14", + "geometryType": "Rectangle", + "name": "Community Photovoltaic", + "type": "District System", + "footprint_area": 118421, + "footprint_perimeter": 1462, + "district_system_type": "Community Photovoltaic" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.84993884137165, + 42.820571831598244 + ], + [ + -78.85022091536928, + 42.821199649366804 + ], + [ + -78.85195997122116, + 42.82077928940717 + ], + [ + -78.85167789722357, + 42.82015146737024 + ], + [ + -78.84993884137165, + 42.820571831598244 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "15", + "geometryType": "Rectangle", + "name": "Ground Mount Photovoltaic 1", + "type": "District System", + "footprint_area": 34594, + "footprint_perimeter": 758, + "district_system_type": "Ground Mount Photovoltaic", + "associated_building_id": "2" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85056968542368, + 42.81373640858962 + ], + [ + -78.85030204864333, + 42.81314646144571 + ], + [ + -78.84976251310884, + 42.8132781772876 + ], + [ + -78.85003014988916, + 42.81386812317504 + ], + [ + -78.85056968542368, + 42.81373640858962 + ] + ] + ] + } + }, + { + "type": "Feature", + "properties": { + "id": "16", + "geometryType": "Rectangle", + "name": "Ground Mount Photovoltaic 2", + "type": "District System", + "footprint_area": 18174, + "footprint_perimeter": 540, + "district_system_type": "Ground Mount Photovoltaic", + "associated_building_id": "3" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -78.85097541572937, + 42.81896027885472 + ], + [ + -78.85082898994985, + 42.818631091573025 + ], + [ + -78.85031900642024, + 42.81875314214673 + ], + [ + -78.85046543219978, + 42.81908232877865 + ], + [ + -78.85097541572937, + 42.81896027885472 + ] + ] + ] + } + } + ], + "mappers": [], + "scenarios": [ + { + "feature_mappings": [], + "id": "72301739-c6c3-4dd7-bf1a-f37c8eff40db", + "name": "New Scenario" + } + ] + } \ No newline at end of file From f988538158c8aeca448934a5a2266489a91541d2 Mon Sep 17 00:00:00 2001 From: Tanushree Date: Tue, 5 Oct 2021 11:50:32 -0600 Subject: [PATCH 2/6] Adds community and ground mount PV --- Gemfile | 54 +++++++++++++++++++++++++++--------------------------- Rakefile | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 29 deletions(-) diff --git a/Gemfile b/Gemfile index a955c3f17..ad5a34a2d 100644 --- a/Gemfile +++ b/Gemfile @@ -25,37 +25,37 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' # end -if allow_local && File.exist?('../urbanopt-scenario-gem') - gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem' -elsif allow_local - gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop' -else - gem 'urbanopt-scenario', '~> 0.6.0' -end +#if allow_local && File.exist?('../urbanopt-scenario-gem') +# gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem' +#elsif allow_local + gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'comm_sol_vis' +#else +# gem 'urbanopt-scenario', '~> 0.6.0' +#end -if allow_local && File.exist?('../urbanopt-reporting-gem') - gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' -elsif allow_local - gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' -else - gem 'urbanopt-reporting', '~> 0.4.0' -end +#if allow_local && File.exist?('../urbanopt-reporting-gem') +# gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' +#elsif allow_local + gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'comm_sol_enhance' +#else +# gem 'urbanopt-reporting', '~> 0.4.0' +#end -if allow_local && File.exist?('../urbanopt-geojson-gem') - gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' -elsif allow_local +#if allow_local && File.exist?('../urbanopt-geojson-gem') +# gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' +#elsif allow_local gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop' -else - gem 'urbanopt-geojson', '~> 0.6.1' -end +#else +# gem 'urbanopt-geojson', '~> 0.6.1' +#end -if allow_local && File.exist?('../urbanopt-reopt-gem') - gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem' -elsif allow_local - gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop' -else - gem 'urbanopt-reopt', '0.6.0' -end +#if allow_local && File.exist?('../urbanopt-reopt-gem') +# gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem' +#elsif allow_local + gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'comm_sol_enhance' +#else +# gem 'urbanopt-reopt', '0.6.0' +#end if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem') gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem' diff --git a/Rakefile b/Rakefile index c0d98d665..e46bc8294 100644 --- a/Rakefile +++ b/Rakefile @@ -490,11 +490,40 @@ task :post_process_reopt, [:json, :csv] do |t, args| scenario_base = default_post_processor.scenario_base reopt_post_processor = URBANopt::REopt::REoptPostProcessor.new(scenario_report, scenario_base.scenario_reopt_assumptions_file, scenario_base.reopt_feature_assumptions, DEVELOPER_NREL_KEY) + # Add community photovoltaic if present in the Feature File + community_photovoltaic = [] + feature_file = JSON.parse(File.read(File.expand_path(json)), symbolize_names: true) + feature_file[:features].each do |feature| + begin + if feature[:properties][:district_system_type] + if feature[:properties][:district_system_type] == 'Community Photovoltaic' + community_photovoltaic << feature + end + end + rescue + end + end + # Run Aggregate Scenario - scenario_report_scenario = reopt_post_processor.run_scenario_report(scenario_report: scenario_report, save_name: 'scenario_report_reopt_global_optimization') + scenario_report_scenario = reopt_post_processor.run_scenario_report(scenario_report: scenario_report, save_name: 'scenario_report_reopt_global_optimization', run_resilience: true, community_photovoltaic: community_photovoltaic) + + # Add groundmount photovoltaic if present in the Feature File + groundmount_photovoltaic = {} + feature_file = JSON.parse(File.read(File.expand_path(json)), symbolize_names: true) + feature_file[:features].each do |feature| + begin + if feature[:properties][:district_system_type] + if feature[:properties][:district_system_type] == 'Ground Mount Photovoltaic' + groundmount_photovoltaic[feature[:properties][:associated_building_id]] = feature[:properties][:footprint_area] + end + end + rescue + end + end # Run features individually - this is an alternative approach to the previous step, in your analysis depending on project ojectives you maye only need to run one - scenario_report_features = reopt_post_processor.run_scenario_report_features(scenario_report: scenario_report, save_names_feature_reports: ['feature_report_reopt']* scenario_report.feature_reports.length, save_name_scenario_report: 'scenario_report_reopt_local_optimization') + scenario_report_features = reopt_post_processor.run_scenario_report_features(scenario_report: scenario_report, save_names_feature_reports: ['feature_report_reopt']* scenario_report.feature_reports.length, save_name_scenario_report: 'scenario_report_reopt_local_optimization', run_resilience: true, + keep_existing_output: false, groundmount_photovoltaic: groundmount_photovoltaic) end ### Mixed From 7f15399552bdf0947e596464e8f11a589dc7c05b Mon Sep 17 00:00:00 2001 From: Tanushree Date: Wed, 6 Oct 2021 16:22:35 -0600 Subject: [PATCH 3/6] Fixes REopt Rake Task --- Rakefile | 32 ++++++++++---------------------- example_project/Gemfile | 30 +++++++++++++++++------------- 2 files changed, 27 insertions(+), 35 deletions(-) diff --git a/Rakefile b/Rakefile index e46bc8294..0990cc4e4 100644 --- a/Rakefile +++ b/Rakefile @@ -463,7 +463,7 @@ desc 'Run REopt Scenario' task :run_reopt, [:json, :csv] do |t, args| puts 'Running REopt Scenario...' - json = 'example_project_combined.json' if args[:json].nil? + json = 'example_project_with_PV.json' if args[:json].nil? csv = 'reopt_scenario.csv' if args[:csv].nil? configure_project @@ -476,7 +476,7 @@ desc 'Post Process REopt Scenario' task :post_process_reopt, [:json, :csv] do |t, args| puts 'Post Processing REopt Scenario...' - json = 'example_project_combined.json' if args[:json].nil? + json = 'example_project_with_PV.json' if args[:json].nil? csv = 'reopt_scenario.csv' if args[:csv].nil? default_post_processor = URBANopt::Scenario::ScenarioDefaultPostProcessor.new(reopt_scenario(json, csv)) @@ -490,15 +490,17 @@ task :post_process_reopt, [:json, :csv] do |t, args| scenario_base = default_post_processor.scenario_base reopt_post_processor = URBANopt::REopt::REoptPostProcessor.new(scenario_report, scenario_base.scenario_reopt_assumptions_file, scenario_base.reopt_feature_assumptions, DEVELOPER_NREL_KEY) - # Add community photovoltaic if present in the Feature File community_photovoltaic = [] - feature_file = JSON.parse(File.read(File.expand_path(json)), symbolize_names: true) + groundmount_photovoltaic = {} + feature_file = JSON.parse(File.read(File.join(root_dir, json)), symbolize_names: true) feature_file[:features].each do |feature| begin - if feature[:properties][:district_system_type] - if feature[:properties][:district_system_type] == 'Community Photovoltaic' - community_photovoltaic << feature - end + # Add community photovoltaic if present in the Feature File + if feature[:properties][:district_system_type] == 'Community Photovoltaic' + community_photovoltaic << feature + # Add groundmount photovoltaic if present in the Feature File + elsif feature[:properties][:district_system_type] == 'Ground Mount Photovoltaic' + groundmount_photovoltaic[feature[:properties][:associated_building_id]] = feature[:properties][:footprint_area] end rescue end @@ -507,20 +509,6 @@ task :post_process_reopt, [:json, :csv] do |t, args| # Run Aggregate Scenario scenario_report_scenario = reopt_post_processor.run_scenario_report(scenario_report: scenario_report, save_name: 'scenario_report_reopt_global_optimization', run_resilience: true, community_photovoltaic: community_photovoltaic) - # Add groundmount photovoltaic if present in the Feature File - groundmount_photovoltaic = {} - feature_file = JSON.parse(File.read(File.expand_path(json)), symbolize_names: true) - feature_file[:features].each do |feature| - begin - if feature[:properties][:district_system_type] - if feature[:properties][:district_system_type] == 'Ground Mount Photovoltaic' - groundmount_photovoltaic[feature[:properties][:associated_building_id]] = feature[:properties][:footprint_area] - end - end - rescue - end - end - # Run features individually - this is an alternative approach to the previous step, in your analysis depending on project ojectives you maye only need to run one scenario_report_features = reopt_post_processor.run_scenario_report_features(scenario_report: scenario_report, save_names_feature_reports: ['feature_report_reopt']* scenario_report.feature_reports.length, save_name_scenario_report: 'scenario_report_reopt_local_optimization', run_resilience: true, keep_existing_output: false, groundmount_photovoltaic: groundmount_photovoltaic) diff --git a/example_project/Gemfile b/example_project/Gemfile index 7f84ea92d..e5181616d 100644 --- a/example_project/Gemfile +++ b/example_project/Gemfile @@ -65,18 +65,22 @@ else gem 'openstudio-calibration', '~> 0.4.0' end -if allow_local && File.exists?('../urbanopt-geojson-gem') - gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' -elsif allow_local +#if allow_local && File.exists?('../urbanopt-geojson-gem') +# gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' +#elsif allow_local gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop' -else - gem 'urbanopt-geojson', '~> 0.6.1' -end +#else +# gem 'urbanopt-geojson', '~> 0.6.1' +#end -if allow_local && File.exists?('../urbanopt-reporting-gem') - gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' -elsif allow_local - gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' -else - gem 'urbanopt-reporting', '~> 0.4.0' -end \ No newline at end of file +#if allow_local && File.exists?('../urbanopt-reporting-gem') +# gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' +#elsif allow_local + gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'comm_sol_enhance' +#else +# gem 'urbanopt-reporting', '~> 0.4.0' +#end + + gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'comm_sol_vis' + + gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'comm_sol_enhance' From 83a42342df186ba6c68bb1e567052e425f127d43 Mon Sep 17 00:00:00 2001 From: Tanushree Date: Fri, 22 Oct 2021 12:40:00 -0600 Subject: [PATCH 4/6] Update osm files without shading objects --- example_project/osm_building/7.osm | 307 ------------- example_project/osm_building/8.osm | 419 ------------------ example_project/osm_building/9.osm | 664 ----------------------------- 3 files changed, 1390 deletions(-) diff --git a/example_project/osm_building/7.osm b/example_project/osm_building/7.osm index 675879340..2f0b762f4 100644 --- a/example_project/osm_building/7.osm +++ b/example_project/osm_building/7.osm @@ -6725,313 +6725,6 @@ OS:SubSurface, 98.4726271566309, 78.4247533257874, 15.762, !- X,Y,Z Vertex 3 {m} 98.4726271566309, 78.4247533257874, 16.6629407837833; !- X,Y,Z Vertex 4 {m} -OS:ShadingSurfaceGroup, - {dd1e0c6d-9903-4c1d-88a7-8d6163f90c2a}, !- Handle - Building Office 1 Space, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {05894720-211a-4fd4-a9e4-a4794ef3801c}, !- Handle - Shading Surface 1, !- Name - , !- Construction Name - {dd1e0c6d-9903-4c1d-88a7-8d6163f90c2a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 15.2409505711474, 1.68454681244157e-005, 12, !- X,Y,Z Vertex 1 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 2 {m} - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 3 {m} - 113.706208454144, 32.2495295569472, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {85eb0601-8dee-4b94-b492-d32c21f47e6d}, !- Handle - Shading Surface 2, !- Name - , !- Construction Name - {dd1e0c6d-9903-4c1d-88a7-8d6163f90c2a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 113.706208454144, 32.2495295569472, 12, !- X,Y,Z Vertex 1 {m} - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 2 {m} - 98.4646693679155, 78.4488745529279, 0, !- X,Y,Z Vertex 3 {m} - 98.4646693679155, 78.4488745529279, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {4f3eb581-f18b-48a8-a3ec-0b9ce9badbbf}, !- Handle - Shading Surface 3, !- Name - , !- Construction Name - {dd1e0c6d-9903-4c1d-88a7-8d6163f90c2a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 98.4646693679155, 78.4488745529279, 12, !- X,Y,Z Vertex 1 {m} - -8.51798631629208e-011, 46.1997940409183, 12, !- X,Y,Z Vertex 2 {m} - 15.2409505711474, 1.68454681244157e-005, 12, !- X,Y,Z Vertex 3 {m} - 113.706208454144, 32.2495295569472, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {6c828cd7-a581-49a9-bba4-b35078369d4a}, !- Handle - Shading Surface 4, !- Name - , !- Construction Name - {dd1e0c6d-9903-4c1d-88a7-8d6163f90c2a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - -8.51798631629208e-011, 46.1997940409183, 12, !- X,Y,Z Vertex 1 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 2 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 3 {m} - 15.2409505711474, 1.68454681244157e-005, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {a098b7d5-664f-46de-829f-77f1c4818661}, !- Handle - Shading Surface 5, !- Name - , !- Construction Name - {dd1e0c6d-9903-4c1d-88a7-8d6163f90c2a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 1 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 2 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 3 {m} - 98.4646693679155, 78.4488745529279, 0; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {af3ee510-966a-4efc-bdda-62412ab5f631}, !- Handle - Shading Surface 6, !- Name - , !- Construction Name - {dd1e0c6d-9903-4c1d-88a7-8d6163f90c2a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 98.4646693679155, 78.4488745529279, 12, !- X,Y,Z Vertex 1 {m} - 98.4646693679155, 78.4488745529279, 0, !- X,Y,Z Vertex 2 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 3 {m} - -8.51798631629208e-011, 46.1997940409183, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurfaceGroup, - {820da241-5ba0-4a6d-978b-28cd3e2c6bbf}, !- Handle - Building Office 1 Space 1, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {1edf48f5-b186-45d4-ad96-da78f0e03a68}, !- Handle - Shading Surface 7, !- Name - , !- Construction Name - {820da241-5ba0-4a6d-978b-28cd3e2c6bbf}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 98.4646693679155, 78.4488745529279, 30, !- X,Y,Z Vertex 1 {m} - 98.4646693679155, 78.4488745529279, 0, !- X,Y,Z Vertex 2 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 3 {m} - -8.51798631629208e-011, 46.1997940409183, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {09996a74-e3e9-4634-aefa-ac6994088dd1}, !- Handle - Shading Surface 8, !- Name - , !- Construction Name - {820da241-5ba0-4a6d-978b-28cd3e2c6bbf}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 1 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 2 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 3 {m} - 98.4646693679155, 78.4488745529279, 0; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {2914cc29-a1c0-4185-9744-a1119d220690}, !- Handle - Shading Surface 9, !- Name - , !- Construction Name - {820da241-5ba0-4a6d-978b-28cd3e2c6bbf}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - -8.51798631629208e-011, 46.1997940409183, 30, !- X,Y,Z Vertex 1 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 2 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 3 {m} - 15.2409505711474, 1.68454681244157e-005, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {83ff8b46-5b92-4b2c-9caf-06f2e1041270}, !- Handle - Shading Surface 10, !- Name - , !- Construction Name - {820da241-5ba0-4a6d-978b-28cd3e2c6bbf}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 113.706208454144, 32.2495295569472, 30, !- X,Y,Z Vertex 1 {m} - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 2 {m} - 98.4646693679155, 78.4488745529279, 0, !- X,Y,Z Vertex 3 {m} - 98.4646693679155, 78.4488745529279, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {9a1f0a0e-8664-4568-bcfd-8cda6eb281fd}, !- Handle - Shading Surface 11, !- Name - , !- Construction Name - {820da241-5ba0-4a6d-978b-28cd3e2c6bbf}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 98.4646693679155, 78.4488745529279, 30, !- X,Y,Z Vertex 1 {m} - -8.51798631629208e-011, 46.1997940409183, 30, !- X,Y,Z Vertex 2 {m} - 15.2409505711474, 1.68454681244157e-005, 30, !- X,Y,Z Vertex 3 {m} - 113.706208454144, 32.2495295569472, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {b0aca364-93a4-4cee-9430-15ade7f37f34}, !- Handle - Shading Surface 12, !- Name - , !- Construction Name - {820da241-5ba0-4a6d-978b-28cd3e2c6bbf}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 15.2409505711474, 1.68454681244157e-005, 30, !- X,Y,Z Vertex 1 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 2 {m} - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 3 {m} - 113.706208454144, 32.2495295569472, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurfaceGroup, - {ffc64617-2b0e-4d9c-a847-49ae51df6de8}, !- Handle - Building Office 1 Space 2, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {e7c5a540-dc21-484d-bd07-7b97f56d20de}, !- Handle - Shading Surface 13, !- Name - , !- Construction Name - {ffc64617-2b0e-4d9c-a847-49ae51df6de8}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 15.2409505711474, 1.68454681244157e-005, 9, !- X,Y,Z Vertex 1 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 2 {m} - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 3 {m} - 113.706208454144, 32.2495295569472, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {7c302919-e095-4d12-b6d1-4fe73610b978}, !- Handle - Shading Surface 14, !- Name - , !- Construction Name - {ffc64617-2b0e-4d9c-a847-49ae51df6de8}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - -8.51798631629208e-011, 46.1997940409183, 9, !- X,Y,Z Vertex 1 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 2 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 3 {m} - 15.2409505711474, 1.68454681244157e-005, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {ed1adda2-2e85-4078-86cc-719aea9d2cd2}, !- Handle - Shading Surface 15, !- Name - , !- Construction Name - {ffc64617-2b0e-4d9c-a847-49ae51df6de8}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 98.4646693679155, 78.4488745529279, 9, !- X,Y,Z Vertex 1 {m} - 98.4646693679155, 78.4488745529279, 0, !- X,Y,Z Vertex 2 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 3 {m} - -8.51798631629208e-011, 46.1997940409183, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {19be56b3-4cec-44b7-8696-027846c04f1c}, !- Handle - Shading Surface 16, !- Name - , !- Construction Name - {ffc64617-2b0e-4d9c-a847-49ae51df6de8}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 98.4646693679155, 78.4488745529279, 9, !- X,Y,Z Vertex 1 {m} - -8.51798631629208e-011, 46.1997940409183, 9, !- X,Y,Z Vertex 2 {m} - 15.2409505711474, 1.68454681244157e-005, 9, !- X,Y,Z Vertex 3 {m} - 113.706208454144, 32.2495295569472, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {7a0fe5a4-6dad-4faa-b55c-e0f6b1e25e88}, !- Handle - Shading Surface 17, !- Name - , !- Construction Name - {ffc64617-2b0e-4d9c-a847-49ae51df6de8}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 1 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 2 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 3 {m} - 98.4646693679155, 78.4488745529279, 0; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {c7aec6e8-868a-46ea-9b82-49f5660bded2}, !- Handle - Shading Surface 18, !- Name - , !- Construction Name - {ffc64617-2b0e-4d9c-a847-49ae51df6de8}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 113.706208454144, 32.2495295569472, 9, !- X,Y,Z Vertex 1 {m} - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 2 {m} - 98.4646693679155, 78.4488745529279, 0, !- X,Y,Z Vertex 3 {m} - 98.4646693679155, 78.4488745529279, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurfaceGroup, - {4c71f56f-f65b-407e-a426-ef3ff2026433}, !- Handle - Building Office 1 Space 3, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {4bce6b7c-ec74-426e-b965-e9f3211093a7}, !- Handle - Shading Surface 19, !- Name - , !- Construction Name - {4c71f56f-f65b-407e-a426-ef3ff2026433}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 1 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 2 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 3 {m} - 98.4646693679155, 78.4488745529279, 0; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {cebab58d-21bb-4c4d-b969-d7605024c0e4}, !- Handle - Shading Surface 20, !- Name - , !- Construction Name - {4c71f56f-f65b-407e-a426-ef3ff2026433}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - -8.51798631629208e-011, 46.1997940409183, 24, !- X,Y,Z Vertex 1 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 2 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 3 {m} - 15.2409505711474, 1.68454681244157e-005, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {9bae26ed-990c-4df5-84fd-4599889b48d1}, !- Handle - Shading Surface 21, !- Name - , !- Construction Name - {4c71f56f-f65b-407e-a426-ef3ff2026433}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 98.4646693679155, 78.4488745529279, 24, !- X,Y,Z Vertex 1 {m} - 98.4646693679155, 78.4488745529279, 0, !- X,Y,Z Vertex 2 {m} - -8.51798631629208e-011, 46.1997940409183, 0, !- X,Y,Z Vertex 3 {m} - -8.51798631629208e-011, 46.1997940409183, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {c6d8bfba-026c-4fcd-be6d-1aef877bb2ad}, !- Handle - Shading Surface 22, !- Name - , !- Construction Name - {4c71f56f-f65b-407e-a426-ef3ff2026433}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 15.2409505711474, 1.68454681244157e-005, 24, !- X,Y,Z Vertex 1 {m} - 15.2409505711474, 1.68454681244157e-005, 0, !- X,Y,Z Vertex 2 {m} - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 3 {m} - 113.706208454144, 32.2495295569472, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {11fa6870-e33a-4460-ba6b-90ecbdc9a432}, !- Handle - Shading Surface 23, !- Name - , !- Construction Name - {4c71f56f-f65b-407e-a426-ef3ff2026433}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 113.706208454144, 32.2495295569472, 24, !- X,Y,Z Vertex 1 {m} - 113.706208454144, 32.2495295569472, 0, !- X,Y,Z Vertex 2 {m} - 98.4646693679155, 78.4488745529279, 0, !- X,Y,Z Vertex 3 {m} - 98.4646693679155, 78.4488745529279, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {c73dfc67-2d53-4e0f-962b-32c9feb997e7}, !- Handle - Shading Surface 24, !- Name - , !- Construction Name - {4c71f56f-f65b-407e-a426-ef3ff2026433}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 98.4646693679155, 78.4488745529279, 24, !- X,Y,Z Vertex 1 {m} - -8.51798631629208e-011, 46.1997940409183, 24, !- X,Y,Z Vertex 2 {m} - 15.2409505711474, 1.68454681244157e-005, 24, !- X,Y,Z Vertex 3 {m} - 113.706208454144, 32.2495295569472, 24; !- X,Y,Z Vertex 4 {m} OS:DefaultScheduleSet, {f1add6a3-4dd9-4d96-81ef-2898d258baf5}, !- Handle diff --git a/example_project/osm_building/8.osm b/example_project/osm_building/8.osm index b1a6956d0..023c9ec2d 100644 --- a/example_project/osm_building/8.osm +++ b/example_project/osm_building/8.osm @@ -14797,425 +14797,6 @@ OS:SubSurface, 85.2701282312194, 20.8163731922242, 27.762, !- X,Y,Z Vertex 3 {m} 85.2701282312194, 20.8163731922242, 28.6627013554423; !- X,Y,Z Vertex 4 {m} -OS:ShadingSurfaceGroup, - {16cedd9d-8ae0-4570-994c-b12275538664}, !- Handle - Building Hospital 1 Space, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {cbc3dc0f-5da1-4eab-a12f-0281a0847eed}, !- Handle - Shading Surface 1, !- Name - , !- Construction Name - {16cedd9d-8ae0-4570-994c-b12275538664}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 2.82938117379672e-011, 69.3890568426019, 12, !- X,Y,Z Vertex 1 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 2 {m} - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 3 {m} - 23.4682228098658, 3.99404363404798e-005, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {2300956a-018b-4858-a755-2488d5d58277}, !- Handle - Shading Surface 2, !- Name - , !- Construction Name - {16cedd9d-8ae0-4570-994c-b12275538664}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 22.4022022871208, 76.7260734897353, 12, !- X,Y,Z Vertex 1 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 2 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 3 {m} - 2.82938117379672e-011, 69.3890568426019, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {893c94e4-5543-4d57-a7e0-f679d6fac17b}, !- Handle - Shading Surface 3, !- Name - , !- Construction Name - {16cedd9d-8ae0-4570-994c-b12275538664}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 70.7449338373023, 66.6758722426726, 12, !- X,Y,Z Vertex 1 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 2 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 3 {m} - 30.2796287160267, 52.8475091302301, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {f2555581-f596-4b2b-8f43-3a9647bbe1c2}, !- Handle - Shading Surface 4, !- Name - , !- Construction Name - {16cedd9d-8ae0-4570-994c-b12275538664}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 23.4682228098658, 3.99404363404798e-005, 12, !- X,Y,Z Vertex 1 {m} - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 2 {m} - 85.294199464675, 20.8244809489993, 0, !- X,Y,Z Vertex 3 {m} - 85.294199464675, 20.8244809489993, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {6a721658-2ddb-4609-9d45-8a78b0403f2b}, !- Handle - Shading Surface 5, !- Name - , !- Construction Name - {16cedd9d-8ae0-4570-994c-b12275538664}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 85.294199464675, 20.8244809489993, 12, !- X,Y,Z Vertex 1 {m} - 70.7449338373023, 66.6758722426726, 12, !- X,Y,Z Vertex 2 {m} - 30.2796287160267, 52.8475091302301, 12, !- X,Y,Z Vertex 3 {m} - 22.4022022871208, 76.7260734897353, 12, !- X,Y,Z Vertex 4 {m} - 2.82938117379672e-011, 69.3890568426019, 12, !- X,Y,Z Vertex 5 {m} - 23.4682228098658, 3.99404363404798e-005, 12; !- X,Y,Z Vertex 6 {m} - -OS:ShadingSurface, - {3934aba2-b62a-435d-8a5c-87b2e04f9151}, !- Handle - Shading Surface 6, !- Name - , !- Construction Name - {16cedd9d-8ae0-4570-994c-b12275538664}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 30.2796287160267, 52.8475091302301, 12, !- X,Y,Z Vertex 1 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 2 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 3 {m} - 22.4022022871208, 76.7260734897353, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {e47ab277-3ab4-4499-b10f-0b713a56059d}, !- Handle - Shading Surface 7, !- Name - , !- Construction Name - {16cedd9d-8ae0-4570-994c-b12275538664}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 1 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 2 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 3 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 4 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 5 {m} - 85.294199464675, 20.8244809489993, 0; !- X,Y,Z Vertex 6 {m} - -OS:ShadingSurface, - {a9ac6613-61dd-4c0c-b0f3-36e6c8fdd8b5}, !- Handle - Shading Surface 8, !- Name - , !- Construction Name - {16cedd9d-8ae0-4570-994c-b12275538664}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 85.294199464675, 20.8244809489993, 12, !- X,Y,Z Vertex 1 {m} - 85.294199464675, 20.8244809489993, 0, !- X,Y,Z Vertex 2 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 3 {m} - 70.7449338373023, 66.6758722426726, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurfaceGroup, - {a72db9fb-1393-4f51-84a7-9abf336d51bd}, !- Handle - Building Hospital 1 Space 1, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {3d30c45a-50fa-48f1-81fb-4ffbea99ac6c}, !- Handle - Shading Surface 9, !- Name - , !- Construction Name - {a72db9fb-1393-4f51-84a7-9abf336d51bd}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 70.7449338373023, 66.6758722426726, 18, !- X,Y,Z Vertex 1 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 2 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 3 {m} - 30.2796287160267, 52.8475091302301, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {3b5abec1-5300-4d07-9054-f991fbaaee30}, !- Handle - Shading Surface 10, !- Name - , !- Construction Name - {a72db9fb-1393-4f51-84a7-9abf336d51bd}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 22.4022022871208, 76.7260734897353, 18, !- X,Y,Z Vertex 1 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 2 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 3 {m} - 2.82938117379672e-011, 69.3890568426019, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {23e2f3c5-1ad7-4ab9-bd3b-5279c52e3c36}, !- Handle - Shading Surface 11, !- Name - , !- Construction Name - {a72db9fb-1393-4f51-84a7-9abf336d51bd}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 2.82938117379672e-011, 69.3890568426019, 18, !- X,Y,Z Vertex 1 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 2 {m} - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 3 {m} - 23.4682228098658, 3.99404363404798e-005, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {fcd4c93e-e2ef-434d-b26e-700582a234b4}, !- Handle - Shading Surface 12, !- Name - , !- Construction Name - {a72db9fb-1393-4f51-84a7-9abf336d51bd}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 85.294199464675, 20.8244809489993, 18, !- X,Y,Z Vertex 1 {m} - 85.294199464675, 20.8244809489993, 0, !- X,Y,Z Vertex 2 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 3 {m} - 70.7449338373023, 66.6758722426726, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {87c593ce-3eae-4e24-a299-0c208a57d23e}, !- Handle - Shading Surface 13, !- Name - , !- Construction Name - {a72db9fb-1393-4f51-84a7-9abf336d51bd}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 1 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 2 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 3 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 4 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 5 {m} - 85.294199464675, 20.8244809489993, 0; !- X,Y,Z Vertex 6 {m} - -OS:ShadingSurface, - {227b492c-c85d-4e16-bb99-bb9b980c5080}, !- Handle - Shading Surface 14, !- Name - , !- Construction Name - {a72db9fb-1393-4f51-84a7-9abf336d51bd}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 85.294199464675, 20.8244809489993, 18, !- X,Y,Z Vertex 1 {m} - 70.7449338373023, 66.6758722426726, 18, !- X,Y,Z Vertex 2 {m} - 30.2796287160267, 52.8475091302301, 18, !- X,Y,Z Vertex 3 {m} - 22.4022022871208, 76.7260734897353, 18, !- X,Y,Z Vertex 4 {m} - 2.82938117379672e-011, 69.3890568426019, 18, !- X,Y,Z Vertex 5 {m} - 23.4682228098658, 3.99404363404798e-005, 18; !- X,Y,Z Vertex 6 {m} - -OS:ShadingSurface, - {11212800-0b96-4a3d-98f0-ecc076fd23b8}, !- Handle - Shading Surface 15, !- Name - , !- Construction Name - {a72db9fb-1393-4f51-84a7-9abf336d51bd}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 23.4682228098658, 3.99404363404798e-005, 18, !- X,Y,Z Vertex 1 {m} - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 2 {m} - 85.294199464675, 20.8244809489993, 0, !- X,Y,Z Vertex 3 {m} - 85.294199464675, 20.8244809489993, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {6079a8f4-a09b-45fa-839e-e02551581060}, !- Handle - Shading Surface 16, !- Name - , !- Construction Name - {a72db9fb-1393-4f51-84a7-9abf336d51bd}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 30.2796287160267, 52.8475091302301, 18, !- X,Y,Z Vertex 1 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 2 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 3 {m} - 22.4022022871208, 76.7260734897353, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurfaceGroup, - {275b837e-8267-434d-9227-53e8897c1a7e}, !- Handle - Building Hospital 1 Space 2, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {87448001-0092-4797-b988-dc8a10ecaedb}, !- Handle - Shading Surface 17, !- Name - , !- Construction Name - {275b837e-8267-434d-9227-53e8897c1a7e}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 1 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 2 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 3 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 4 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 5 {m} - 85.294199464675, 20.8244809489993, 0; !- X,Y,Z Vertex 6 {m} - -OS:ShadingSurface, - {4ba5fc28-7eaf-42f3-ac7a-2930b9a354f0}, !- Handle - Shading Surface 18, !- Name - , !- Construction Name - {275b837e-8267-434d-9227-53e8897c1a7e}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 70.7449338373023, 66.6758722426726, 9, !- X,Y,Z Vertex 1 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 2 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 3 {m} - 30.2796287160267, 52.8475091302301, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {35a25b9c-dbdf-4190-a280-f3b262af5dc1}, !- Handle - Shading Surface 19, !- Name - , !- Construction Name - {275b837e-8267-434d-9227-53e8897c1a7e}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 23.4682228098658, 3.99404363404798e-005, 9, !- X,Y,Z Vertex 1 {m} - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 2 {m} - 85.294199464675, 20.8244809489993, 0, !- X,Y,Z Vertex 3 {m} - 85.294199464675, 20.8244809489993, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {2eddb0a2-b2aa-427a-b600-a323bcb0b14d}, !- Handle - Shading Surface 20, !- Name - , !- Construction Name - {275b837e-8267-434d-9227-53e8897c1a7e}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 30.2796287160267, 52.8475091302301, 9, !- X,Y,Z Vertex 1 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 2 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 3 {m} - 22.4022022871208, 76.7260734897353, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {65da3f93-732d-44b9-8879-6a343db1f42c}, !- Handle - Shading Surface 21, !- Name - , !- Construction Name - {275b837e-8267-434d-9227-53e8897c1a7e}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 85.294199464675, 20.8244809489993, 9, !- X,Y,Z Vertex 1 {m} - 70.7449338373023, 66.6758722426726, 9, !- X,Y,Z Vertex 2 {m} - 30.2796287160267, 52.8475091302301, 9, !- X,Y,Z Vertex 3 {m} - 22.4022022871208, 76.7260734897353, 9, !- X,Y,Z Vertex 4 {m} - 2.82938117379672e-011, 69.3890568426019, 9, !- X,Y,Z Vertex 5 {m} - 23.4682228098658, 3.99404363404798e-005, 9; !- X,Y,Z Vertex 6 {m} - -OS:ShadingSurface, - {f1318c42-6069-44b7-9b01-874e2f45daa5}, !- Handle - Shading Surface 22, !- Name - , !- Construction Name - {275b837e-8267-434d-9227-53e8897c1a7e}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 2.82938117379672e-011, 69.3890568426019, 9, !- X,Y,Z Vertex 1 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 2 {m} - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 3 {m} - 23.4682228098658, 3.99404363404798e-005, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {cefbf3a1-1215-4d19-9bfa-83a9bc6195d5}, !- Handle - Shading Surface 23, !- Name - , !- Construction Name - {275b837e-8267-434d-9227-53e8897c1a7e}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 22.4022022871208, 76.7260734897353, 9, !- X,Y,Z Vertex 1 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 2 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 3 {m} - 2.82938117379672e-011, 69.3890568426019, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {8d1bfd15-b36e-4be3-acd7-addd39f4db51}, !- Handle - Shading Surface 24, !- Name - , !- Construction Name - {275b837e-8267-434d-9227-53e8897c1a7e}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 85.294199464675, 20.8244809489993, 9, !- X,Y,Z Vertex 1 {m} - 85.294199464675, 20.8244809489993, 0, !- X,Y,Z Vertex 2 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 3 {m} - 70.7449338373023, 66.6758722426726, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurfaceGroup, - {b6455bfa-f0c9-4bd8-80bb-7b4eeb34dfae}, !- Handle - Building Hospital 1 Space 3, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {35a7eb7c-2a16-4e01-89b7-f00a35adf221}, !- Handle - Shading Surface 25, !- Name - , !- Construction Name - {b6455bfa-f0c9-4bd8-80bb-7b4eeb34dfae}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 1 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 2 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 3 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 4 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 5 {m} - 85.294199464675, 20.8244809489993, 0; !- X,Y,Z Vertex 6 {m} - -OS:ShadingSurface, - {0b67fa7e-3fa5-4b23-82b9-ceda7fec19f0}, !- Handle - Shading Surface 26, !- Name - , !- Construction Name - {b6455bfa-f0c9-4bd8-80bb-7b4eeb34dfae}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 2.82938117379672e-011, 69.3890568426019, 9, !- X,Y,Z Vertex 1 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 2 {m} - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 3 {m} - 23.4682228098658, 3.99404363404798e-005, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {278f723f-1311-4bb9-bc97-88834b94ebbe}, !- Handle - Shading Surface 27, !- Name - , !- Construction Name - {b6455bfa-f0c9-4bd8-80bb-7b4eeb34dfae}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 22.4022022871208, 76.7260734897353, 9, !- X,Y,Z Vertex 1 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 2 {m} - 2.82938117379672e-011, 69.3890568426019, 0, !- X,Y,Z Vertex 3 {m} - 2.82938117379672e-011, 69.3890568426019, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {e136bf8d-6340-4f04-90f0-496f938f8b59}, !- Handle - Shading Surface 28, !- Name - , !- Construction Name - {b6455bfa-f0c9-4bd8-80bb-7b4eeb34dfae}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 30.2796287160267, 52.8475091302301, 9, !- X,Y,Z Vertex 1 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 2 {m} - 22.4022022871208, 76.7260734897353, 0, !- X,Y,Z Vertex 3 {m} - 22.4022022871208, 76.7260734897353, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {61396ce9-f938-4568-bca7-2776402e71d3}, !- Handle - Shading Surface 29, !- Name - , !- Construction Name - {b6455bfa-f0c9-4bd8-80bb-7b4eeb34dfae}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 85.294199464675, 20.8244809489993, 9, !- X,Y,Z Vertex 1 {m} - 85.294199464675, 20.8244809489993, 0, !- X,Y,Z Vertex 2 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 3 {m} - 70.7449338373023, 66.6758722426726, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {72064ae1-17cf-435c-be0e-c96c1cdbf3f6}, !- Handle - Shading Surface 30, !- Name - , !- Construction Name - {b6455bfa-f0c9-4bd8-80bb-7b4eeb34dfae}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 23.4682228098658, 3.99404363404798e-005, 9, !- X,Y,Z Vertex 1 {m} - 23.4682228098658, 3.99404363404798e-005, 0, !- X,Y,Z Vertex 2 {m} - 85.294199464675, 20.8244809489993, 0, !- X,Y,Z Vertex 3 {m} - 85.294199464675, 20.8244809489993, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {c25a708d-b476-4c89-8a01-26282e840dfd}, !- Handle - Shading Surface 31, !- Name - , !- Construction Name - {b6455bfa-f0c9-4bd8-80bb-7b4eeb34dfae}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 85.294199464675, 20.8244809489993, 9, !- X,Y,Z Vertex 1 {m} - 70.7449338373023, 66.6758722426726, 9, !- X,Y,Z Vertex 2 {m} - 30.2796287160267, 52.8475091302301, 9, !- X,Y,Z Vertex 3 {m} - 22.4022022871208, 76.7260734897353, 9, !- X,Y,Z Vertex 4 {m} - 2.82938117379672e-011, 69.3890568426019, 9, !- X,Y,Z Vertex 5 {m} - 23.4682228098658, 3.99404363404798e-005, 9; !- X,Y,Z Vertex 6 {m} - -OS:ShadingSurface, - {5c769bb9-4e7e-45be-b698-dcc6b4324683}, !- Handle - Shading Surface 32, !- Name - , !- Construction Name - {b6455bfa-f0c9-4bd8-80bb-7b4eeb34dfae}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 70.7449338373023, 66.6758722426726, 9, !- X,Y,Z Vertex 1 {m} - 70.7449338373023, 66.6758722426726, 0, !- X,Y,Z Vertex 2 {m} - 30.2796287160267, 52.8475091302301, 0, !- X,Y,Z Vertex 3 {m} - 30.2796287160267, 52.8475091302301, 9; !- X,Y,Z Vertex 4 {m} OS:DefaultScheduleSet, {ea4c314b-cb52-42d7-bae2-b2386b9ba551}, !- Handle diff --git a/example_project/osm_building/9.osm b/example_project/osm_building/9.osm index 9304bc0fe..8d8055b9d 100644 --- a/example_project/osm_building/9.osm +++ b/example_project/osm_building/9.osm @@ -11045,670 +11045,6 @@ OS:SubSurface, 39.6648121327813, 0.0242222077239092, 6.762, !- X,Y,Z Vertex 3 {m} 39.6648121327813, 0.0242222077239092, 7.66236300529803; !- X,Y,Z Vertex 4 {m} -OS:ShadingSurfaceGroup, - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Handle - Building Hospital 2 Space, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {5b44bcbb-2da4-4b65-bcfb-922b08c25cbc}, !- Handle - Shading Surface 1, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 12, !- X,Y,Z Vertex 1 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 2 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 3 {m} - 38.011752475536, 132.104208939642, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {061f71b9-7bb2-49b1-b9c9-392a73d4af33}, !- Handle - Shading Surface 2, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 39.6728097071079, 0.000114142581935539, 12, !- X,Y,Z Vertex 1 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 2 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {0c384343-69c5-4bb8-adab-04270c0380f0}, !- Handle - Shading Surface 3, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.7174483069551, 49.3085823766617, 12, !- X,Y,Z Vertex 1 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 157.025396016076, 84.9651017842731, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {d7f7ad8d-6502-4622-ae8f-d564236a153d}, !- Handle - Shading Surface 4, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 12, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 12, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 12, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 12, !- X,Y,Z Vertex 4 {m} - 48.7174483069551, 49.3085823766617, 12, !- X,Y,Z Vertex 5 {m} - 157.025396016076, 84.9651017842731, 12, !- X,Y,Z Vertex 6 {m} - 142.401172155441, 129.065284181841, 12, !- X,Y,Z Vertex 7 {m} - 48.6737398372909, 98.2089871609509, 12; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurface, - {ca99d4f4-c45c-4e11-9c04-f0d185952be4}, !- Handle - Shading Surface 5, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 4 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 5 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 6 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 7 {m} - 38.011752475536, 132.104208939642, 0; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurface, - {eeb9aad7-0982-40ec-b9f3-a482e5e85a5b}, !- Handle - Shading Surface 6, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 142.401172155441, 129.065284181841, 12, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 3 {m} - 48.6737398372909, 98.2089871609509, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {56192a03-5174-497c-90ea-587ab02d7536}, !- Handle - Shading Surface 7, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - -1.86645365829463e-010, 119.590710206907, 12, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 3 {m} - 39.6728097071079, 0.000114142581935539, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {6a2e90c7-46c6-4ec8-94f0-039bcd2aff21}, !- Handle - Shading Surface 8, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 157.025396016076, 84.9651017842731, 12, !- X,Y,Z Vertex 1 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 2 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 3 {m} - 142.401172155441, 129.065284181841, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {b746c29c-6d98-433a-8e1a-2c972c485104}, !- Handle - Shading Surface 9, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 12, !- X,Y,Z Vertex 1 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 2 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 3 {m} - -1.86645365829463e-010, 119.590710206907, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {2f8d0b96-1e68-4561-9ddb-05f5b1f39a3e}, !- Handle - Shading Surface 10, !- Name - , !- Construction Name - {ab4a58dd-d438-4b70-8cd5-be155170d75f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 62.2358846407182, 7.70403013445575, 12, !- X,Y,Z Vertex 1 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 2 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 12; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurfaceGroup, - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Handle - Building Hospital 2 Space 1, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {daa0afd2-7a3a-48b0-82f4-4bdb110e615a}, !- Handle - Shading Surface 11, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 4 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 5 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 6 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 7 {m} - 38.011752475536, 132.104208939642, 0; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurface, - {33ef295b-e437-4a61-807f-9d86a6dce7b0}, !- Handle - Shading Surface 12, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 39.6728097071079, 0.000114142581935539, 18, !- X,Y,Z Vertex 1 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 2 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {48d4dd95-8443-4abd-80fa-519ba8a103ae}, !- Handle - Shading Surface 13, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 157.025396016076, 84.9651017842731, 18, !- X,Y,Z Vertex 1 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 2 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 3 {m} - 142.401172155441, 129.065284181841, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {fc51197e-cfbd-46ac-8fdc-b78a1ec2d7e1}, !- Handle - Shading Surface 14, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 142.401172155441, 129.065284181841, 18, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 3 {m} - 48.6737398372909, 98.2089871609509, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {1d26a7c4-dd2a-4607-af52-9dbbadc303b1}, !- Handle - Shading Surface 15, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 18, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 18, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 18, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 18, !- X,Y,Z Vertex 4 {m} - 48.7174483069551, 49.3085823766617, 18, !- X,Y,Z Vertex 5 {m} - 157.025396016076, 84.9651017842731, 18, !- X,Y,Z Vertex 6 {m} - 142.401172155441, 129.065284181841, 18, !- X,Y,Z Vertex 7 {m} - 48.6737398372909, 98.2089871609509, 18; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurface, - {20b7cba5-1944-49e9-a85d-99a068143c22}, !- Handle - Shading Surface 16, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.7174483069551, 49.3085823766617, 18, !- X,Y,Z Vertex 1 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 157.025396016076, 84.9651017842731, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {5949e0e0-d79a-4c0e-934b-64dbc42909f0}, !- Handle - Shading Surface 17, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - -1.86645365829463e-010, 119.590710206907, 18, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 3 {m} - 39.6728097071079, 0.000114142581935539, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {34543af7-5e3e-4ead-9624-e0336b080053}, !- Handle - Shading Surface 18, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 18, !- X,Y,Z Vertex 1 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 2 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 3 {m} - -1.86645365829463e-010, 119.590710206907, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {82cbd689-d1d8-4008-8b89-55e011c3bdd7}, !- Handle - Shading Surface 19, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 18, !- X,Y,Z Vertex 1 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 2 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 3 {m} - 38.011752475536, 132.104208939642, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {b321959b-ac6d-466f-826a-268b6256424d}, !- Handle - Shading Surface 20, !- Name - , !- Construction Name - {86d6cc2a-3551-4e71-a006-7a48f78bb61f}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 62.2358846407182, 7.70403013445575, 18, !- X,Y,Z Vertex 1 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 2 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 18; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurfaceGroup, - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Handle - Building Hospital 2 Space 2, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {c81c662f-9cb1-453d-a719-dd51143bf057}, !- Handle - Shading Surface 21, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - -1.86645365829463e-010, 119.590710206907, 30, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 3 {m} - 39.6728097071079, 0.000114142581935539, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {c5e82e8b-abfa-473c-af0e-1a977fcd16ed}, !- Handle - Shading Surface 22, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 62.2358846407182, 7.70403013445575, 30, !- X,Y,Z Vertex 1 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 2 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {2288e49f-09fd-4907-a27b-0f73aad9c2a6}, !- Handle - Shading Surface 23, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 30, !- X,Y,Z Vertex 1 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 2 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 3 {m} - 38.011752475536, 132.104208939642, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {7ee1e936-e32e-4fcc-bdc1-4c1ee93c3035}, !- Handle - Shading Surface 24, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 39.6728097071079, 0.000114142581935539, 30, !- X,Y,Z Vertex 1 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 2 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {a5a7bbe2-04f9-413c-a335-c422c5d3aa48}, !- Handle - Shading Surface 25, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 30, !- X,Y,Z Vertex 1 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 2 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 3 {m} - -1.86645365829463e-010, 119.590710206907, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {5326fcee-06b0-4cbe-a20e-ef78a136395a}, !- Handle - Shading Surface 26, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 157.025396016076, 84.9651017842731, 30, !- X,Y,Z Vertex 1 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 2 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 3 {m} - 142.401172155441, 129.065284181841, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {def00a20-81b8-4ed1-b82e-f24e40a76260}, !- Handle - Shading Surface 27, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 4 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 5 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 6 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 7 {m} - 38.011752475536, 132.104208939642, 0; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurface, - {adf168e6-1668-42b3-b8d7-7954b03ea207}, !- Handle - Shading Surface 28, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 30, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 30, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 30, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 30, !- X,Y,Z Vertex 4 {m} - 48.7174483069551, 49.3085823766617, 30, !- X,Y,Z Vertex 5 {m} - 157.025396016076, 84.9651017842731, 30, !- X,Y,Z Vertex 6 {m} - 142.401172155441, 129.065284181841, 30, !- X,Y,Z Vertex 7 {m} - 48.6737398372909, 98.2089871609509, 30; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurface, - {c3f39428-858b-4b3b-9f4c-795b17c4e7f2}, !- Handle - Shading Surface 29, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 142.401172155441, 129.065284181841, 30, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 3 {m} - 48.6737398372909, 98.2089871609509, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {72a2ab1c-a0ea-4fb9-bef5-86ded22923fd}, !- Handle - Shading Surface 30, !- Name - , !- Construction Name - {0c169f53-96d0-4312-88cf-4957681a308a}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.7174483069551, 49.3085823766617, 30, !- X,Y,Z Vertex 1 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 157.025396016076, 84.9651017842731, 30; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurfaceGroup, - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Handle - Building Hospital 2 Space 3, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {03fbca59-aef0-436c-965f-3ce07b48a40e}, !- Handle - Shading Surface 31, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 4 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 5 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 6 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 7 {m} - 38.011752475536, 132.104208939642, 0; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurface, - {fa1b11a4-c01b-4320-aa5f-c1d4e508bde9}, !- Handle - Shading Surface 32, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 157.025396016076, 84.9651017842731, 24, !- X,Y,Z Vertex 1 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 2 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 3 {m} - 142.401172155441, 129.065284181841, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {e6b7c56b-256d-4e7a-9e86-3e7dc5c633dc}, !- Handle - Shading Surface 33, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 142.401172155441, 129.065284181841, 24, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 3 {m} - 48.6737398372909, 98.2089871609509, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {a7ab90ec-3fc6-414d-b2fd-4f4db26bd3bf}, !- Handle - Shading Surface 34, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.7174483069551, 49.3085823766617, 24, !- X,Y,Z Vertex 1 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 157.025396016076, 84.9651017842731, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {782e45a0-a05c-49fd-89c0-2bb8e56ad9ed}, !- Handle - Shading Surface 35, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 62.2358846407182, 7.70403013445575, 24, !- X,Y,Z Vertex 1 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 2 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {7fd7eb40-9d07-4d15-9511-b7d4591b4479}, !- Handle - Shading Surface 36, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 24, !- X,Y,Z Vertex 1 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 2 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 3 {m} - -1.86645365829463e-010, 119.590710206907, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {a469b3a2-c36c-4f44-b3d6-635c872e3acc}, !- Handle - Shading Surface 37, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 39.6728097071079, 0.000114142581935539, 24, !- X,Y,Z Vertex 1 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 2 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {e575c754-4fa2-457c-98b3-6e9e04dce989}, !- Handle - Shading Surface 38, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - -1.86645365829463e-010, 119.590710206907, 24, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 3 {m} - 39.6728097071079, 0.000114142581935539, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {dbdb6e9a-cb43-44d5-9275-284449214fde}, !- Handle - Shading Surface 39, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 24, !- X,Y,Z Vertex 1 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 2 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 3 {m} - 38.011752475536, 132.104208939642, 24; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {2cceec04-e8f2-4328-ace1-c6b7185d08b4}, !- Handle - Shading Surface 40, !- Name - , !- Construction Name - {ccd999f9-65a7-47fc-93a0-db32307e0365}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 24, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 24, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 24, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 24, !- X,Y,Z Vertex 4 {m} - 48.7174483069551, 49.3085823766617, 24, !- X,Y,Z Vertex 5 {m} - 157.025396016076, 84.9651017842731, 24, !- X,Y,Z Vertex 6 {m} - 142.401172155441, 129.065284181841, 24, !- X,Y,Z Vertex 7 {m} - 48.6737398372909, 98.2089871609509, 24; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurfaceGroup, - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Handle - Building Hospital 2 Space 4, !- Name - Building; !- Shading Surface Type - -OS:ShadingSurface, - {68cf7aa7-b917-49e9-963a-889adf69cb25}, !- Handle - Shading Surface 41, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 157.025396016076, 84.9651017842731, 9, !- X,Y,Z Vertex 1 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 2 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 3 {m} - 142.401172155441, 129.065284181841, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {104acc47-4fee-470e-b86c-d2f6d5940ea5}, !- Handle - Shading Surface 42, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.7174483069551, 49.3085823766617, 9, !- X,Y,Z Vertex 1 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 157.025396016076, 84.9651017842731, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {19120ffe-99a9-4f27-af31-4212e331dcef}, !- Handle - Shading Surface 43, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 142.401172155441, 129.065284181841, 9, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 3 {m} - 48.6737398372909, 98.2089871609509, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {f00e2560-f6a3-4a3a-8d18-e9b0fde44583}, !- Handle - Shading Surface 44, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 9, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 9, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 9, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 9, !- X,Y,Z Vertex 4 {m} - 48.7174483069551, 49.3085823766617, 9, !- X,Y,Z Vertex 5 {m} - 157.025396016076, 84.9651017842731, 9, !- X,Y,Z Vertex 6 {m} - 142.401172155441, 129.065284181841, 9, !- X,Y,Z Vertex 7 {m} - 48.6737398372909, 98.2089871609509, 9; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurface, - {6facc252-c298-47b5-a721-2d9da3ac46bc}, !- Handle - Shading Surface 45, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 1 {m} - 142.401172155441, 129.065284181841, 0, !- X,Y,Z Vertex 2 {m} - 157.025396016076, 84.9651017842731, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 4 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 5 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 6 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 7 {m} - 38.011752475536, 132.104208939642, 0; !- X,Y,Z Vertex 8 {m} - -OS:ShadingSurface, - {93c84e1e-e930-4b79-a512-87707c0ff662}, !- Handle - Shading Surface 46, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - -1.86645365829463e-010, 119.590710206907, 9, !- X,Y,Z Vertex 1 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 2 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 3 {m} - 39.6728097071079, 0.000114142581935539, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {b508f7d5-eaa0-4adb-9f06-85967e993946}, !- Handle - Shading Surface 47, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 62.2358846407182, 7.70403013445575, 9, !- X,Y,Z Vertex 1 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 2 {m} - 48.7174483069551, 49.3085823766617, 0, !- X,Y,Z Vertex 3 {m} - 48.7174483069551, 49.3085823766617, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {a587df9f-7a29-4b0b-a7a6-2b9dde29f6d2}, !- Handle - Shading Surface 48, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 38.011752475536, 132.104208939642, 9, !- X,Y,Z Vertex 1 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 2 {m} - -1.86645365829463e-010, 119.590710206907, 0, !- X,Y,Z Vertex 3 {m} - -1.86645365829463e-010, 119.590710206907, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {92c342f1-b7f2-4640-8065-d57db342950e}, !- Handle - Shading Surface 49, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 39.6728097071079, 0.000114142581935539, 9, !- X,Y,Z Vertex 1 {m} - 39.6728097071079, 0.000114142581935539, 0, !- X,Y,Z Vertex 2 {m} - 62.2358846407182, 7.70403013445575, 0, !- X,Y,Z Vertex 3 {m} - 62.2358846407182, 7.70403013445575, 9; !- X,Y,Z Vertex 4 {m} - -OS:ShadingSurface, - {b53a2e1c-5571-4995-b4e2-96cf00cee13f}, !- Handle - Shading Surface 50, !- Name - , !- Construction Name - {f788b9dd-c48c-4af1-9a6a-54abe48a9770}, !- Shading Surface Group Name - , !- Transmittance Schedule Name - , !- Number of Vertices - 48.6737398372909, 98.2089871609509, 9, !- X,Y,Z Vertex 1 {m} - 48.6737398372909, 98.2089871609509, 0, !- X,Y,Z Vertex 2 {m} - 38.011752475536, 132.104208939642, 0, !- X,Y,Z Vertex 3 {m} - 38.011752475536, 132.104208939642, 9; !- X,Y,Z Vertex 4 {m} OS:DefaultScheduleSet, {aea42bf8-b160-46ac-b173-dd508fbd499f}, !- Handle From 49f8cc96b32cc9859631fc9e039451d8604730dc Mon Sep 17 00:00:00 2001 From: Tanushree Date: Fri, 22 Oct 2021 12:59:23 -0600 Subject: [PATCH 5/6] Update gemfile --- Gemfile | 40 ++++++++++++++++++++-------------------- example_project/Gemfile | 30 +++++++++++++----------------- 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index 5b75a062a..5a597b631 100644 --- a/Gemfile +++ b/Gemfile @@ -25,29 +25,29 @@ allow_local = ENV['FAVOR_LOCAL_GEMS'] # gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'develop' # end -#if allow_local && File.exist?('../urbanopt-scenario-gem') -# gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem' -#elsif allow_local - gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'comm_sol_vis' -#else -# gem 'urbanopt-scenario', '~> 0.6.0' -#end +if allow_local && File.exist?('../urbanopt-scenario-gem') + gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem' +elsif allow_local + gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop' +else + gem 'urbanopt-scenario', '~> 0.6.0' +end -#if allow_local && File.exist?('../urbanopt-reporting-gem') -# gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' -#elsif allow_local - gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'comm_sol_enhance' -#else -# gem 'urbanopt-reporting', '~> 0.4.0' -#end +if allow_local && File.exist?('../urbanopt-reporting-gem') + gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' +elsif allow_local + gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' +else + gem 'urbanopt-reporting', '~> 0.4.0' +end -#if allow_local && File.exist?('../urbanopt-geojson-gem') -# gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' -#elsif allow_local +if allow_local && File.exist?('../urbanopt-geojson-gem') + gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' +elsif allow_local gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop' -#else -# gem 'urbanopt-geojson', '~> 0.6.1' -#end +else + gem 'urbanopt-geojson', '~> 0.6.1' +end #if allow_local && File.exist?('../urbanopt-reopt-gem') # gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem' diff --git a/example_project/Gemfile b/example_project/Gemfile index e5181616d..79c38762c 100644 --- a/example_project/Gemfile +++ b/example_project/Gemfile @@ -65,22 +65,18 @@ else gem 'openstudio-calibration', '~> 0.4.0' end -#if allow_local && File.exists?('../urbanopt-geojson-gem') -# gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' -#elsif allow_local +if allow_local && File.exists?('../urbanopt-geojson-gem') + gem 'urbanopt-geojson', path: '../urbanopt-geojson-gem' +elsif allow_local gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop' -#else -# gem 'urbanopt-geojson', '~> 0.6.1' -#end - -#if allow_local && File.exists?('../urbanopt-reporting-gem') -# gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' -#elsif allow_local - gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'comm_sol_enhance' -#else -# gem 'urbanopt-reporting', '~> 0.4.0' -#end - - gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'comm_sol_vis' +else + gem 'urbanopt-geojson', '~> 0.6.1' +end - gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'comm_sol_enhance' +if allow_local && File.exists?('../urbanopt-reporting-gem') + gem 'urbanopt-reporting', path: '../urbanopt-reporting-gem' +elsif allow_local + gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' +else + gem 'urbanopt-reporting', '~> 0.4.0' +end From 14067efc3e93cc675e9fa018ba948bf43c2b28c0 Mon Sep 17 00:00:00 2001 From: Tanushree Date: Mon, 25 Oct 2021 17:37:09 -0600 Subject: [PATCH 6/6] Update gemfile paths and Rakefile visualization paths --- Gemfile | 18 +++++++++--------- Rakefile | 24 ++++++++++++++++-------- example_project/Gemfile | 4 ++-- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index 5a597b631..51c559aa8 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ if allow_local && File.exist?('../urbanopt-scenario-gem') elsif allow_local gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop' else - gem 'urbanopt-scenario', '~> 0.6.0' + gem 'urbanopt-scenario', '~> 0.6.3' end if allow_local && File.exist?('../urbanopt-reporting-gem') @@ -38,7 +38,7 @@ if allow_local && File.exist?('../urbanopt-reporting-gem') elsif allow_local gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' else - gem 'urbanopt-reporting', '~> 0.4.0' + gem 'urbanopt-reporting', '~> 0.4.2' end if allow_local && File.exist?('../urbanopt-geojson-gem') @@ -46,16 +46,16 @@ if allow_local && File.exist?('../urbanopt-geojson-gem') elsif allow_local gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop' else - gem 'urbanopt-geojson', '~> 0.6.1' + gem 'urbanopt-geojson', '~> 0.6.6' end -#if allow_local && File.exist?('../urbanopt-reopt-gem') -# gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem' -#elsif allow_local +if allow_local && File.exist?('../urbanopt-reopt-gem') + gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem' +elsif allow_local gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop' -#else -# gem 'urbanopt-reopt', '0.6.0' -#end +else + gem 'urbanopt-reopt', '0.6.2' +end if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem') gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem' diff --git a/Rakefile b/Rakefile index 0990cc4e4..5b3384b05 100644 --- a/Rakefile +++ b/Rakefile @@ -186,11 +186,16 @@ def visualize_scenarios scenario_folders = [] scenario_report_exists = false Dir.glob(File.join(run_dir, '/*_scenario')) do |scenario_folder| - scenario_report = File.join(scenario_folder, 'default_scenario_report.csv') - if File.exist?(scenario_report) - scenario_folders << scenario_folder + scenario_report = File.join(scenario_folder, 'scenario_optimization.csv') + # Check if Scenario Optimization REopt file exists and add that + if File.exist?(File.join(scenario_folder, 'scenario_optimization.csv')) + scenario_folders << File.join(scenario_folder, 'scenario_optimization.csv') scenario_report_exists = true - else + # Check if Default Feature Report exists and add that + elsif File.exist?(File.join(scenario_folder, 'default_scenario_report.csv')) + scenario_folders << File.join(scenario_folder, 'default_scenario_report.csv') + scenario_report_exists = true + elsif puts "\nERROR: Default reports not created for #{scenario_folder}. Please use 'process --default' to create default post processing reports for all scenarios first. Visualization not generated for #{scenario_folder}.\n" end end @@ -226,11 +231,14 @@ def visualize_features(scenario_file) feature_folders = [] # loop through building feature ids from scenario csv csv['Feature Id'].each do |feature| - feature_report = File.join(run_dir, feature, 'feature_reports') - if File.exist?(feature_report) + # Check if Feature Optimization REopt file exists and add that + if File.exist?(File.join(run_dir, feature, 'feature_reports/feature_optimization.csv')) + feature_report_exists = true + feature_folders << File.join(run_dir, feature, 'feature_reports/feature_optimization.csv') + elsif File.exist?(File.join(run_dir, feature, 'feature_reports/default_feature_report.csv')) feature_report_exists = true - feature_folders << File.join(run_dir, feature) - else + feature_folders << File.join(run_dir, feature, 'feature_reports/default_feature_report.csv') + elsif puts "\nERROR: Default reports not created for #{feature}. Please use 'process --default' to create default post processing reports for all features first. Visualization not generated for #{feature}.\n" end end diff --git a/example_project/Gemfile b/example_project/Gemfile index 79c38762c..271c174b0 100644 --- a/example_project/Gemfile +++ b/example_project/Gemfile @@ -70,7 +70,7 @@ if allow_local && File.exists?('../urbanopt-geojson-gem') elsif allow_local gem 'urbanopt-geojson', github: 'URBANopt/urbanopt-geojson-gem', branch: 'develop' else - gem 'urbanopt-geojson', '~> 0.6.1' + gem 'urbanopt-geojson', '~> 0.6.6' end if allow_local && File.exists?('../urbanopt-reporting-gem') @@ -78,5 +78,5 @@ if allow_local && File.exists?('../urbanopt-reporting-gem') elsif allow_local gem 'urbanopt-reporting', github: 'URBANopt/urbanopt-reporting-gem', branch: 'develop' else - gem 'urbanopt-reporting', '~> 0.4.0' + gem 'urbanopt-reporting', '~> 0.4.2' end