openstudio-standards 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 13900fdf938b7d127357f71afea357973d2884fc
-  data.tar.gz: 3da4b7b33084026a1762da60cf89924365b4bb8c
+SHA256:
+  metadata.gz: 479facb81b789389df83af56ea69de612edcd19ee62e5381179b8ac95b6297dd
+  data.tar.gz: 1cbd4d8613260e52b6d9b2cccdfe6d3a8a5a26a1339351a6a9efc3f1667279d2
 SHA512:
-  metadata.gz: 349572947a81fbfac6ca21768ef96e7be6f0a2eb49ef7753869b6544922b1952e65cc61f837375d015f1cd943758dcff2c426dcab4385f049e006cfefc84770b
-  data.tar.gz: 0eaef05bcb57a3640b21ded3b416321feb7618cb4a226e38f42c681ba9f721717e81dc500117cc87dae1135cffbf5d486d385fb0e79a98530f035ebeb9423edc
+  metadata.gz: 080f54eaf82fd3abe63d0b38ee49b926f5f2bacfe044d75fd52648af48deabda98a62fc57ddc550acae318453c8fba1939c4a89e7700051050b51ed064a85dfe
+  data.tar.gz: 05e6dae1bbc18b7966888b5941a637cfc7ec113ee96b08230bbebad04c3763740e2ac08d112b729d48c7834d4955131e1344970617fef15d09289a296ce14613

data/lib/openstudio-standards.rb

@@ -1,34 +1,6 @@
 require 'singleton'
 require_relative 'openstudio-standards/version'
 
-class Folders
-  # A place to keep all folder paths and ensure that they exist!
-  # Usage is
-  # Folders.instance.refactor_folder
-  include Singleton
-  attr_reader :data_costing_folder
-  attr_reader :data_geometry_folder
-  attr_reader :data_standards_folder
-  attr_reader :data_weather_folder
-  attr_reader :refactor_folder
-
-  def initialize
-    folders = []
-    # folders << @data_costing_folder = File.expand_path("#{File.dirname(__FILE__)}/../data/costing/")
-    folders << @data_geometry_folder = File.expand_path("#{File.dirname(__FILE__)}/../data/geometry/")
-    folders << @data_standards_folder = File.expand_path("#{File.dirname(__FILE__)}/../data/standards/")
-    folders << @data_weather_folder = File.expand_path("#{File.dirname(__FILE__)}/../data/weather/")
-    error = false
-    folders.each do |folder|
-      unless Dir.exist?(folder)
-        puts "#{folder} does not exist. Please check paths relative to this file."
-        error = true
-      end
-    end
-    raise('Folder paths are incorrect. Standards Cannot continue.') if error
-  end
-end
-
 module OpenstudioStandards
   require 'json' # Used to load standards JSON files
 

data/lib/openstudio-standards/hvac_sizing/Siz.Model.rb

@@ -284,6 +284,7 @@ class OpenStudio::Model::Model
     object_type = object_type.upcase if object_type == 'Coil:Cooling:WaterToAirHeatPump:EquationFit'
     object_type = object_type.upcase if object_type == 'Coil:Heating:WaterToAirHeatPump:EquationFit'
 		object_type = 'Coil:Heating:GasMultiStage' if object_type == 'Coil:Heating:Gas:MultiStage'
+		object_type = 'Coil:Heating:Fuel' if object_type == 'Coil:Heating:Gas'
 
     sql = self.sqlFile
 

data/lib/openstudio-standards/prototypes/common/do_not_edit_metaclasses.rb

@@ -28,9 +28,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -121,9 +121,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -214,9 +214,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -307,9 +307,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -400,9 +400,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -493,9 +493,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -586,9 +586,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -679,9 +679,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -772,9 +772,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -865,9 +865,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -958,9 +958,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1051,9 +1051,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1144,9 +1144,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1237,9 +1237,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1330,9 +1330,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1423,9 +1423,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1516,9 +1516,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1616,9 +1616,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1709,9 +1709,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1802,9 +1802,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1895,9 +1895,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -1988,9 +1988,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2081,9 +2081,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2174,9 +2174,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2267,9 +2267,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2360,9 +2360,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2453,9 +2453,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2546,9 +2546,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2639,9 +2639,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2732,9 +2732,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2825,9 +2825,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -2918,9 +2918,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3011,9 +3011,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3104,9 +3104,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3204,9 +3204,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3297,9 +3297,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3390,9 +3390,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3483,9 +3483,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3576,9 +3576,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3669,9 +3669,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3762,9 +3762,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3855,9 +3855,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -3948,9 +3948,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4041,9 +4041,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4134,9 +4134,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4227,9 +4227,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4320,9 +4320,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4413,9 +4413,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4506,9 +4506,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4599,9 +4599,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4692,9 +4692,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4792,9 +4792,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4885,9 +4885,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -4978,9 +4978,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5071,9 +5071,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5164,9 +5164,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5257,9 +5257,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5350,9 +5350,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5443,9 +5443,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5536,9 +5536,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5629,9 +5629,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5722,9 +5722,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5815,9 +5815,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -5908,9 +5908,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6001,9 +6001,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6094,9 +6094,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6187,9 +6187,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6280,9 +6280,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6380,9 +6380,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6473,9 +6473,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6566,9 +6566,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6659,9 +6659,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6752,9 +6752,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6845,9 +6845,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -6938,9 +6938,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7031,9 +7031,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7124,9 +7124,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7217,9 +7217,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7310,9 +7310,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7403,9 +7403,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7496,9 +7496,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7589,9 +7589,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7682,9 +7682,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7775,9 +7775,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7868,9 +7868,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -7968,9 +7968,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8061,9 +8061,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8154,9 +8154,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8247,9 +8247,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8340,9 +8340,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8433,9 +8433,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8526,9 +8526,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8619,9 +8619,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8712,9 +8712,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8805,9 +8805,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8898,9 +8898,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -8991,9 +8991,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9084,9 +9084,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9177,9 +9177,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9270,9 +9270,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9363,9 +9363,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9456,9 +9456,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9556,9 +9556,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9649,9 +9649,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9742,9 +9742,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9835,9 +9835,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -9928,9 +9928,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10021,9 +10021,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10114,9 +10114,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10207,9 +10207,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10300,9 +10300,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10393,9 +10393,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10486,9 +10486,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10579,9 +10579,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10672,9 +10672,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10765,9 +10765,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10858,9 +10858,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -10951,9 +10951,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -11044,9 +11044,9 @@ end
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
     #ideally we should map the data required to a instance variable.
-    @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-    hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-    @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+    @geometry_file = 'geometry/' + self.class.name + '.osm'
+    hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+    @system_to_space_map = load_hvac_map(hvac_map_file)
     self.set_variables()
   end
   # This method is used to extend the class with building-type-specific
@@ -11149,9 +11149,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11228,9 +11228,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11307,9 +11307,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11386,9 +11386,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11465,9 +11465,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11544,9 +11544,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11623,9 +11623,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11702,9 +11702,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11781,9 +11781,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11860,9 +11860,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -11939,9 +11939,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12018,9 +12018,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12097,9 +12097,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12176,9 +12176,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12255,9 +12255,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12334,9 +12334,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12413,9 +12413,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12499,9 +12499,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12578,9 +12578,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12657,9 +12657,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12736,9 +12736,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12815,9 +12815,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12894,9 +12894,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -12973,9 +12973,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13052,9 +13052,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13131,9 +13131,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13210,9 +13210,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13289,9 +13289,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13368,9 +13368,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13447,9 +13447,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13526,9 +13526,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13605,9 +13605,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13684,9 +13684,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end
 
@@ -13763,9 +13763,9 @@ end
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
       #ideally we should map the data required to a instance variable.
-      @geometry_file = Folders.instance.data_geometry_folder + '/' + self.class.name + '.osm'
-      hvac_map_file =  Folders.instance.data_geometry_folder + '/' + self.class.name + '.hvac_map.json'
-      @system_to_space_map = JSON.parse(File.read(hvac_map_file))if File.exist?(hvac_map_file)
+      @geometry_file = 'geometry/' + self.class.name + '.osm'
+      hvac_map_file =  'geometry/' + self.class.name + '.hvac_map.json'
+      # @system_to_space_map = load_hvac_map(hvac_map_file) # No HVAC map json files for NECB
       self.set_variables()
     end