urbanopt-cli 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e22b9be526f415a23ef46109659ccf581b185ef20834551fc7bfcc369400def7
-  data.tar.gz: c25b11b2d634144a92415f3ad3c1ed47bab59a26db1789a39c40b60c457e674b
+  metadata.gz: 931758f051eca09e7256fc5bfab130605c65c27307a3cdc77042a263e5475609
+  data.tar.gz: f575bb0873e33c4ee5d76f44cb87fd0bc2ed5d9987902f0f9d5a9277a53a023d
 SHA512:
-  metadata.gz: a07ac41ef827b81074e867c364c39f205ffe386c21b0d6cdf1ecf8d3503b50f9b64196f28b71f8c1baeefc02dc7dfde64a5c8eef47d6f9a010764a8bb6ec5bab
-  data.tar.gz: 69145c09619fcd1e370a68a3be3e1b0a41803a27f55c69bbbcc5d5f0496213da208a20220f2bcf89f1d93e8ecfa6efe9a028f251ace9be4daacd59275ec5c74a
+  metadata.gz: 5391d6de75b610895fee3099b0913ceef87e3346e6e590ce618f360decdf250f7757cac4812cc7517c80140cc45b2575c58bef723ac91e4154cd8f40728d6246
+  data.tar.gz: 7e7a75284562d80ee26bf9b378f0bbe7746e4ea0c0e7c7345acc099efe1001a90a31e60a0c5afb9c10f034cf399318d36f819f2b7b777a855e8a871b6d7fd36f

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 0.7.0
+
+Date Range 11/4/21 - 11/22/21
+
+- Fixed [#278]( https://github.com/urbanopt/urbanopt-cli/issues/278 ), Visualizations are broken for scenarios without REopt results
+- Fixed [#275]( https://github.com/urbanopt/urbanopt-cli/issues/275 ), Skip detailed model creation workflow if create bar workflow selected and detailed osm present
+- Fixed [#272]( https://github.com/urbanopt/urbanopt-cli/issues/272 ), looking for simulations run for opendss fails when there are other folders in the run folder
+- Updated dependencies for OpenStudio 3.3
+
 ## Version 0.6.4
 
 Date Range 10/29/21 - 11/3/21

data/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2)
 cmake_policy(SET CMP0048 NEW)
 
-project(UrbanOptCLI VERSION 0.6.2)
+project(UrbanOptCLI VERSION 0.6.4)
 
 include(FindOpenStudioSDK.cmake)
 
@@ -89,16 +89,16 @@ option(BUILD_PACKAGE "Build package" OFF)
 # need to  update the MD5sum for each platform and url below
 if(UNIX)
    if(APPLE)
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210802-darwin.tar.gz ")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "5b607464c5f003477d11ddb73cb7d493")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211109-darwin.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "3eeb7ef73b990b74b714650dbd291413")
    else()
-     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210802-linux.tar.gz")
-     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "c43152b7235f70d3b875722cb83b5db8")
+     set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211109-linux.tar.gz")
+     set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "63bf2adfd5812252de77f6b35e43c09f")
    endif()
 elseif(WIN32)
   if(CMAKE_CL_64)
-    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20210809-windows.tar.gz")
-    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "240892fcd96165ce1e3ef879c0367063")
+    set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20211109-windows.tar.gz")
+    set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "ea3a4d32bf39964c1b374efa1ca6ca18")
   endif()
 endif()
 

data/FindOpenStudioSDK.cmake

@@ -1,6 +1,6 @@
 set(OPENSTUDIO_VERSION_MAJOR 3)
 set(OPENSTUDIO_VERSION_MINOR 2)
-set(OPENSTUDIO_VERSION_PATCH 0)
+set(OPENSTUDIO_VERSION_PATCH 1)
 set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
 
 find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG)
@@ -16,23 +16,23 @@ else()
   set(OPENSTUDIO_BASELINK "https://openstudio-builds.s3.amazonaws.com/${OPENSTUDIO_VERSION}"
     CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)
 
-  set(OPENSTUDIO_VERSION_SHA "+e11f0a08b2")
+  set(OPENSTUDIO_VERSION_SHA "+bdbdbc9da6")
 
   if(APPLE)
-    set(OPENSTUDIO_EXPECTED_HASH 883c0f83ab7a09875e851726e32ba591)
+    set(OPENSTUDIO_EXPECTED_HASH 5733364813912cb5256fb338faa82e47)
     set(OPENSTUDIO_PLATFORM "Darwin")
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(UNIX)
     if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
-      set(OPENSTUDIO_EXPECTED_HASH 25c4cfe614676376581657440ba447ae)
+      set(OPENSTUDIO_EXPECTED_HASH dce4f2eff5985d94255a1a49bc3aa97f)
       set(OPENSTUDIO_PLATFORM "Ubuntu-20.04")
     else() # Assumes 18.04
-      set(OPENSTUDIO_EXPECTED_HASH 623d3e10c17f1dc99bb869deb8a2550e)
+      set(OPENSTUDIO_EXPECTED_HASH 521802b1176ba7cd4a2ed4a94a347484)
       set(OPENSTUDIO_PLATFORM "Ubuntu-18.04")
     endif()
     set(OPENSTUDIO_EXT "tar.gz")
   elseif(WIN32)
-    set(OPENSTUDIO_EXPECTED_HASH 740d5d8ba67ca914412e12c618d2cc28)
+    set(OPENSTUDIO_EXPECTED_HASH 0ab2fdc4de81bd268732ffca6cb50a61)
     set(OPENSTUDIO_PLATFORM "Windows")
     set(OPENSTUDIO_EXT "tar.gz")
   endif()

data/example_files/mappers/Baseline.rb

@@ -439,16 +439,15 @@ module URBANopt
             rescue
             end
 
-            args[:simulation_control_run_period_begin_month] = 1
-            args[:simulation_control_run_period_begin_day_of_month] = 1
-            args[:simulation_control_run_period_end_month] = 12
-            args[:simulation_control_run_period_end_day_of_month] = 31
+            args[:simulation_control_run_period] = 'Jan 1 - Dec 31'
             args[:simulation_control_run_period_calendar_year] = 2007
             begin
-              args[:simulation_control_run_period_begin_month] = feature.begin_date[5, 2].to_i
-              args[:simulation_control_run_period_begin_day_of_month] = feature.begin_date[8, 2].to_i
-              args[:simulation_control_run_period_end_month] = feature.end_date[5, 2].to_i
-              args[:simulation_control_run_period_end_day_of_month] = feature.end_date[8, 2].to_i
+              abbr_monthnames = Date::ABBR_MONTHNAMES
+              begin_month = abbr_monthnames[feature.begin_date[5, 2].to_i]
+              begin_day_of_month = feature.begin_date[8, 2].to_i
+              end_month = abbr_monthnames[feature.end_date[5, 2].to_i]
+              end_day_of_month = feature.end_date[8, 2].to_i
+              args[:simulation_control_run_period] = "#{begin_month} #{begin_day_of_month} - #{end_month} #{end_day_of_month}"
               args[:simulation_control_run_period_calendar_year] = feature.begin_date[0, 4].to_i
             rescue
             end
@@ -460,15 +459,19 @@ module URBANopt
             case building_type
             when 'Single-Family Detached'
               args[:geometry_unit_type] = 'single-family detached'
+              args[:geometry_unit_num_floors_above_grade] = feature.number_of_stories_above_ground
             when 'Single-Family Attached'
               args[:geometry_building_num_units] = feature.number_of_residential_units
               args[:geometry_unit_type] = 'single-family attached'
+              args[:geometry_unit_num_floors_above_grade] = feature.number_of_stories_above_ground
             when 'Multifamily'
               args[:geometry_building_num_units] = feature.number_of_residential_units
               args[:geometry_unit_type] = 'apartment unit'
-              args[:geometry_corridor_position] = 'Double Exterior' # if we had an interior corridor, we'd have to subtract its area from the footprint area
+              args[:geometry_unit_num_floors_above_grade] = 1
             end
 
+            args[:geometry_num_floors_above_grade] = feature.number_of_stories_above_ground
+
             args[:geometry_foundation_type] = 'SlabOnGrade'
             args[:geometry_foundation_height] = 0.0
             case feature.foundation_type
@@ -489,40 +492,35 @@ module URBANopt
               args[:geometry_foundation_height] = 8.0
             end
 
-            args[:geometry_attic_type] = 'VentedAttic'
-            args[:geometry_roof_type] = 'flat'
+            args[:geometry_attic_type] = 'FlatRoof'
+            args[:geometry_roof_type] = 'gable'
             begin
               case feature.attic_type
               when 'attic - vented'
-                args[:geometry_roof_type] = 'gable'
+                args[:geometry_attic_type] = 'VentedAttic'
               when 'attic - unvented'
                 args[:geometry_attic_type] = 'UnventedAttic'
-                args[:geometry_roof_type] = 'gable'
               when 'attic - conditioned'
                 args[:geometry_attic_type] = 'ConditionedAttic'
-                args[:geometry_roof_type] = 'gable'
               end
             rescue
             end
 
-            args[:geometry_num_floors_above_grade] = feature.number_of_stories_above_ground
+            args[:geometry_unit_cfa] = feature.floor_area / args[:geometry_building_num_units]
 
-            args[:geometry_cfa] = feature.floor_area / args[:geometry_building_num_units]
+            args[:geometry_unit_num_bedrooms] = feature.number_of_bedrooms / args[:geometry_building_num_units]
 
-            args[:geometry_wall_height] = 8.0
+            args[:geometry_average_ceiling_height] = 8.0
             begin
-              args[:geometry_wall_height] = feature.maximum_roof_height / args[:geometry_num_floors_above_grade]
+              args[:geometry_average_ceiling_height] = feature.maximum_roof_height / feature.number_of_stories_above_ground
             rescue
             end
 
-            args[:geometry_num_bedrooms] = feature.number_of_bedrooms
-            args[:geometry_num_bedrooms] /= args[:geometry_building_num_units]
-
             begin
               num_garage_spaces = 0
               if feature.onsite_parking_fraction
                 num_garage_spaces = 1
-                if args[:geometry_cfa] > 2500.0
+                if args[:geometry_unit_cfa] > 2500.0
                   num_garage_spaces = 2
                 end
               end
@@ -541,9 +539,9 @@ module URBANopt
               feature_ids << feature.id
             end
 
-            args[:schedules_type] = 'stochastic'
             args[:feature_id] = feature_ids.index(feature_id)
-            args[:schedules_variation] = 'building' # building or unit
+            args[:schedules_type] = 'stochastic' # smooth or stochastic
+            args[:schedules_variation] = 'unit' # building or unit
 
             # HVAC
 
@@ -625,10 +623,12 @@ module URBANopt
                 # Determine which surfaces to place insulation on
                 if args[:geometry_foundation_type].include? 'Basement'
                   row[:foundation_wall_assembly_r] = row[:foundation_wall_assembly_r_basement]
-                  row[:floor_assembly_r] = 2.1
+                  row[:floor_over_foundation_assembly_r] = 2.1
+                  row[:floor_over_garage_assembly_r] = 2.1
                 elsif args[:geometry_foundation_type].include? 'Crawlspace'
                   row[:foundation_wall_assembly_r] = row[:foundation_wall_assembly_r_crawlspace]
-                  row[:floor_assembly_r] = 2.1
+                  row[:floor_over_foundation_assembly_r] = 2.1
+                  row[:floor_over_garage_assembly_r] = 2.1
                 end
                 row.delete(:foundation_wall_assembly_r_basement)
                 row.delete(:foundation_wall_assembly_r_crawlspace)
@@ -712,7 +712,7 @@ module URBANopt
 
             args.keys.each do |arg_name|
               unless default_args.keys.include? arg_name
-                next if [:feature_id, :schedules_variation].include?(arg_name)
+                next if [:feature_id, :schedules_type, :schedules_variation, :geometry_num_floors_above_grade].include?(arg_name)
 
                 puts "Argument '#{arg_name}' is unknown."
               end

data/example_files/mappers/CreateBar.rb

@@ -316,6 +316,13 @@ module URBANopt
             osw[:file_paths] << File.join(File.dirname(__FILE__), '../osm_building/')
             osw[:seed_file] = detailed_model_filename
 
+            # skip create_bar measure with detailed models:
+            OpenStudio::Extension.set_measure_argument(osw, 'create_bar_from_building_type_ratios', '__SKIP__', true)
+
+            # skip create typical building measure with detailed models:
+            OpenStudio::Extension.set_measure_argument(osw, 'create_typical_building_from_model', '__SKIP__', true)
+
+
             # skip PMV measure with detailed models:
             OpenStudio::Extension.set_measure_argument(osw, 'PredictedMeanVote', '__SKIP__', true)
 

data/example_files/mappers/HighEfficiency.rb

@@ -70,10 +70,11 @@ module URBANopt
           end
 
           args[:wall_assembly_r] = Float(args[:wall_assembly_r]) * 1.2 # 20% increase
-          args[:plug_loads_television_usage_multiplier] = Float(args[:plug_loads_television_usage_multiplier]) * 0.9 # 10% reduction
-          args[:plug_loads_other_usage_multiplier] = Float(args[:plug_loads_other_usage_multiplier]) * 0.9 # 10% reduction
-          args[:lighting_usage_multiplier_interior] = Float(args[:lighting_usage_multiplier_interior]) * 0.9 # 10% reduction
-          args[:lighting_usage_multiplier_exterior] = Float(args[:lighting_usage_multiplier_exterior]) * 0.9 # 10% reduction
+          args[:misc_plug_loads_television_usage_multiplier] = Float(args[:misc_plug_loads_television_usage_multiplier]) * 0.9 # 10% reduction
+          args[:misc_plug_loads_other_usage_multiplier] = Float(args[:misc_plug_loads_other_usage_multiplier]) * 0.9 # 10% reduction
+          args[:lighting_interior_usage_multiplier] = Float(args[:lighting_interior_usage_multiplier]) * 0.9 # 10% reduction
+          args[:lighting_exterior_usage_multiplier] = Float(args[:lighting_exterior_usage_multiplier]) * 0.9 # 10% reduction
+          args[:lighting_garage_usage_multiplier] = Float(args[:lighting_garage_usage_multiplier]) * 0.9 # 10% reduction
           args[:clothes_washer_usage_multiplier] = Float(args[:clothes_washer_usage_multiplier]) * 0.9 # 10% reduction
           args[:clothes_dryer_usage_multiplier] = Float(args[:clothes_dryer_usage_multiplier]) * 0.9 # 10% reduction
           args[:dishwasher_usage_multiplier] = Float(args[:dishwasher_usage_multiplier]) * 0.9 # 10% reduction

data/example_files/measures/BuildResidentialModel/measure.rb

@@ -39,15 +39,31 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
     arg.setDescription('The feature ID passed from Baseline.rb.')
     args << arg
 
+    schedules_type_choices = OpenStudio::StringVector.new
+    schedules_type_choices << 'smooth'
+    schedules_type_choices << 'stochastic'
+
+    arg = OpenStudio::Measure::OSArgument.makeChoiceArgument('schedules_type', schedules_type_choices, true)
+    arg.setDisplayName('Schedules: Type')
+    arg.setDescription('The type of occupant-related schedules to use.')
+    arg.setDefaultValue('smooth')
+    args << arg
+
     schedules_variation_choices = OpenStudio::StringVector.new
-    schedules_variation_choices << 'building'
     schedules_variation_choices << 'unit'
+    schedules_variation_choices << 'building'
 
     arg = OpenStudio::Ruleset::OSArgument.makeChoiceArgument('schedules_variation', schedules_variation_choices, true)
     arg.setDisplayName('Schedules: Variation')
     arg.setDescription('How the schedules vary.')
     args << arg
 
+    arg = OpenStudio::Measure::OSArgument::makeIntegerArgument('geometry_num_floors_above_grade', true)
+    arg.setDisplayName('Geometry: Number of Floors Above Grade')
+    arg.setUnits('#')
+    arg.setDescription("The number of floors above grade.")
+    args << arg
+
     measures_dir = File.absolute_path(File.join(File.dirname(__FILE__), '../../resources/hpxml-measures'))
     measure_subdir = 'BuildResidentialHPXML'
     full_measure_path = File.join(measures_dir, measure_subdir, 'measure.rb')
@@ -112,52 +128,55 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
 
       hpxml_path = File.expand_path("../#{unit['name']}.xml")
 
+      measures = {}
+
       # BuildResidentialHPXML
       measure_subdir = 'BuildResidentialHPXML'
       full_measure_path = File.join(measures_dir, measure_subdir, 'measure.rb')
       check_file_exists(full_measure_path, runner)
-
-      # fill the measure args hash with default values
-      measure_args = args.clone
-      measure_args.delete('feature_id')
-      measure_args.delete('schedules_variation')
-
-      measures = {}
       measures[measure_subdir] = []
 
-      # hpxml path
+      measure_args = args.clone
       measure_args['hpxml_path'] = hpxml_path
-
-      # software program
       begin
-        measure_args['software_program_used'] = File.basename(File.absolute_path(File.join(File.dirname(__FILE__), '../../..')))
+        measure_args['software_info_program_used'] = File.basename(File.absolute_path(File.join(File.dirname(__FILE__), '../../..')))
       rescue
       end
       begin
         version_rb File.absolute_path(File.join(File.dirname(__FILE__), '../../../lib/uo_cli/version.rb'))
         require version_rb
-        measure_args['software_program_version'] = URBANopt::CLI::VERSION
+        measure_args['software_info_program_version'] = URBANopt::CLI::VERSION
       rescue
       end
+      measure_args['geometry_unit_left_wall_is_adiabatic'] = unit['geometry_unit_left_wall_is_adiabatic'] if unit.keys.include?('geometry_unit_left_wall_is_adiabatic')
+      measure_args['geometry_unit_right_wall_is_adiabatic'] = unit['geometry_unit_right_wall_is_adiabatic'] if unit.keys.include?('geometry_unit_right_wall_is_adiabatic')
+      measure_args['geometry_unit_front_wall_is_adiabatic'] = unit['geometry_unit_front_wall_is_adiabatic'] if unit.keys.include?('geometry_unit_front_wall_is_adiabatic')
+      measure_args['geometry_unit_back_wall_is_adiabatic'] = unit['geometry_unit_back_wall_is_adiabatic'] if unit.keys.include?('geometry_unit_back_wall_is_adiabatic')
+      measure_args['geometry_foundation_type'] = unit['geometry_foundation_type'] if unit.keys.include?('geometry_foundation_type')
+      measure_args['geometry_attic_type'] = unit['geometry_attic_type'] if unit.keys.include?('geometry_attic_type')
+      measure_args['geometry_unit_orientation'] = unit['geometry_unit_orientation'] if unit.keys.include?('geometry_unit_orientation')
+      measure_args.delete('feature_id')
+      measure_args.delete('schedules_type')
+      measure_args.delete('schedules_variation')
+      measure_args.delete('geometry_num_floors_above_grade')
 
-      # schedules
-      measure_args['schedules_random_seed'] = args['feature_id'] * (unit_num + 1) # variation across units, but deterministic
-      if args['schedules_variation'] == 'building' && unit_num != 0 # variation by building, use already generated schedules
-        measure_args['schedules_type'] = 'user-specified'
-        measure_args['schedules_path'] = File.expand_path('../unit 1_schedules.csv')
-        measure_args.delete('schedules_random_seed')
-      end
+      measures[measure_subdir] << measure_args
 
-      # geometry
-      if unit.keys.include?('geometry_level')
-        measure_args['geometry_level'] = unit['geometry_level']
-      end
-      if unit.keys.include?('geometry_horizontal_location')
-        measure_args['geometry_horizontal_location'] = unit['geometry_horizontal_location']
-      end
-      if unit.keys.include?('geometry_orientation')
-        measure_args['geometry_orientation'] = unit['geometry_orientation']
+      # BuildResidentialScheduleFile
+      measure_subdir = 'BuildResidentialScheduleFile'
+      full_measure_path = File.join(measures_dir, measure_subdir, 'measure.rb')
+      check_file_exists(full_measure_path, runner)
+      measures[measure_subdir] = []
+
+      measure_args = {}
+      measure_args['hpxml_path'] = hpxml_path
+      measure_args['hpxml_output_path'] = hpxml_path
+      measure_args['schedules_type'] = args['schedules_type']
+      measure_args['schedules_random_seed'] = args['feature_id'] # variation by building; deterministic
+      if args['schedules_variation'] == 'unit' 
+        measure_args['schedules_random_seed'] *= (unit_num + 1) # variation across units; deterministic
       end
+      measure_args['output_csv_path'] = File.expand_path("../#{unit['name']}.csv")
 
       measures[measure_subdir] << measure_args
 
@@ -165,14 +184,13 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
       measure_subdir = 'HPXMLtoOpenStudio'
       full_measure_path = File.join(measures_dir, measure_subdir, 'measure.rb')
       check_file_exists(full_measure_path, runner)
+      measures[measure_subdir] = []
 
-      # fill the measure args hash with default values
       measure_args = {}
-
-      measures[measure_subdir] = []
       measure_args['hpxml_path'] = hpxml_path
       measure_args['output_dir'] = File.expand_path('..')
       measure_args['debug'] = true
+
       measures[measure_subdir] << measure_args
 
       if not apply_child_measures(measures_dir, measures, runner, unit_model, workflow_json, "#{unit['name']}.osw", true)
@@ -213,7 +231,7 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
       unit_model.getBuilding.setStandardsBuildingType('Residential')
       unit_model.getBuilding.setStandardsNumberOfAboveGroundStories(standards_number_of_above_ground_stories)
       unit_model.getBuilding.setStandardsNumberOfStories(standards_number_of_stories)
-      unit_model.getBuilding.setNominalFloortoFloorHeight(Float(args['geometry_wall_height']))
+      unit_model.getBuilding.setNominalFloortoFloorHeight(Float(args['geometry_average_ceiling_height']))
       unit_model.getBuilding.setStandardsNumberOfLivingUnits(standards_number_of_living_units)
       unit_model.getBuilding.additionalProperties.setFeature('NumberOfConditionedStories', number_of_conditioned_stories)
 
@@ -268,65 +286,80 @@ class BuildResidentialModel < OpenStudio::Measure::ModelMeasure
     elsif args['geometry_unit_type'] == 'single-family attached'
       (1..args['geometry_building_num_units']).to_a.each do |unit_num|
         if unit_num == 1
-          units << {'name' => "unit #{unit_num}", 'geometry_horizontal_location' => 'Left'}
+          units << {'name' => "unit #{unit_num}",
+                    'geometry_unit_left_wall_is_adiabatic' => true}
         elsif unit_num == args['geometry_building_num_units']
-          units << {'name' => "unit #{unit_num}", 'geometry_horizontal_location' => 'Right'}
+          units << {'name' => "unit #{unit_num}",
+                    'geometry_unit_right_wall_is_adiabatic' => true}
         else
-          units << {'name' => "unit #{unit_num}", 'geometry_horizontal_location' => 'Middle'}
+          units << {'name' => "unit #{unit_num}",
+                    'geometry_unit_left_wall_is_adiabatic' => true,
+                    'geometry_unit_right_wall_is_adiabatic' => true}
         end
       end
     elsif args['geometry_unit_type'] == 'apartment unit'
-      if args['geometry_corridor_position'] == 'Double Exterior'
+      num_units_per_floor = (Float(args['geometry_building_num_units']) / Float(args['geometry_num_floors_above_grade'])).ceil
+      if num_units_per_floor == 1
+        runner.registerError("num_units_per_floor='#{num_units_per_floor}' not supported.")
+        return units
+      end
+
+      floor = 1
+      position = 1
+      (1..args['geometry_building_num_units']).to_a.each do |unit_num|
 
-        num_units_per_floor = (Float(args['geometry_building_num_units']) / Float(args['geometry_num_floors_above_grade'])).ceil
-        if num_units_per_floor == 1
-          runner.registerError("num_units_per_floor='#{num_units_per_floor}' not supported.")
-          return units
+        geometry_unit_orientation = 180.0
+        if position.even?
+          geometry_unit_orientation = 0.0
         end
 
-        floor = 1
-        position = 1
-        (1..args['geometry_building_num_units']).to_a.each do |unit_num|
+        geometry_unit_left_wall_is_adiabatic = true
+        geometry_unit_right_wall_is_adiabatic = true
+        geometry_unit_front_wall_is_adiabatic = true
+        geometry_unit_back_wall_is_adiabatic = false
+
+        if position == 1
+          geometry_unit_right_wall_is_adiabatic = false
+        elsif position == 2
+          geometry_unit_left_wall_is_adiabatic = false
+        elsif position == num_units_per_floor and num_units_per_floor.even?
+          geometry_unit_right_wall_is_adiabatic = false
+        elsif position == num_units_per_floor and num_units_per_floor.odd?
+          geometry_unit_left_wall_is_adiabatic = false
+        elsif position + 1 == num_units_per_floor and num_units_per_floor.even?
+          geometry_unit_left_wall_is_adiabatic = false
+        elsif position + 1 == num_units_per_floor and num_units_per_floor.odd?
+          geometry_unit_right_wall_is_adiabatic = false
+        end
 
-          geometry_orientation = 180.0
-          if position.even?
-            geometry_orientation = 0.0
-          end
-
-          geometry_horizontal_location = 'Middle'
-          if position == 1
-            geometry_horizontal_location = 'Left'
-          elsif position == 2
-            geometry_horizontal_location = 'Right'
-          elsif position == num_units_per_floor and num_units_per_floor.even?
-            geometry_horizontal_location = 'Left'
-          elsif position == num_units_per_floor and num_units_per_floor.odd?
-            geometry_horizontal_location = 'Right'
-          elsif position + 1 == num_units_per_floor and num_units_per_floor.even?
-            geometry_horizontal_location = 'Right'
-          elsif position + 1 == num_units_per_floor and num_units_per_floor.odd?
-            geometry_horizontal_location = 'Left'
-          end
+        geometry_foundation_type = args['geometry_foundation_type']
+        geometry_attic_type = args['geometry_attic_type']
 
+        if Float(args['geometry_num_floors_above_grade']) > 1
           if floor == 1
-            geometry_level = 'Bottom'
+            geometry_attic_type = 'BelowApartment'
           elsif floor == args['geometry_num_floors_above_grade']
-            geometry_level = 'Top'
+            geometry_foundation_type = 'AboveApartment'
           else
-            geometry_level = 'Middle'
-          end
-
-          if unit_num % num_units_per_floor == 0
-            floor += 1
-            position = 0
+            geometry_foundation_type = 'AboveApartment'
+            geometry_attic_type = 'BelowApartment'
           end
-          position += 1
+        end
 
-          units << {'name' => "unit #{unit_num}", 'geometry_horizontal_location' => geometry_horizontal_location, 'geometry_level' => geometry_level, 'geometry_orientation' => geometry_orientation}
+        if unit_num % num_units_per_floor == 0
+          floor += 1
+          position = 0
         end
-      else
-        runner.registerError("geometry_corridor_position='#{args['geometry_corridor_position']}' not supported.")
-        return units
+        position += 1
+
+        units << {'name' => "unit #{unit_num}",
+                  'geometry_unit_left_wall_is_adiabatic' => geometry_unit_left_wall_is_adiabatic,
+                  'geometry_unit_right_wall_is_adiabatic' => geometry_unit_right_wall_is_adiabatic,
+                  'geometry_unit_front_wall_is_adiabatic' => geometry_unit_front_wall_is_adiabatic,
+                  'geometry_unit_back_wall_is_adiabatic' => geometry_unit_back_wall_is_adiabatic,
+                  'geometry_foundation_type' => geometry_foundation_type,
+                  'geometry_attic_type' => geometry_attic_type,
+                  'geometry_unit_orientation' => geometry_unit_orientation}
       end
     end
     return units