urbanopt-cli 0.6.1 → 0.7.0

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/lu_water_heater_efficiency.csv

@@ -0,0 +1,157 @@
+year,performance_id,type_id,fuel_primary_id,metric_id,units_id,value
+1972,shipment_weighted,storage,electric,EF,none,0.798
+1973,shipment_weighted,storage,electric,EF,none,0.798
+1974,shipment_weighted,storage,electric,EF,none,0.798
+1975,shipment_weighted,storage,electric,EF,none,0.798
+1976,shipment_weighted,storage,electric,EF,none,0.799
+1977,shipment_weighted,storage,electric,EF,none,0.799
+1978,shipment_weighted,storage,electric,EF,none,0.8
+1979,shipment_weighted,storage,electric,EF,none,0.801
+1980,shipment_weighted,storage,electric,EF,none,0.802
+1981,shipment_weighted,storage,electric,EF,none,0.803
+1982,shipment_weighted,storage,electric,EF,none,0.804
+1983,shipment_weighted,storage,electric,EF,none,0.806
+1984,shipment_weighted,storage,electric,EF,none,0.809
+1985,shipment_weighted,storage,electric,EF,none,0.812
+1986,shipment_weighted,storage,electric,EF,none,0.815
+1987,shipment_weighted,storage,electric,EF,none,0.819
+1988,shipment_weighted,storage,electric,EF,none,0.823
+1989,shipment_weighted,storage,electric,EF,none,0.828
+1990,shipment_weighted,storage,electric,EF,none,0.832
+1991,shipment_weighted,storage,electric,EF,none,0.837
+1992,shipment_weighted,storage,electric,EF,none,0.842
+1993,shipment_weighted,storage,electric,EF,none,0.846
+1994,shipment_weighted,storage,electric,EF,none,0.85
+1995,shipment_weighted,storage,electric,EF,none,0.854
+1996,shipment_weighted,storage,electric,EF,none,0.857
+1997,shipment_weighted,storage,electric,EF,none,0.857
+1998,shipment_weighted,storage,electric,EF,none,0.857
+1999,shipment_weighted,storage,electric,EF,none,0.857
+2000,shipment_weighted,storage,electric,EF,none,0.857
+2001,shipment_weighted,storage,electric,EF,none,0.857
+2002,shipment_weighted,storage,electric,EF,none,0.857
+2003,shipment_weighted,storage,electric,EF,none,0.857
+2004,shipment_weighted,storage,electric,EF,none,0.9
+2005,shipment_weighted,storage,electric,EF,none,0.9
+2006,shipment_weighted,storage,electric,EF,none,0.9
+2007,shipment_weighted,storage,electric,EF,none,0.9
+2008,shipment_weighted,storage,electric,EF,none,0.9
+2009,shipment_weighted,storage,electric,EF,none,0.9
+2010,shipment_weighted,storage,electric,EF,none,0.9
+1972,shipment_weighted,storage,natural_gas,EF,none,0.474
+1973,shipment_weighted,storage,natural_gas,EF,none,0.474
+1974,shipment_weighted,storage,natural_gas,EF,none,0.474
+1975,shipment_weighted,storage,natural_gas,EF,none,0.474
+1976,shipment_weighted,storage,natural_gas,EF,none,0.475
+1977,shipment_weighted,storage,natural_gas,EF,none,0.475
+1978,shipment_weighted,storage,natural_gas,EF,none,0.476
+1979,shipment_weighted,storage,natural_gas,EF,none,0.476
+1980,shipment_weighted,storage,natural_gas,EF,none,0.477
+1981,shipment_weighted,storage,natural_gas,EF,none,0.478
+1982,shipment_weighted,storage,natural_gas,EF,none,0.479
+1983,shipment_weighted,storage,natural_gas,EF,none,0.48
+1984,shipment_weighted,storage,natural_gas,EF,none,0.481
+1985,shipment_weighted,storage,natural_gas,EF,none,0.483
+1986,shipment_weighted,storage,natural_gas,EF,none,0.484
+1987,shipment_weighted,storage,natural_gas,EF,none,0.486
+1988,shipment_weighted,storage,natural_gas,EF,none,0.488
+1989,shipment_weighted,storage,natural_gas,EF,none,0.49
+1990,shipment_weighted,storage,natural_gas,EF,none,0.492
+1991,shipment_weighted,storage,natural_gas,EF,none,0.494
+1992,shipment_weighted,storage,natural_gas,EF,none,0.496
+1993,shipment_weighted,storage,natural_gas,EF,none,0.498
+1994,shipment_weighted,storage,natural_gas,EF,none,0.499
+1995,shipment_weighted,storage,natural_gas,EF,none,0.5
+1996,shipment_weighted,storage,natural_gas,EF,none,0.501
+1997,shipment_weighted,storage,natural_gas,EF,none,0.501
+1998,shipment_weighted,storage,natural_gas,EF,none,0.501
+1999,shipment_weighted,storage,natural_gas,EF,none,0.501
+2000,shipment_weighted,storage,natural_gas,EF,none,0.501
+2001,shipment_weighted,storage,natural_gas,EF,none,0.501
+2002,shipment_weighted,storage,natural_gas,EF,none,0.501
+2003,shipment_weighted,storage,natural_gas,EF,none,0.501
+2004,shipment_weighted,storage,natural_gas,EF,none,0.55
+2005,shipment_weighted,storage,natural_gas,EF,none,0.55
+2006,shipment_weighted,storage,natural_gas,EF,none,0.55
+2007,shipment_weighted,storage,natural_gas,EF,none,0.55
+2008,shipment_weighted,storage,natural_gas,EF,none,0.55
+2009,shipment_weighted,storage,natural_gas,EF,none,0.55
+2010,shipment_weighted,storage,natural_gas,EF,none,0.55
+1972,shipment_weighted,storage,lpg,EF,none,0.474
+1973,shipment_weighted,storage,lpg,EF,none,0.474
+1974,shipment_weighted,storage,lpg,EF,none,0.474
+1975,shipment_weighted,storage,lpg,EF,none,0.474
+1976,shipment_weighted,storage,lpg,EF,none,0.475
+1977,shipment_weighted,storage,lpg,EF,none,0.475
+1978,shipment_weighted,storage,lpg,EF,none,0.476
+1979,shipment_weighted,storage,lpg,EF,none,0.476
+1980,shipment_weighted,storage,lpg,EF,none,0.477
+1981,shipment_weighted,storage,lpg,EF,none,0.478
+1982,shipment_weighted,storage,lpg,EF,none,0.479
+1983,shipment_weighted,storage,lpg,EF,none,0.48
+1984,shipment_weighted,storage,lpg,EF,none,0.481
+1985,shipment_weighted,storage,lpg,EF,none,0.483
+1986,shipment_weighted,storage,lpg,EF,none,0.484
+1987,shipment_weighted,storage,lpg,EF,none,0.486
+1988,shipment_weighted,storage,lpg,EF,none,0.488
+1989,shipment_weighted,storage,lpg,EF,none,0.49
+1990,shipment_weighted,storage,lpg,EF,none,0.492
+1991,shipment_weighted,storage,lpg,EF,none,0.494
+1992,shipment_weighted,storage,lpg,EF,none,0.496
+1993,shipment_weighted,storage,lpg,EF,none,0.498
+1994,shipment_weighted,storage,lpg,EF,none,0.499
+1995,shipment_weighted,storage,lpg,EF,none,0.5
+1996,shipment_weighted,storage,lpg,EF,none,0.501
+1997,shipment_weighted,storage,lpg,EF,none,0.501
+1998,shipment_weighted,storage,lpg,EF,none,0.501
+1999,shipment_weighted,storage,lpg,EF,none,0.501
+2000,shipment_weighted,storage,lpg,EF,none,0.501
+2001,shipment_weighted,storage,lpg,EF,none,0.501
+2002,shipment_weighted,storage,lpg,EF,none,0.501
+2003,shipment_weighted,storage,lpg,EF,none,0.501
+2004,shipment_weighted,storage,lpg,EF,none,0.55
+2005,shipment_weighted,storage,lpg,EF,none,0.55
+2006,shipment_weighted,storage,lpg,EF,none,0.55
+2007,shipment_weighted,storage,lpg,EF,none,0.55
+2008,shipment_weighted,storage,lpg,EF,none,0.55
+2009,shipment_weighted,storage,lpg,EF,none,0.55
+2010,shipment_weighted,storage,lpg,EF,none,0.55
+1972,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1973,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1974,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1975,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1976,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1977,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1978,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1979,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1980,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1981,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1982,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1983,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1984,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1985,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1986,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1987,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1988,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1989,shipment_weighted,storage,fuel_oil,EF,none,0.54
+1990,shipment_weighted,storage,fuel_oil,EF,none,0.59
+1991,shipment_weighted,storage,fuel_oil,EF,none,0.59
+1992,shipment_weighted,storage,fuel_oil,EF,none,0.59
+1993,shipment_weighted,storage,fuel_oil,EF,none,0.59
+1994,shipment_weighted,storage,fuel_oil,EF,none,0.59
+1995,shipment_weighted,storage,fuel_oil,EF,none,0.59
+1996,shipment_weighted,storage,fuel_oil,EF,none,0.59
+1997,shipment_weighted,storage,fuel_oil,EF,none,0.59
+1998,shipment_weighted,storage,fuel_oil,EF,none,0.59
+1999,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2000,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2001,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2002,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2003,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2004,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2005,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2006,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2007,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2008,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2009,shipment_weighted,storage,fuel_oil,EF,none,0.59
+2010,shipment_weighted,storage,fuel_oil,EF,none,0.59

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/resources/materials.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 class Material
+  # name - Material name
   # thick_in - Thickness [in]
   # mat_base - Material object that defines k, rho, and cp. Can be overridden with values for those arguments.
   # k_in - Conductivity [Btu-in/h-ft^2-F]
   # rho - Density [lb/ft^3]
   # cp - Specific heat [Btu/lb*F]
-  # rvalue - R-value [h-ft^2-F/Btu]
-  def initialize(name = nil, thick_in = nil, mat_base = nil, k_in = nil, rho = nil, cp = nil, tAbs = nil, sAbs = nil, vAbs = nil, rvalue = nil)
+  # tAbs - thermal absorptance (emittance); 0.9 is EnergyPlus default
+  # sAbs - solar absorptance; 0.7 is EnergyPlus default
+  def initialize(name: nil, thick_in: nil, mat_base: nil, k_in: nil, rho: nil, cp: nil, tAbs: 0.9, sAbs: 0.7)
     @name = name
 
     if not thick_in.nil?
@@ -45,7 +47,6 @@ class Material
 
     @tAbs = tAbs
     @sAbs = sAbs
-    @vAbs = vAbs
 
     # Calculate R-value
     if not rvalue.nil?
@@ -59,19 +60,19 @@ class Material
     end
   end
 
-  attr_accessor :name, :thick, :thick_in, :k, :k_in, :rho, :cp, :rvalue, :tAbs, :sAbs, :vAbs
+  attr_accessor :name, :thick, :thick_in, :k, :k_in, :rho, :cp, :rvalue, :tAbs, :sAbs
 
   def self.AirCavityClosed(thick_in)
-    rvalue = Gas.AirGapRvalue
-    return new(name = nil, thick_in = thick_in, mat_base = nil, k_in = thick_in / rvalue, rho = Gas.Air.rho, cp = Gas.Air.cp)
+    rvalue = 1.0 # hr*ft*F/Btu (Assume for all air gap configurations since there is no correction for direction of heat flow in the simulation tools)
+    return new(thick_in: thick_in, k_in: thick_in / rvalue, rho: Gas.Air.rho, cp: Gas.Air.cp)
   end
 
   def self.AirCavityOpen(thick_in)
-    return new(name = nil, thick_in = thick_in, mat_base = nil, k_in = 10000000.0, rho = Gas.Air.rho, cp = Gas.Air.cp)
+    return new(thick_in: thick_in, k_in: 10000000.0, rho: Gas.Air.rho, cp: Gas.Air.cp)
   end
 
   def self.AirFilm(rvalue)
-    return new(name = Constants.AirFilm, thick_in = 1.0, mat_base = nil, k_in = 1.0 / rvalue)
+    return new(name: Constants.AirFilm, thick_in: 1.0, k_in: 1.0 / rvalue)
   end
 
   def self.AirFilmOutside
@@ -186,74 +187,118 @@ class Material
 
   def self.CoveringBare(floorFraction = 0.8, rvalue = 2.08)
     # Combined layer of, e.g., carpet and bare floor
-    thickness = 0.5 # in
-    return new(name = 'Floor Covering', thick_in = thickness, mat_base = nil, k_in = thickness / (rvalue * floorFraction), rho = 3.4, cp = 0.32, tAbs = 0.9, sAbs = 0.9, vAbs = 0.9)
+    thick_in = 0.5 # in
+    return new(name: 'floor covering', thick_in: thick_in, k_in: thick_in / (rvalue * floorFraction), rho: 3.4, cp: 0.32, tAbs: 0.9, sAbs: 0.9)
   end
 
   def self.Concrete(thick_in)
-    return new(name = "Concrete #{thick_in} in.", thick_in = thick_in, mat_base = BaseMaterial.Concrete, k_in = nil, rho = nil, cp = nil, tAbs = 0.9)
+    return new(name: "concrete #{thick_in} in.", thick_in: thick_in, mat_base: BaseMaterial.Concrete, tAbs: 0.9)
   end
 
-  def self.ExteriorFinishMaterial(siding, emittance, solar_absorptance, thick_in = nil)
-    if siding == HPXML::SidingTypeWood
-      thick_in = 1.0 if thick_in.nil?
-      return new(siding, thick_in, nil, 0.71, 34.0, 0.28, emittance, solar_absorptance, solar_absorptance)
-    elsif siding == HPXML::SidingTypeVinyl
+  def self.ExteriorFinishMaterial(type, thick_in = nil)
+    if (type == HPXML::SidingTypeNone) || (!thick_in.nil? && thick_in <= 0)
+      return
+    elsif [HPXML::SidingTypeAsbestos].include? type
+      thick_in = 0.25 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, k_in: 4.20, rho: 118.6, cp: 0.24)
+    elsif [HPXML::SidingTypeBrick].include? type
+      thick_in = 4.0 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, mat_base: BaseMaterial.Brick)
+    elsif [HPXML::SidingTypeCompositeShingle].include? type
+      thick_in = 0.25 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, k_in: 1.128, rho: 70.0, cp: 0.35)
+    elsif [HPXML::SidingTypeFiberCement].include? type
       thick_in = 0.375 if thick_in.nil?
-      return new(siding, thick_in, BaseMaterial.Vinyl, nil, nil, nil, emittance, solar_absorptance, solar_absorptance)
-    elsif siding == HPXML::SidingTypeStucco
+      return new(name: type, thick_in: thick_in, k_in: 1.79, rho: 21.7, cp: 0.24)
+    elsif [HPXML::SidingTypeMasonite].include? type # Masonite hardboard
+      thick_in = 0.5 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, k_in: 0.69, rho: 46.8, cp: 0.39)
+    elsif [HPXML::SidingTypeStucco].include? type
       thick_in = 1.0 if thick_in.nil?
-      return new(siding, thick_in, BaseMaterial.Stucco, nil, nil, nil, emittance, solar_absorptance, solar_absorptance)
-    elsif siding == HPXML::SidingTypeFiberCement
-      thick_in = 0.375 if thick_in.nil?
-      return new(siding, thick_in, nil, 1.79, 21.7, 0.24, emittance, solar_absorptance, solar_absorptance)
-    elsif siding == HPXML::SidingTypeBrick
-      thick_in = 4.0 if thick_in.nil?
-      return new(siding, thick_in, BaseMaterial.Brick, nil, nil, nil, emittance, solar_absorptance, solar_absorptance)
-    elsif siding == HPXML::SidingTypeAluminum
+      return new(name: type, thick_in: thick_in, mat_base: BaseMaterial.Stucco)
+    elsif [HPXML::SidingTypeSyntheticStucco].include? type # EIFS
+      thick_in = 1.0 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, mat_base: BaseMaterial.InsulationRigid)
+    elsif [HPXML::SidingTypeVinyl, HPXML::SidingTypeAluminum].include? type
       thick_in = 0.375 if thick_in.nil?
-      return new(siding, thick_in, BaseMaterial.Aluminum, nil, nil, nil, emittance, solar_absorptance, solar_absorptance)
+      return new(name: type, thick_in: thick_in, mat_base: BaseMaterial.Vinyl)
+    elsif [HPXML::SidingTypeWood].include? type
+      thick_in = 1.0 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, k_in: 0.71, rho: 34.0, cp: 0.28)
     end
-  end
 
-  def self.FloorWood
-    return Material.new(name = 'Wood Floor', thick_in = 0.625, mat_base = nil, k_in = 0.8004, rho = 34.0, cp = 0.29)
-  end
+    fail "Unexpected type: #{type}."
+  end
+
+  def self.FoundationWallMaterial(type, thick_in)
+    if type == HPXML::FoundationWallTypeSolidConcrete
+      return Material.Concrete(thick_in)
+    elsif type == HPXML::FoundationWallTypeDoubleBrick
+      return new(name: "#{type} #{thick_in} in.", thick_in: thick_in, mat_base: BaseMaterial.Brick, tAbs: 0.9)
+    elsif type == HPXML::FoundationWallTypeWood
+      # Open wood cavity wall, so just assume 0.5" of sheathing
+      return new(name: "#{type} #{thick_in} in.", thick_in: 0.5, mat_base: BaseMaterial.Wood, tAbs: 0.9)
+    # Concrete block conductivity values below derived from Table 2 of
+    # https://ncma.org/resource/rvalues-ufactors-of-single-wythe-concrete-masonry-walls/. Values
+    # for 6-in thickness and 115 pcf, with interior/exterior films removed (R-0.68/R-0.17).
+    elsif type == HPXML::FoundationWallTypeConcreteBlockSolidCore
+      return new(name: "#{type} #{thick_in} in.", thick_in: thick_in, k_in: 8.5, rho: 115.0, cp: 0.2, tAbs: 0.9)
+    elsif type == HPXML::FoundationWallTypeConcreteBlock
+      return new(name: "#{type} #{thick_in} in.", thick_in: thick_in, k_in: 5.0, rho: 45.0, cp: 0.2, tAbs: 0.9)
+    elsif type == HPXML::FoundationWallTypeConcreteBlockPerliteCore
+      return new(name: "#{type} #{thick_in} in.", thick_in: thick_in, k_in: 2.0, rho: 67.0, cp: 0.2, tAbs: 0.9)
+    elsif type == HPXML::FoundationWallTypeConcreteBlockFoamCore
+      return new(name: "#{type} #{thick_in} in.", thick_in: thick_in, k_in: 1.8, rho: 67.0, cp: 0.2, tAbs: 0.9)
+    elsif type == HPXML::FoundationWallTypeConcreteBlockVermiculiteCore
+      return new(name: "#{type} #{thick_in} in.", thick_in: thick_in, k_in: 2.1, rho: 67.0, cp: 0.2, tAbs: 0.9)
+    end
 
-  def self.GypsumWall(thick_in)
-    return new(name = "Drywall #{thick_in} in.", thick_in = thick_in, mat_base = BaseMaterial.Gypsum, k_in = nil, rho = nil, cp = nil, tAbs = 0.9, sAbs = 0.5, vAbs = 0.1)
+    fail "Unexpected type: #{type}."
   end
 
-  def self.GypsumCeiling(thick_in)
-    return new(name = "Drywall #{thick_in} in.", thick_in = thick_in, mat_base = BaseMaterial.Gypsum, k_in = nil, rho = nil, cp = nil, tAbs = 0.9, sAbs = 0.3, vAbs = 0.1)
+  def self.InteriorFinishMaterial(type, thick_in = nil)
+    if (type == HPXML::InteriorFinishNone) || (!thick_in.nil? && thick_in <= 0)
+      return
+    else
+      thick_in = 0.5 if thick_in.nil?
+      if [HPXML::InteriorFinishGypsumBoard,
+          HPXML::InteriorFinishGypsumCompositeBoard,
+          HPXML::InteriorFinishPlaster].include? type
+        return new(name: type, thick_in: thick_in, mat_base: BaseMaterial.Gypsum)
+      elsif [HPXML::InteriorFinishWood].include? type
+        return new(name: type, thick_in: thick_in, mat_base: BaseMaterial.Wood)
+      end
+    end
+
+    fail "Unexpected type: #{type}."
   end
 
   def self.Soil(thick_in)
-    return new(name = "Soil #{thick_in} in.", thick_in = thick_in, mat_base = BaseMaterial.Soil)
+    return new(name: "soil #{thick_in} in.", thick_in: thick_in, mat_base: BaseMaterial.Soil)
   end
 
   def self.Stud2x(thick_in)
-    return new(name = "Stud 2x #{thick_in} in.", thick_in = thick_in, mat_base = BaseMaterial.Wood)
+    return new(name: "stud 2x #{thick_in} in.", thick_in: thick_in, mat_base: BaseMaterial.Wood)
   end
 
   def self.Stud2x4
-    return new(name = 'Stud 2x4', thick_in = 3.5, mat_base = BaseMaterial.Wood)
+    return new(name: 'stud 2x4', thick_in: 3.5, mat_base: BaseMaterial.Wood)
   end
 
   def self.Stud2x6
-    return new(name = 'Stud 2x6', thick_in = 5.5, mat_base = BaseMaterial.Wood)
+    return new(name: 'stud 2x6', thick_in: 5.5, mat_base: BaseMaterial.Wood)
   end
 
   def self.Stud2x8
-    return new(name = 'Stud 2x8', thick_in = 7.25, mat_base = BaseMaterial.Wood)
+    return new(name: 'stud 2x8', thick_in: 7.25, mat_base: BaseMaterial.Wood)
   end
 
-  def self.Plywood(thick_in)
-    return new(name = "Plywood #{thick_in} in.", thick_in = thick_in, mat_base = BaseMaterial.Wood)
+  def self.OSBSheathing(thick_in)
+    return new(name: "osb sheathing #{thick_in} in.", thick_in: thick_in, mat_base: BaseMaterial.Wood)
   end
 
   def self.RadiantBarrier(grade)
-    # Merge w/ Constructions.get_gap_factor
+    # FUTURE: Merge w/ Constructions.get_gap_factor
     if grade == 1
       gap_frac = 0.0
     elsif grade == 2
@@ -264,16 +309,36 @@ class Material
     rb_emittance = 0.05
     non_rb_emittance = 0.90
     emittance = rb_emittance * (1.0 - gap_frac) + non_rb_emittance * gap_frac
-    return new(name = 'Radiant Barrier', thick_in = 0.0084, mat_base = nil, k_in = 1629.6, rho = 168.6, cp = 0.22, tAbs = emittance, sAbs = 0.05, vAbs = 0.05)
-  end
+    return new(name: 'radiant barrier', thick_in: 0.0084, k_in: 1629.6, rho: 168.6, cp: 0.22, tAbs: emittance, sAbs: 0.05)
+  end
+
+  def self.RoofMaterial(type, thick_in = nil)
+    if [HPXML::RoofTypeMetal].include? type
+      thick_in = 0.02 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, k_in: 346.9, rho: 487.0, cp: 0.11)
+    elsif [HPXML::RoofTypeAsphaltShingles, HPXML::RoofTypeWoodShingles, HPXML::RoofTypeShingles, HPXML::RoofTypeCool].include? type
+      thick_in = 0.25 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, k_in: 1.128, rho: 70.0, cp: 0.35)
+    elsif [HPXML::RoofTypeConcrete].include? type
+      thick_in = 0.75 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, k_in: 7.63, rho: 131.1, cp: 0.199)
+    elsif [HPXML::RoofTypeClayTile].include? type
+      thick_in = 0.75 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, k_in: 5.83, rho: 118.6, cp: 0.191)
+    elsif [HPXML::RoofTypeEPS].include? type
+      thick_in = 1.0 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, mat_base: BaseMaterial.InsulationRigid)
+    elsif [HPXML::RoofTypePlasticRubber].include? type
+      thick_in = 0.25 if thick_in.nil?
+      return new(name: type, thick_in: thick_in, k_in: 2.78, rho: 110.8, cp: 0.36)
+    end
 
-  def self.RoofMaterial(name, emissivity, absorptivity)
-    return new(name = name, thick_in = 0.375, mat_base = nil, k_in = 1.128, rho = 70, cp = 0.35, tAbs = emissivity, sAbs = absorptivity, vAbs = absorptivity)
+    fail "Unexpected type: #{type}."
   end
 end
 
 class BaseMaterial
-  def initialize(rho, cp, k_in)
+  def initialize(rho:, cp:, k_in: nil)
     @rho = rho
     @cp = cp
     @k_in = k_in
@@ -282,94 +347,85 @@ class BaseMaterial
   attr_accessor :rho, :cp, :k_in
 
   def self.Gypsum
-    return new(rho = 50.0, cp = 0.2, k_in = 1.1112)
+    return new(rho: 50.0, cp: 0.2, k_in: 1.1112)
   end
 
   def self.Wood
-    return new(rho = 32.0, cp = 0.29, k_in = 0.8004)
+    return new(rho: 32.0, cp: 0.29, k_in: 0.8004)
   end
 
   def self.Concrete
-    return new(rho = 140.0, cp = 0.2, k_in = 12.5)
+    return new(rho: 140.0, cp: 0.2, k_in: 12.5)
+  end
+
+  def self.FurnitureLightWeight
+    return new(rho: 40.0, cp: 0.29, k_in: 0.8004)
+  end
+
+  def self.FurnitureHeavyWeight
+    return new(rho: 80.0, cp: 0.35, k_in: 1.1268)
   end
 
   def self.Gypcrete
     # http://www.maxxon.com/gyp-crete/data
-    return new(rho = 100.0, cp = 0.223, k_in = 4.7424)
+    return new(rho: 100.0, cp: 0.223, k_in: 4.7424)
   end
 
   def self.InsulationRigid
-    return new(rho = 2.0, cp = 0.29, k_in = 0.204)
+    return new(rho: 2.0, cp: 0.29, k_in: 0.204)
   end
 
   def self.InsulationCelluloseDensepack
-    return new(rho = 3.5, cp = 0.25, k_in = nil)
+    return new(rho: 3.5, cp: 0.25)
   end
 
   def self.InsulationCelluloseLoosefill
-    return new(rho = 1.5, cp = 0.25, k_in = nil)
+    return new(rho: 1.5, cp: 0.25)
   end
 
   def self.InsulationFiberglassDensepack
-    return new(rho = 2.2, cp = 0.25, k_in = nil)
+    return new(rho: 2.2, cp: 0.25)
   end
 
   def self.InsulationFiberglassLoosefill
-    return new(rho = 0.5, cp = 0.25, k_in = nil)
+    return new(rho: 0.5, cp: 0.25)
   end
 
   def self.InsulationGenericDensepack
-    return new(rho = (self.InsulationFiberglassDensepack.rho + self.InsulationCelluloseDensepack.rho) / 2.0, cp = 0.25, k_in = nil)
+    return new(rho: (self.InsulationFiberglassDensepack.rho + self.InsulationCelluloseDensepack.rho) / 2.0, cp: 0.25)
   end
 
   def self.InsulationGenericLoosefill
-    return new(rho = (self.InsulationFiberglassLoosefill.rho + self.InsulationCelluloseLoosefill.rho) / 2.0, cp = 0.25, k_in = nil)
+    return new(rho: (self.InsulationFiberglassLoosefill.rho + self.InsulationCelluloseLoosefill.rho) / 2.0, cp: 0.25)
   end
 
   def self.Soil
-    return new(rho = 115.0, cp = 0.1, k_in = 12.0)
+    return new(rho: 115.0, cp: 0.1, k_in: 12.0)
   end
 
   def self.Brick
-    return new(rho = 110.0, cp = 0.19, k_in = 5.5)
+    return new(rho: 110.0, cp: 0.19, k_in: 5.5)
   end
 
   def self.Vinyl
-    return new(rho = 11.1, cp = 0.25, k_in = 0.62)
-  end
-
-  def self.Aluminum
-    return new(rho = 10.9, cp = 0.29, k_in = 0.61)
+    return new(rho: 11.1, cp: 0.25, k_in: 0.62)
   end
 
   def self.Stucco
-    return new(rho = 80.0, cp = 0.21, k_in = 4.5)
+    return new(rho: 80.0, cp: 0.21, k_in: 4.5)
   end
 
   def self.Stone
-    return new(rho = 140.0, cp = 0.2, k_in = 12.5)
+    return new(rho: 140.0, cp: 0.2, k_in: 12.5)
   end
 
   def self.StrawBale
-    return new(rho = 11.1652, cp = 0.2991, k_in = 0.4164)
-  end
-end
-
-class SimpleMaterial
-  def initialize(name = nil, rvalue = nil)
-    @name = name
-    @rvalue = rvalue
-  end
-
-  attr_accessor :name, :rvalue
-
-  def self.Adiabatic
-    return new(name = 'Adiabatic', rvalue = 1000)
+    return new(rho: 11.1652, cp: 0.2991, k_in: 0.4164)
   end
 end
 
 class GlazingMaterial
-  def initialize(name = nil, ufactor = nil, shgc = nil)
+  def initialize(name:, ufactor:, shgc:)
     @name = name
     @ufactor = ufactor
     @shgc = shgc
@@ -379,37 +435,33 @@ class GlazingMaterial
 end
 
 class Liquid
-  def initialize(rho, cp, k, mu, h_fg, t_frz, t_boil, t_crit)
-    @rho = rho # Density (lb/ft3)
-    @cp = cp # Specific Heat (Btu/lbm-R)
-    @k = k # Thermal Conductivity (Btu/h-ft-R)
-    @mu = mu # Dynamic Viscosity (lbm/ft-h)
-    @h_fg = h_fg # Latent Heat of Vaporization (Btu/lbm)
-    @t_frz = t_frz # Freezing Temperature (degF)
-    @t_boil = t_boil    # Boiling Temperature (degF)
-    @t_crit = t_crit    # Critical Temperature (degF)
+  def initialize(rho: nil, cp: nil, k: nil, h_fg: nil, t_frz: nil)
+    @rho = rho          # Density (lb/ft3)
+    @cp = cp            # Specific Heat (Btu/lbm-R)
+    @k = k              # Thermal Conductivity (Btu/h-ft-R)
+    @h_fg = h_fg        # Latent Heat of Vaporization (Btu/lbm)
+    @t_frz = t_frz      # Freezing Temperature (degF)
   end
 
-  attr_accessor :rho, :cp, :k, :mu, :h_fg, :t_frz, :t_boil, :t_crit
+  attr_accessor :rho, :cp, :k, :mu, :h_fg, :t_frz
 
   def self.H2O_l
     # From EES at STP
-    return new(62.32, 0.9991, 0.3386, 2.424, 1055, 32.0, 212.0, nil)
+    return new(rho: 62.32, cp: 0.9991, k: 0.3386, h_fg: 1055, t_frz: 32.0)
   end
 
   def self.R22_l
     # Converted from EnthDR22 f77 in ResAC (Brandemuehl)
-    return new(nil, 0.2732, nil, nil, 100.5, nil, -41.35, 204.9)
+    return new(cp: 0.2732, h_fg: 100.5)
   end
 end
 
 class Gas
-  def initialize(rho, cp, k, mu, m)
+  def initialize(rho: nil, cp: nil, k: nil, m: nil)
     @rho = rho # Density (lb/ft3)
-    @cp = cp # Specific Heat (Btu/lbm-R)
-    @k = k # Thermal Conductivity (Btu/h-ft-R)
-    @mu = mu # Dynamic Viscosity (lbm/ft-h)
-    @m = m # Molecular Weight (lbm/lbmol)
+    @cp = cp   # Specific Heat (Btu/lbm-R)
+    @k = k     # Thermal Conductivity (Btu/h-ft-R)
+    @m = m     # Molecular Weight (lbm/lbmol)
     if @m
       gas_constant = 1.9858 # Gas Constant (Btu/lbmol-R)
       @r = gas_constant / m # Gas Constant (Btu/lbm-R)
@@ -418,25 +470,21 @@ class Gas
     end
   end
 
-  attr_accessor :rho, :cp, :k, :mu, :m, :r
+  attr_accessor :rho, :cp, :k, :m, :r
 
   def self.Air
     # From EES at STP
-    return new(0.07518, 0.2399, 0.01452, 0.04415, 28.97)
-  end
-
-  def self.AirGapRvalue
-    return 1.0 # hr*ft*F/Btu (Assume for all air gap configurations since there is no correction for direction of heat flow in the simulation tools)
+    return new(rho: 0.07518, cp: 0.2399, k: 0.01452, m: 28.97)
   end
 
   def self.H2O_v
     # From EES at STP
-    return new(nil, 0.4495, nil, nil, 18.02)
+    return new(cp: 0.4495, m: 18.02)
   end
 
   def self.R22_v
     # Converted from EnthDR22 f77 in ResAC (Brandemuehl)
-    return new(nil, 0.1697, nil, nil, nil)
+    return new(cp: 0.1697)
   end
 
   def self.PsychMassRat