lib/openstudio-standards/btap/btap.model.rb in openstudio-standards-0.2.9 vs lib/openstudio-standards/btap/btap.model.rb in openstudio-standards-0.2.10.rc1

@@ -58,11 +58,11 @@
                 )
 
     if self.isOpaque
 
     minimum_resistance = 0
-    name_prefix = "Customized opaque construction #{construction.handle()} to conductance of #{conductance}"
+    name_prefix = "#{construction.handle()} U- #{conductance}"
 
     #Check to see if we already made one like this.
     existing_construction = OpenStudio::Model::getConstructionByName(self.model,name_prefix)
     if not existing_construction.empty?
       # if so, return existing construction
@@ -98,10 +98,10 @@
     end
     return new_construction
     elsif self.isFenestration()
 
         #get equivilant values for tsol, tvis, and conductances.
-        solarTransmittanceatNormalIncidence = self.get_tsol(model, construction) if solarTransmittanceatNormalIncidence == nil
+        solarTransmittanceatNormalIncidence = self.get_shgc(model, construction) if solarTransmittanceatNormalIncidence == nil
         visibleTransmittance = self.get_tvis(model,construction) if visibleTransmittance == nil
         conductance = self.get_conductance(construction) if conductance == nil
         frontSideSolarReflectanceatNormalIncidence = 1.0 - solarTransmittanceatNormalIncidence
         backSideSolarReflectanceatNormalIncidence = 1.0 - solarTransmittanceatNormalIncidence
         frontSideVisibleReflectanceatNormalIncidence = 0.081000