openstudio-extension 0.2.0 → 0.2.5

data/lib/openstudio/extension/runner.rb

@@ -41,6 +41,7 @@ require 'openstudio'
 require 'yaml'
 require 'fileutils'
 require 'parallel'
+require 'bcl'
 
 module OpenStudio
   module Extension
@@ -55,31 +56,41 @@ module OpenStudio
       # compatible with the OpenStudio CLI.
       ##
       #  @param [String] dirname Directory to run commands in, defaults to Dir.pwd. If directory includes a Gemfile then create a local bundle.
-      #  @param bundle_without [Hash] Hash describing the distribution of the variable.
-      #  @param options [Hash] Hash describing options for running the simulation. These are the defaults for all runs unless overriden within the run_* methods.
+      #  @param bundle_without [Array] List of strings of the groups to exclude when running the bundle command
+      #  @param options [Hash] Hash describing options for running the simulation. These are the defaults for all runs unless overriden within the run_* methods. Note if options is used, then a local runner.conf file will not be loaded.
       #  @option options [String] :max_datapoints Max number of datapoints to run
       #  @option options [String] :num_parallel Number of simulations to run in parallel at a time
       #  @option options [String] :run_simulations Set to true to run the simulations
       #  @option options [String] :verbose Set to true to receive extra information while running simulations
       def initialize(dirname = Dir.pwd, bundle_without = [], options = {})
         # DLM: I am not sure if we want to use the main root directory to create these bundles
-        # had the idea of passing in a Gemfile name/alias and path to Gemfile, then doing the bundle in ~/OpenStudio/#{alias} or something like that?
+        # had the idea of passing in a Gemfile name/alias and path to Gemfile, then doing the bundle
+        # in ~/OpenStudio/#{alias} or something like that?
 
         # if the dirname contains a runner.conf file, then use the config file to specify the parameters
-        if File.exist?(File.join(dirname, OpenStudio::Extension::RunnerConfig::FILENAME)) && !options
+
+        @options = OpenStudio::Extension::RunnerConfig.default_config
+        # ORDER of PRECEDENCE: default config < runner.conf file < options passed in directly
+        if File.exist?(File.join(dirname, OpenStudio::Extension::RunnerConfig::FILENAME)) && options.empty?
           puts 'Using runner options from runner.conf file'
           runner_config = OpenStudio::Extension::RunnerConfig.new(dirname)
-          @options = runner_config.options
-        else
-          # use the passed values or defaults overriden by passed options
-          @options = OpenStudio::Extension::RunnerConfig.default_config.merge(options)
+          # use the default values overriden with runner.conf values
+          @options = @options.merge(runner_config.options)
         end
-
+        
+        # use the passed values or defaults overriden by passed options
+        @options = @options.merge(options)
+       
         puts "Initializing runner with dirname: '#{dirname}' and options: #{@options}"
         @dirname = File.absolute_path(dirname)
-        @gemfile_path = File.join(@dirname, 'Gemfile')
-        @bundle_install_path = File.join(@dirname, '.bundle/install/')
+        
+        # use passed options, otherwise assume @dirname
+        @gemfile_path = (!@options.key?(:gemfile_path) || @options[:gemfile_path] === '') ? File.join(@dirname, 'Gemfile') : @options[:gemfile_path]
+        @bundle_install_path = (!@options.key?(:bundle_install_path) || @options[:bundle_install_path] === '')? File.join(@dirname, '.bundle/install/') : @options[:bundle_install_path]
         @original_dir = Dir.pwd
+        # puts "DIRNAME: #{@dirname}"
+        # puts "@gemfile_path set to: #{@gemfile_path}"
+        # puts "@bundle_install_path set to: #{@bundle_install_path}"
 
         @bundle_without = bundle_without || []
         @bundle_without_string = @bundle_without.join(' ')
@@ -153,7 +164,9 @@ module OpenStudio
 
             puts "needs_update = #{needs_update}"
             if needs_update
-              run_command('bundle update', get_clean_env)
+              # run_command('bundle update', get_clean_env)
+              # KAF: updated to include specified gemfile_path...this didn't seem to work before
+              run_command("bundle update --gemfile=#{@gemfile_path}", get_clean_env)
             end
           ensure
             Dir.chdir(@original_dir)
@@ -559,21 +572,21 @@ module OpenStudio
         puts "Encoding.default_internal = #{Encoding.default_internal}"
 
         paths.each do |path|
-          Dir[path[:glob]].each do |file|
-            puts "Updating license in file #{file}"
-            f = File.read(file)
-            if f =~ path[:regex]
+          Dir[path[:glob]].each do |dir_file|
+            puts "Updating license in file #{dir_file}"
+            f = File.read(dir_file)
+            if f.match?(path[:regex])
               puts '  License found -- updating'
-              File.open(file, 'w') { |write| write << f.gsub(path[:regex], path[:license]) }
+              File.open(dir_file, 'w') { |write| write << f.gsub(path[:regex], path[:license]) }
             elsif f =~ /\(C\)/i || f =~ /\(Copyright\)/i
               puts '  File already has copyright -- skipping'
             else
               puts '  No license found -- adding'
-              if f =~ /#!/
+              if f.match?(/#!/)
                 puts '  CANNOT add license to file automatically, add it manually and it will update automatically in the future'
                 next
               end
-              File.open(file, 'w') { |write| write << f.insert(0, path[:license] + "\n") }
+              File.open(dir_file, 'w') { |write| write << f.insert(0, path[:license] + "\n") }
             end
           end
         end

data/lib/openstudio/extension/runner_config.rb

@@ -78,7 +78,9 @@ module OpenStudio
           max_datapoints: 1E9.to_i,
           num_parallel: 2,
           run_simulations: true,
-          verbose: false
+          verbose: false,
+          gemfile_path: '',
+          bundle_install_path: ''
         }
       end
 
@@ -104,6 +106,19 @@ module OpenStudio
         end
       end
 
+      ##
+      # Update a runner config value
+      #
+      # @param [String] key, The name of the key to update
+      # @param [Variant] new_value, The new value to set the `key` to.
+      def update_config(key, new_value)
+        if @data.key? key.to_sym
+          @data[key.to_sym] = new_value
+        else
+          raise "Could not find key '#{key}' to update in RunnerConfig."
+        end
+      end
+
       ##
       # Return the options as hash
       def options

data/lib/openstudio/extension/version.rb

@@ -35,6 +35,6 @@
 
 module OpenStudio
   module Extension
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.5'.freeze
   end
 end

data/openstudio-extension.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |spec|
   spec.summary       = 'openstudio base gem for creating generic extensions with encapsulated data and measures.'
   spec.description   = 'openstudio base gem for creating generic extensions with encapsulated data and measures.'
   spec.metadata = {
-      'bug_tracker_uri' => 'https://github.com/NREL/openstudio-extension-gem/issues',
-      'changelog_uri' => 'https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md',
-      #'documentation_uri' =>  'https://www.rubydoc.info/gems/openstudio-extension-gem/#{gem.version}',
-      'source_code_uri' => "https://github.com/NREL/openstudio-extension-gem/tree/v#{spec.version}"
+    'bug_tracker_uri' => 'https://github.com/NREL/openstudio-extension-gem/issues',
+    'changelog_uri' => 'https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md',
+    # 'documentation_uri' =>  'https://www.rubydoc.info/gems/openstudio-extension-gem/#{gem.version}',
+    'source_code_uri' => "https://github.com/NREL/openstudio-extension-gem/tree/v#{spec.version}"
   }
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|lib.measures.*tests|spec|features)/})
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -28,13 +28,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.5.0'
 
+  spec.add_dependency 'bcl', '~> 0.6.1'
   spec.add_dependency 'bundler', '~> 2.1'
-  spec.add_dependency 'openstudio-workflow', '~> 1.3.4'
-  spec.add_dependency 'openstudio_measure_tester', '~> 0.2.0'
-  spec.add_dependency 'parallel', '~> 1.12.0'
+  spec.add_dependency 'octokit', '~> 4.18.0' # for change logs
+  spec.add_dependency 'openstudio-workflow', '~> 2.0.0'
+  spec.add_dependency 'openstudio_measure_tester', '~> 0.2.3'
+  spec.add_dependency 'parallel', '~> 1.19.1'
 
-  spec.add_development_dependency 'github_api', '~> 0.18.0'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'rubocop', '~> 0.54.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-extension
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Katherine Fleming
@@ -10,120 +10,120 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: bcl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: openstudio-workflow
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: openstudio_measure_tester
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 4.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 4.18.0
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: openstudio-workflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: openstudio_measure_tester
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
-  type: :development
+        version: 0.2.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-  type: :development
+        version: 1.19.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 1.19.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: '3.9'
 description: openstudio base gem for creating generic extensions with encapsulated
   data and measures.
 email:
@@ -168,7 +168,6 @@ files:
 - lib/measures/openstudio_extension_test_measure/measure.rb
 - lib/measures/openstudio_extension_test_measure/measure.xml
 - lib/measures/openstudio_extension_test_measure/resources/os_lib_helper_methods.rb
-- lib/measures/openstudio_extension_test_measure/tests/openstudio_extension_test_measure_test.rb
 - lib/openstudio-extension.rb
 - lib/openstudio/extension.rb
 - lib/openstudio/extension/core/CreateResults.rb
@@ -198,7 +197,6 @@ files:
 - lib/openstudio/extension/core/check_weather_files.rb
 - lib/openstudio/extension/core/deer_vintages.rb
 - lib/openstudio/extension/core/os_lib_aedg_measures.rb
-- lib/openstudio/extension/core/os_lib_cofee.rb
 - lib/openstudio/extension/core/os_lib_constructions.rb
 - lib/openstudio/extension/core/os_lib_geometry.rb
 - lib/openstudio/extension/core/os_lib_helper_methods.rb
@@ -220,7 +218,7 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-extension-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.2.0
+  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.2.5
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -236,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: openstudio base gem for creating generic extensions with encapsulated data

data/lib/measures/openstudio_extension_test_measure/tests/openstudio_extension_test_measure_test.rb

@@ -1,74 +0,0 @@
-# *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
-# UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
-# THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# *******************************************************************************
-
-require 'openstudio'
-require 'openstudio/measure/ShowRunnerOutput'
-
-require_relative '../measure.rb'
-require 'minitest/autorun'
-
-class OpenStudioExtensionTestMeasureTest < Minitest::Test
-  # def setup
-  # end
-
-  # def teardown
-  # end
-
-  def test_OpenStudioExtensionTestMeasure
-    # create an instance of the measure
-    measure = OpenStudioExtensionTestMeasure.new
-
-    # create an instance of a runner
-    runner = OpenStudio::Measure::OSRunner.new(OpenStudio::WorkflowJSON.new)
-
-    # make an empty model
-    model = OpenStudio::Model::Model.new
-
-    # get arguments and test that they are what we are expecting
-    arguments = measure.arguments(model)
-    assert_equal(0, arguments.size)
-
-    # set argument values to good values and run the measure on model with spaces
-    arguments = measure.arguments(model)
-    argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
-
-    measure.run(model, runner, argument_map)
-    result = runner.result
-    # show_output(result)
-    assert(result.value.valueName == 'Success')
-    assert(result.warnings.empty?)
-    assert(result.info.empty?)
-  end
-end

data/lib/openstudio/extension/core/os_lib_cofee.rb

@@ -1,259 +0,0 @@
-# *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
-# UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
-# THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# *******************************************************************************
-
-module OsLib_Cofee
-
-  # create def to use later to make bar
-  def OsLib_Cofee.createBar(model, spaceTypeHash,lengthXTarget,lengthYTarget,totalFloorArea,numStories,midFloorMultiplier,xmin,ymin,lengthX,lengthY,zmin,zmax,endZones)
-
-    # floor to floor height
-    floor_to_floor_height = (zmax-zmin)/numStories
-
-    # perimeter depth
-    perimeterDepth = OpenStudio::convert(12,"ft","m").get
-    perimeterBufferFactor = 1.5 # this is a margin below which I won't bother splitting the two largest spaces
-
-    # create an array to control sort order of spaces in bar
-    customSpaceTypeBar = []
-    counter = 0
-    spaceTypeHash.sort_by {|key, value| value}.reverse.each do |k,v|
-      next if v == 0 # this line adds support for fractional values of 0
-      if counter == 1
-        if lengthXTarget*(v/totalFloorArea) > perimeterDepth * perimeterBufferFactor and endZones
-          customSpaceTypeBar << [k,totalFloorArea * (perimeterDepth/lengthXTarget)]
-          customSpaceTypeBar << [k,v - (totalFloorArea * (perimeterDepth/lengthXTarget))]
-        else
-          customSpaceTypeBar << [k,v]
-        end
-      elsif counter > 1
-        customSpaceTypeBar << [k,v]
-      end
-      counter += 1
-    end
-
-    # add the largest space type to the end
-    counter = 0
-    spaceTypeHash.sort_by {|key, value| value}.reverse.each do |k,v|
-      if counter == 0
-        # if width is greater than 1.5x perimeter depth then split in half
-        if lengthXTarget*(v/totalFloorArea) > perimeterDepth * perimeterBufferFactor and endZones
-          customSpaceTypeBar << [k,v - (totalFloorArea * (perimeterDepth/lengthXTarget))]
-          customSpaceTypeBar << [k,totalFloorArea * (perimeterDepth/lengthXTarget)]
-        else
-          customSpaceTypeBar << [k,v]
-        end
-      end
-      break
-    end
-
-    # starting z level
-    z = zmin
-    storyCounter = 0
-    barSpaceArray = []
-
-    # create new stories and then add spaces
-    [numStories,3].min.times do # no more than tree loops through this
-      story = OpenStudio::Model::BuildingStory.new(model)
-      story.setNominalFloortoFloorHeight(floor_to_floor_height)
-      story.setNominalZCoordinate(z)
-
-      # starting position for first space
-      x = (lengthX - lengthXTarget)*0.5 + xmin
-      y = (lengthY - lengthYTarget)*0.5 + ymin
-
-      # temp array of spaces (this is to change floor boundary when there is mid floor multiplier)
-      tempSpaceArray = []
-
-      # loop through space types making diagram and spaces.
-      #spaceTypeHash.sort_by {|key, value| value}.reverse.each do |k,v|
-      customSpaceTypeBar.each do |object|
-
-        # get values from what was hash
-        k = object[0]
-        v = object[1]
-
-        # get proper zone multiplier value
-        if storyCounter == 1 and midFloorMultiplier > 1
-          thermalZoneMultiplier = midFloorMultiplier
-        else
-          thermalZoneMultiplier = 1
-        end
-
-        options = {
-            "name" => nil,
-            "spaceType" => k,
-            "story" => story,
-            "makeThermalZone" => true,
-            "thermalZone" => nil,
-            "thermalZoneMultiplier" => thermalZoneMultiplier,
-            "floor_to_floor_height" => floor_to_floor_height,
-        }
-
-        # three paths for spaces depending upon building depth (3, 2 or one cross slices)
-        if lengthYTarget > perimeterDepth * 3  # slice into core and perimeter
-
-          # perimeter polygon a
-          perim_polygon_a = OpenStudio::Point3dVector.new
-          perim_origin_a = OpenStudio::Point3d.new(x,y,z)
-          perim_polygon_a << perim_origin_a
-          perim_polygon_a << OpenStudio::Point3d.new(x,y + perimeterDepth,z)
-          perim_polygon_a << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y + perimeterDepth,z)
-          perim_polygon_a << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y,z)
-
-          # create core polygon
-          core_polygon = OpenStudio::Point3dVector.new
-          core_origin = OpenStudio::Point3d.new(x,y + perimeterDepth,z)
-          core_polygon << core_origin
-          core_polygon << OpenStudio::Point3d.new(x,y + lengthYTarget - perimeterDepth,z)
-          core_polygon << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y + lengthYTarget - perimeterDepth,z)
-          core_polygon << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y + perimeterDepth,z)
-
-          # perimeter polygon b                              w
-          perim_polygon_b = OpenStudio::Point3dVector.new
-          perim_origin_b = OpenStudio::Point3d.new(x,y + lengthYTarget - perimeterDepth,z)
-          perim_polygon_b << perim_origin_b
-          perim_polygon_b << OpenStudio::Point3d.new(x,y + lengthYTarget,z)
-          perim_polygon_b << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y + lengthYTarget,z)
-          perim_polygon_b << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y + lengthYTarget - perimeterDepth,z)
-
-          # run method to make spaces
-          tempSpaceArray << OsLib_Geometry.makeSpaceFromPolygon(model,perim_origin_a,perim_polygon_a,options) # model, origin, polygon, options
-          tempSpaceArray << OsLib_Geometry.makeSpaceFromPolygon(model,core_origin,core_polygon,options) # model, origin, polygon, options
-          tempSpaceArray << OsLib_Geometry.makeSpaceFromPolygon(model,perim_origin_b,perim_polygon_b,options) # model, origin, polygon, options
-
-        elsif lengthYTarget > perimeterDepth * 2  # slice into two peremeter zones but no core
-
-          # perimeter polygon a
-          perim_polygon_a = OpenStudio::Point3dVector.new
-          perim_origin_a = OpenStudio::Point3d.new(x,y,z)
-          perim_polygon_a << perim_origin_a
-          perim_polygon_a << OpenStudio::Point3d.new(x,y + lengthYTarget/2,z)
-          perim_polygon_a << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y + lengthYTarget/2,z)
-          perim_polygon_a << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y,z)
-
-          # perimeter polygon b
-          perim_polygon_b = OpenStudio::Point3dVector.new
-          perim_origin_b = OpenStudio::Point3d.new(x,y + lengthYTarget/2,z)
-          perim_polygon_b << perim_origin_b
-          perim_polygon_b << OpenStudio::Point3d.new(x,y + lengthYTarget,z)
-          perim_polygon_b << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y + lengthYTarget,z)
-          perim_polygon_b << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y + lengthYTarget/2,z)
-
-          # run method to make spaces
-          tempSpaceArray << OsLib_Geometry.makeSpaceFromPolygon(model,perim_origin_a,perim_polygon_a,options) # model, origin, polygon, options
-          tempSpaceArray << OsLib_Geometry.makeSpaceFromPolygon(model,perim_origin_b,perim_polygon_b,options) # model, origin, polygon, options
-
-        else # don't slice into core and perimeter
-
-          # create polygon
-          core_polygon = OpenStudio::Point3dVector.new
-          core_origin = OpenStudio::Point3d.new(x,y,z)
-          core_polygon << core_origin
-          core_polygon << OpenStudio::Point3d.new(x,y + lengthYTarget,z)
-          core_polygon << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y + lengthYTarget,z)
-          core_polygon << OpenStudio::Point3d.new(x + lengthXTarget*(v/totalFloorArea),y,z)
-
-          # run method to make space
-          tempSpaceArray << OsLib_Geometry.makeSpaceFromPolygon(model,core_origin,core_polygon,options) # model, origin, polygon, options
-
-        end
-
-        # update points for next run
-        x += lengthXTarget*(v/totalFloorArea)
-
-      end
-
-      # set flags for adiabatic surfaces
-      floorAdiabatic = false
-      ceilingAdiabatic = false
-
-      # update z
-      if midFloorMultiplier == 1
-        z += floor_to_floor_height
-      else
-        z += floor_to_floor_height * midFloorMultiplier - floor_to_floor_height
-
-        if storyCounter == 0
-          ceilingAdiabatic = true
-        elsif storyCounter == 1
-          floorAdiabatic = true
-          ceilingAdiabatic = true
-        else
-          floorAdiabatic = true
-        end
-
-        # alter surfaces boundary conditions and constructions as described above
-        tempSpaceArray.each do |space|
-          space.surfaces.each do |surface|
-            if surface.surfaceType == "RoofCeiling" and ceilingAdiabatic
-              construction = surface.construction # todo - this isn't really the construction I want since it wasn't an interior one, but will work for now
-              surface.setOutsideBoundaryCondition("Adiabatic")
-              if not construction.empty?
-                surface.setConstruction(construction.get)
-              end
-            end
-            if surface.surfaceType == "Floor" and floorAdiabatic
-              construction = surface.construction # todo - this isn't really the construction I want since it wasn't an interior one, but will work for now
-              surface.setOutsideBoundaryCondition("Adiabatic")
-              if not construction.empty?
-                surface.setConstruction(construction.get)
-              end
-            end
-          end
-        end
-
-        # populate bar space array from temp array
-        barSpaceArray << tempSpaceArray
-
-      end
-
-      # update storyCounter
-      storyCounter += 1
-
-    end
-
-    # surface matching (seems more complex than necessary)
-    spaces = OpenStudio::Model::SpaceVector.new
-    model.getSpaces.each do |space|
-      spaces << space
-    end
-    OpenStudio::Model.matchSurfaces(spaces)
-
-    result = barSpaceArray
-    return result
-
-  end
-
-end